69850dd · unity8 · git.iko.soy

Dash/GenericScopeView.qml+6

compare with xenial

unifiedsplit

@@ -80,6 +80,12 @@ ScopeView {

80 item.model = results

81 }

82 item.objectName = categoryId

83+ if (item.expandable) {

84+ var shouldFilter = index != categoryView.expandedIndex;

85+ if (shouldFilter != item.filter) {

86+ item.filter = shouldFilter;

87+ }

88+ }

83 }

89 }

84

90

85 Connections {

91 Connections {

Launcher/FoldingLauncherDelegate.qml+35−24

@@ -26,21 +26,21 @@ LauncherDelegate {

26 if (index == 0 || index == priv.listView.count-1) {

27 if (priv.distanceFromEdge < 0) {

28 // proportion equation: distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle

29− return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.listView.foldingAreaHeight)) * priv.orientationFlag

29+ return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.foldingAreaHeight)) * priv.orientationFlag

30 }

31 return 0; // Don't fold first/last item as long as inside the view

32 }

33

34− // Are we in the already completely outside the flickable? Fold for the last 5 degrees

34+ // We reached the folded area... fold the last 5 degrees

35− if (priv.distanceFromEdge < 0) {

35+ if (priv.overlapWithFoldedArea > 0) {

36− // proportion equation: -distanceFromTopEdge : angle = totalUnfoldedHeight : 5

36+ // proportion equation: overlap : x = height : 5

37− return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / priv.listView.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag

37+ return ((maxAngle - 5) + (priv.overlapWithFoldedArea * 5 / priv.foldingAreaHeight)) * -priv.orientationFlag

38 }

39

40 // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees

41 if (priv.overlapWithFoldingArea > 0) {

42 // proportion equation: overlap: totalHeight = angle : (maxAngle - 5)

43− return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.listView.foldingAreaHeight * priv.orientationFlag;

43+ return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.foldingAreaHeight * priv.orientationFlag;

44 }

45 return 0;

46 }

@@ -61,9 +61,9 @@ LauncherDelegate {

61 return (-priv.distanceFromEdge - (root.height - effectiveHeight)) * priv.orientationFlag;

62 }

63

64− // We're touching the edge, move slower than the actual flicking speed.

64+ // We stopped folding, move slower than the actual flicking speed.

65− if (priv.distanceFromEdge < 0) {

65+ if (priv.overlapWithFoldedArea > 0) {

66− return (Math.abs(priv.distanceFromEdge) * priv.totalEffectiveHeight / priv.totalUnfoldedHeight) * priv.orientationFlag

66+ return (priv.overlapWithFoldedArea * priv.totalEffectiveHeight / (priv.totalUnfoldedHeight + priv.listView.foldingStopHeight)) * priv.orientationFlag;

67 }

68 return 0;

69 }

@@ -72,22 +72,23 @@ LauncherDelegate {

72 // First/last items are special

73 if (index == 0 || index == priv.listView.count-1) {

74 if (priv.distanceFromEdge < 0) {

75− // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)

75+ // Fade from 1 to 0 while traversing a distance of 2*foldingAreaHeight

76+ // proportion equation: 0.5 : x = -2*foldingAreaHeight : distance

76− return 1.0 - (-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))

77+ return 1 + (priv.distanceFromEdge / (priv.foldingAreaHeight * 2))

77 }

78 }

78 return 1; // Don't make first/last item transparent as long as inside the view

79 return 1; // Don't make first/last item transparent as long as inside the view

79 }

80 }

80

81

81− // Are we already completely outside the flickable? Fade from 0.75 to 0 in 2 items height

82+ // Did we stop folding? Fade out to 0 in 2*foldingAreaHeight

82− if (priv.distanceFromEdge < 0) {

83+ if (priv.overlapWithFoldedArea > 0) {

83− // proportion equation: -distanceFromEdge : 1-opacity = totalUnfoldedHeight : 0.75

84+ // overlap : foldingAreaHeight = opacity : 0.75

84− return 0.75 - (-priv.distanceFromEdge * 0.75 / (priv.totalUnfoldedHeight*2))

85+ return 0.75 - (priv.overlapWithFoldedArea * 0.75 / (priv.foldingAreaHeight * 2));

85 }

86 }

86

87

87− // We are overlapping with the folding area, fade out to 0.75

88+ // We are overlapping with the folding area, fade out to 0.75 transparency

88 if (priv.overlapWithFoldingArea > 0) {

89 if (priv.overlapWithFoldingArea > 0) {

89 // proportion equation: overlap : totalHeight = 1-opacity : 0.25

90 // proportion equation: overlap : totalHeight = 1-opacity : 0.25

90− return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.listView.foldingAreaHeight)

91+ return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.foldingAreaHeight)

91 }

92 }

92 return 1;

93 return 1;

93 }

94 }

@@ -95,19 +96,27 @@ LauncherDelegate {

95 brightness: {

96 brightness: {

96 // First/last items are special

97 // First/last items are special

97 if (index == 0 || index == priv.listView.count-1) {

98 if (index == 0 || index == priv.listView.count-1) {

99+

100+ // Traversed one foldingAreaHeight. Stop at 0.3

101+ if (priv.distanceFromEdge < -priv.foldingAreaHeight) {

102+ return -0.3

103+ }

104+

105+ // We started moving, fade to 0.3

98 if (priv.distanceFromEdge < 0) {

106 if (priv.distanceFromEdge < 0) {

99− return -(-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))

107+ return -0.3 * (-priv.distanceFromEdge / (priv.foldingAreaHeight))

100 }

108 }

101 return 0;

109 return 0;

102 }

110 }

103− // Are we already completely outside the flickable? Fade from 0.7 to 0 in 2 items height

111+

104− if (priv.distanceFromEdge < 0) {

112+ // We stopped folding? Stop brightness change at 0.3

105− return -0.3 - (-priv.distanceFromEdge * 0.1 / (priv.totalUnfoldedHeight*2))

113+ if (priv.overlapWithFoldedArea > 0) {

114+ return -0.3;

106 }

115 }

107

116

108− // We are overlapping with the folding area, fade out to 0.7

117+ // We are overlapping with the folding area, fade out to 0.3

109 if (priv.overlapWithFoldingArea > 0) {

118 if (priv.overlapWithFoldingArea > 0) {

110− return - (priv.overlapWithFoldingArea * 0.3 / priv.listView.foldingAreaHeight)

119+ return - (priv.overlapWithFoldingArea * 0.3 / priv.listView.foldingStartHeight);

111 }

120 }

112 return 0;

121 return 0;

113 }

122 }

@@ -127,7 +136,9 @@ LauncherDelegate {

127 property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge

136 property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge

128 property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1

137 property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1

129

138

130− property real overlapWithFoldingArea: listView.foldingAreaHeight - distanceFromEdge

139+ property real overlapWithFoldingArea: listView.foldingStartHeight - distanceFromEdge

140+ property real overlapWithFoldedArea: listView.foldingStopHeight - distanceFromEdge

141+ property real foldingAreaHeight: listView.foldingStartHeight - listView.foldingStopHeight

131 }

142 }

132

143

133}

144}

Launcher/Launcher.qml+1−1

@@ -26,7 +26,7 @@ Item {

26

27 property bool available: true // can be used to disable all interactions

28

29− property int panelWidth: units.gu(8.5)

29+ property int panelWidth: units.gu(8)

30 property int dragAreaWidth: units.gu(1)

31 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0

32

Launcher/LauncherDelegate.qml+2−2

@@ -80,7 +80,7 @@ Item {

80 top: parent.top

81 margins: -units.dp(1)

82 }

83− width: Math.min(units.gu(7.5), Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

83+ width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

84 height: units.gu(3)

85 source: "graphics/notification.sci"

86 visible: root.count > 0

@@ -89,7 +89,7 @@ Item {

89 id: countLabel

90 text: root.count

91 anchors.centerIn: parent

92− width: units.gu(6)

92+ width: root.itemWidth - units.gu(1)

93 horizontalAlignment: Text.AlignHCenter

94 elide: Text.ElideRight

95 color: "white"

Launcher/LauncherPanel.qml+43−17

@@ -62,7 +62,7 @@ Item {

62 z: 1

63 Image {

64 objectName: "dashItem"

65− width: units.gu(5.5)

65+ width: units.gu(5)

66 height: width

67 anchors.centerIn: parent

68 source: "graphics/home.png"

@@ -113,14 +113,22 @@ Item {

113 property int extensionSize: itemHeight * 3

114

115 // The height of the area where icons start getting folded

116− property int foldingAreaHeight: itemHeight * 0.75

116+ property int foldingStartHeight: units.gu(6.5)

117+ // The height of the area where the items reach the final folding angle

118+ property int foldingStopHeight: foldingStartHeight - itemHeight - spacing

117− property int itemWidth: width

119+ property int itemWidth: units.gu(7)

118− property int itemHeight: width * 7.5 / 8

120+ property int itemHeight: units.gu(6.5)

119 property int clickFlickSpeed: units.gu(60)

121 property int clickFlickSpeed: units.gu(60)

120 property int draggedIndex: dndArea.draggedIndex

122 property int draggedIndex: dndArea.draggedIndex

121 property real realContentY: contentY - originY + topMargin

123 property real realContentY: contentY - originY + topMargin

122 property int realItemHeight: itemHeight + spacing

124 property int realItemHeight: itemHeight + spacing

123

125

126+ // In case the start dragging transition is running, we need to delay the

127+ // move because the displaced transition would clash with it and cause items

128+ // to be moved to wrong places

129+ property bool draggingTransitionRunning: false

130+ property int scheduledMoveTo: -1

131+

124 displaced: Transition {

132 displaced: Transition {

125 NumberAnimation { properties: "x,y"; duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }

133 NumberAnimation { properties: "x,y"; duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }

126 }

134 }

@@ -136,9 +144,8 @@ Item {

136 count: model.count

144 count: model.count

137 progress: model.progress

145 progress: model.progress

138 inverted: root.inverted

146 inverted: root.inverted

139− highlighted: dragging && index === root.highlightIndex

140 z: -Math.abs(offset)

147 z: -Math.abs(offset)

141− maxAngle: 60

148+ maxAngle: 55

142 property bool dragging: false

149 property bool dragging: false

143

150

144 ThinDivider {

151 ThinDivider {

@@ -202,10 +209,26 @@ Item {

202 UbuntuNumberAnimation { properties: "angle,offset" }

209 UbuntuNumberAnimation { properties: "angle,offset" }

203 },

210 },

204 Transition {

211 Transition {

212+ id: draggingTransition

205 from: "selected"

213 from: "selected"

206 to: "dragging"

214 to: "dragging"

215+ SequentialAnimation {

216+ PropertyAction { target: launcherListView; property: "draggingTransitionRunning"; value: true }

217+ ParallelAnimation {

207− UbuntuNumberAnimation { properties: "height" }

218+ UbuntuNumberAnimation { properties: "height" }

208− NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }

219+ NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }

220+ }

221+ ScriptAction {

222+ script: {

223+ if (launcherListView.scheduledMoveTo > -1) {

224+ launcherListView.model.move(dndArea.draggedIndex, launcherListView.scheduledMoveTo)

225+ dndArea.draggedIndex = launcherListView.scheduledMoveTo

226+ launcherListView.scheduledMoveTo = -1

227+ }

228+ }

229+ }

230+ PropertyAction { target: launcherListView; property: "draggingTransitionRunning"; value: false }

231+ }

209 },

232 },

210 Transition {

233 Transition {

211 from: "dragging"

234 from: "dragging"

@@ -213,7 +236,9 @@ Item {

213 NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }

236 NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }

214 NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }

237 NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }

215 SequentialAnimation {

238 SequentialAnimation {

239+ ScriptAction { script: if (index == launcherListView.count-1) launcherListView.flick(0, -launcherListView.clickFlickSpeed); }

216 UbuntuNumberAnimation { properties: "height" }

240 UbuntuNumberAnimation { properties: "height" }

241+ ScriptAction { script: if (index == launcherListView.count-1) launcherListView.flick(0, -launcherListView.clickFlickSpeed); }

217 PropertyAction { target: dndArea; property: "postDragging"; value: false }

242 PropertyAction { target: dndArea; property: "postDragging"; value: false }

218 PropertyAction { target: dndArea; property: "draggedIndex"; value: -1 }

243 PropertyAction { target: dndArea; property: "draggedIndex"; value: -1 }

219 }

244 }

@@ -243,9 +268,6 @@ Item {

243

268

244 onPressed: {

269 onPressed: {

245 selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)

270 selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)

246− if (selectedItem !== null) {

247− selectedItem.highlighted = true

248− }

249 }

271 }

250

272

251 onClicked: {

273 onClicked: {

@@ -280,7 +302,6 @@ Item {

280 }

302 }

281

303

282 onCanceled: {

304 onCanceled: {

283− selectedItem.highlighted = false

284 selectedItem = undefined;

305 selectedItem = undefined;

285 preDragging = false;

306 preDragging = false;

286 postDragging = false;

307 postDragging = false;

@@ -298,7 +319,6 @@ Item {

298 return;

319 return;

299 }

320 }

300

321

301− selectedItem.highlighted = false

302 selectedItem.dragging = false;

322 selectedItem.dragging = false;

303 selectedItem = undefined;

323 selectedItem = undefined;

304 preDragging = false;

324 preDragging = false;

@@ -310,6 +330,9 @@ Item {

310 if (droppedIndex >= launcherListView.count - 2 && postDragging) {

330 if (droppedIndex >= launcherListView.count - 2 && postDragging) {

311 launcherListView.flick(0, -launcherListView.clickFlickSpeed);

331 launcherListView.flick(0, -launcherListView.clickFlickSpeed);

312 }

332 }

333+ if (droppedIndex == 0 && postDragging) {

334+ launcherListView.flick(0, launcherListView.clickFlickSpeed);

335+ }

313 }

336 }

314

337

315 onPressAndHold: {

338 onPressAndHold: {

@@ -387,8 +410,12 @@ Item {

387 }

410 }

388

411

389 if (newIndex >= 0 && newIndex < launcherListView.count) {

412 if (newIndex >= 0 && newIndex < launcherListView.count) {

413+ if (launcherListView.draggingTransitionRunning) {

414+ launcherListView.scheduledMoveTo = newIndex

415+ } else {

390− launcherListView.model.move(draggedIndex, newIndex)

416+ launcherListView.model.move(draggedIndex, newIndex)

391− draggedIndex = newIndex

417+ draggedIndex = newIndex

418+ }

392 }

419 }

393 }

420 }

394 }

421 }

@@ -425,8 +452,7 @@ Item {

425 height: itemHeight

452 height: itemHeight

426 width: itemWidth

453 width: itemWidth

427 rotation: root.rotation

454 rotation: root.rotation

428− highlighted: true

429− itemOpacity: 0.8

455+ itemOpacity: 0.9

430

456

431 function flatten() {

457 function flatten() {

432 fakeDragItemAnimation.start();

458 fakeDragItemAnimation.start();

Launcher/QuicklistForegroundStyle.qml+16

@@ -1,3 +1,19 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

1import Ubuntu.Components.Themes.Ambiance 0.1

17import Ubuntu.Components.Themes.Ambiance 0.1

2

18

3PopoverForegroundStyle {

19PopoverForegroundStyle {

build+2−1

@@ -59,7 +59,8 @@ mk_build_deps() {

59

60if [ -f "/usr/bin/ninja" ] ; then

61 GENERATOR="-G Ninja"

62+ # Ninja does not need -j, it parallelizes automatically.

62− BUILD_COMMAND="ninja -j$NUM_JOBS"

63+ BUILD_COMMAND="ninja"

63else

64else

64 GENERATOR=

65 GENERATOR=

65 BUILD_COMMAND="make -j$NUM_JOBS"

66 BUILD_COMMAND="make -j$NUM_JOBS"

debian/changelog+98

@@ -1,3 +1,101 @@

1+unity8 (7.81.3+13.10.20130827-0ubuntu1) saucy; urgency=low

2+

3+ [ Michael Zanetti ]

4+ * Theme the Quicklist Popover.

5+

6+ [ Albert Astals ]

7+ * Apply expandedIndex on delegate creation bug #1213033. (LP:

8+ #1213033)

9+

10+ [ Ubuntu daily release ]

11+ * Automatic snapshot from revision 254

12+

13+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 27 Aug 2013 02:10:43 +0000

14+

15+unity8 (7.81.3+13.10.20130826.5-0ubuntu1) saucy; urgency=low

16+

17+ [ Michael Zanetti ]

18+ * tweak launcher folding and visuals according to feedback from

19+ design: - increase foldingStartHeight - Introduces a

20+ foldingStopHeight. Folding only happens between the

21+ foldingStartHeight and the foldingStopHeight. - Only change

22+ brightness while folding - remove highlight of pressed icon -

23+ decrease launcher's width by half a grid unit.

24+

25+ [ Ubuntu daily release ]

26+ * Automatic snapshot from revision 251

27+

28+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 26 Aug 2013 22:09:43 +0000

29+

30+unity8 (7.81.3+13.10.20130826.4-0ubuntu1) saucy; urgency=low

31+

32+ [ Michał Sawicz ]

33+ * Add module entry in HudClient's qmldir.

34+

35+ [ Jussi Pakkanen ]

36+ * Let Ninja parallelize itself.

37+

38+ [ Nick Dedekind ]

39+ * Abstraction of indicator menu item properties prior to move into

40+ common components library.

41+

42+ [ Christopher Lee ]

43+ * Added autopilot-tests for ephemeral, interactive and snap-decision

44+ notifications.

45+

46+ [ Mirco Müller ]

47+ * Added autopilot-tests for ephemeral, interactive and snap-decision

48+ notifications.

49+

50+ [ Michael Zanetti ]

51+ * only search visible children in findChild, add findInvisibleChild

52+ for others.

53+ * Added autopilot-tests for ephemeral, interactive and snap-decision

54+ notifications.

55+

56+ [ Thomi Richards ]

57+ * Added autopilot-tests for ephemeral, interactive and snap-decision

58+ notifications.

59+

60+ [ Ubuntu daily release ]

61+ * Automatic snapshot from revision 249

62+

63+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 26 Aug 2013 18:34:44 +0000

64+

65+unity8 (7.81.3+13.10.20130826.2-0ubuntu1) saucy; urgency=low

66+

67+ [ Albert Astals ]

68+ * Don't include QtQML It includes LOTS of files we don't need.

69+

70+ [ Ubuntu daily release ]

71+ * Automatic snapshot from revision 243

72+

73+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 26 Aug 2013 10:08:52 +0000

74+

75+unity8 (7.81.3+13.10.20130826.1-0ubuntu1) saucy; urgency=low

76+

77+ * Automatic snapshot from revision 241

78+

79+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 26 Aug 2013 06:08:33 +0000

80+

81+unity8 (7.81.3+13.10.20130826-0ubuntu1) saucy; urgency=low

82+

83+ [ Michael Zanetti ]

84+ * delay move operations if the start dragging operation is running

85+ This prevents items to left in wrong places when transitions clash.

86+ * add empty setUser to allow compiling in jenkins again until the

87+ branch that matches unity-api is ready to land. .

88+ * add count and progress overlay information to real model too.

89+

90+ [ Pawel Stolowski ]

91+ * Changed the type of setActive argument from

92+ QVector<AbstractFilterOption *>::size_type to unsigned int.

93+

94+ [ Ubuntu daily release ]

95+ * Automatic snapshot from revision 240

96+

97+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 26 Aug 2013 02:31:42 +0000

98+

1unity8 (7.81.3+13.10.20130821.2-0ubuntu1) saucy; urgency=low

99unity8 (7.81.3+13.10.20130821.2-0ubuntu1) saucy; urgency=low

2

100

3 [ Michael Terry ]

101 [ Michael Terry ]

main.cpp−1

@@ -18,7 +18,6 @@

18 */

19

20// Qt

21−#include <QtQml>

22#include <QtQuick/QQuickView>

21#include <QtQuick/QQuickView>

23#include <QtGui/QIcon>

22#include <QtGui/QIcon>

24#include <QtGui/QGuiApplication>

23#include <QtGui/QGuiApplication>

plugins/HudClient/qmldir+1

@@ -1,2 +1,3 @@

1+module HudClient

1plugin HudClientQml

2plugin HudClientQml

2typeinfo plugin.qmltypes

3typeinfo plugin.qmltypes

plugins/LightDM/plugin.cpp+1−1

@@ -25,7 +25,7 @@

25#include <QLightDM/UsersModel>

26

27#include <QtCore/QAbstractItemModel>

28−#include <QtQml>

28+#include <QtQml/qqml.h>

29

30static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

31{

plugins/Powerd/plugin.cpp+1−1

@@ -20,7 +20,7 @@

20#include "plugin.h"

21#include "Powerd.h"

22

23−#include <QtQml/QtQml>

23+#include <QtQml/qqml.h>

24

25static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26{

plugins/Ubuntu/DownloadDaemonListener/plugin.cpp+1−1

@@ -22,7 +22,7 @@

22#include "plugin.h"

23#include "DownloadTracker.h"

24

25−#include <QtQml>

25+#include <QtQml/qqml.h>

26#include <QtQml/QQmlContext>

27

28

plugins/Unity/Indicators/Network/plugin.cpp+1−1

@@ -17,7 +17,7 @@

17 */

18

19// Qt

20−#include <QtQml>

20+#include <QtQml/qqml.h>

21

22// self

23#include "plugin.h"

plugins/Unity/Indicators/Network/qml/AccessPoint.qml+18−8

@@ -25,29 +25,39 @@ import Unity.Indicators 0.1 as Indicators

25Indicators.FramedMenuItem {

26 id: accessPoint

27

28− readonly property bool checked: menu ? menu.isToggled : false

28+ property bool checked: false

29+ property bool secure: false

30+ property bool adHoc: false

31+ property int signalStrength: 0

32+

33+ signal activate()

29

34

30 onCheckedChanged: {

35 onCheckedChanged: {

31 // Can't rely on binding. Checked is assigned on click.

36 // Can't rely on binding. Checked is assigned on click.

32 checkBoxActive.checked = checked;

37 checkBoxActive.checked = checked;

33 }

38 }

34

39

35− // FIXME - we need to get the strength from menu.ext.xCanonicalWifiApStrengthAction

40+ icon: {

36− // but UnityMenuModel doesnt support fetching actions not attached to menu item.

37− function getNetworkIcon(data) {

38 var imageName = "nm-signal-100"

41 var imageName = "nm-signal-100"

39

42

40− if (data.ext.xCanonicalWifiApIsAdhoc) {

43+ if (adHoc) {

41 imageName = "nm-adhoc";

44 imageName = "nm-adhoc";

45+ } else if (signalStrength == 0) {

46+ imageName = "nm-signal-00";

47+ } else if (signalStrength <= 25) {

48+ imageName = "nm-signal-25";

49+ } else if (signalStrength <= 50) {

50+ imageName = "nm-signal-50";

51+ } else if (signalStrength <= 75) {

52+ imageName = "nm-signal-75";

42 }

53 }

43− if (data.ext.xCanonicalWifiApIsSecure) {

54+

55+ if (secure) {

44 imageName += "-secure";

56 imageName += "-secure";

45 }

57 }

46−

47 return "image://gicon/" + imageName;

58 return "image://gicon/" + imageName;

48 }

59 }

49

60

50− icon: menu ? getNetworkIcon(menu) : "image://gicon/wifi-none"

51 iconFrame: false

61 iconFrame: false

52 control: CheckBox {

62 control: CheckBox {

53 id: checkBoxActive

63 id: checkBoxActive

plugins/Unity/Indicators/Network/qml/PasswordPage.qml+1−1

@@ -38,7 +38,7 @@ Page {

38 }

39

40 Indicators.SectionMenuItem {

41− label: "Authentication"

41+ text: "Authentication"

42 }

43

44 Indicators.FramedMenuItem {

plugins/Unity/Indicators/Network/qml/WifiSection.qmldeleted−28

@@ -1,28 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Renato Araujo Oliveira Filho <renato@canonical.com>

18− */

19−

20−import QtQuick 2.0

21−import Ubuntu.Components 0.1

22−import Unity.Indicators 0.1 as Indicators

23−

24−Indicators.SectionMenuItem {

25− id: wifiSectionMenu

26−

27− busy: menu ? menu.ext.xCanonicalBusyAction : false

28−}

plugins/Unity/Indicators/Network/qml/qmldir+1−2

@@ -5,5 +5,4 @@ typeinfo plugin.qmltypes

5NetworkPage 0.1 NetworkPage.qml

6AccessPoint 0.1 AccessPoint.qml

7PasswordPage 0.1 PasswordPage.qml

8−PasswordTextField 0.1 PasswordTextField.qml

8+PasswordTextField 0.1 PasswordTextField.qml

9−WifiSection 0.1 WifiSection.qml

plugins/Unity/Indicators/plugin.cpp+1−1

@@ -18,7 +18,7 @@

18 */

19

20// Qt

21−#include <QtQml>

21+#include <QtQml/qqml.h>

22

23// self

24#include "plugin.h"

plugins/Unity/Indicators/qml/BaseMenuItem.qml−4

@@ -25,14 +25,10 @@ ListItem.Standard {

25 id: baseMenu

26

27 property bool menuActivated: false

28− property QtObject menu

29

28

30 signal selectMenu()

29 signal selectMenu()

31 signal deselectMenu()

30 signal deselectMenu()

32

31

33− signal activate()

34− signal changeState(var value)

35−

36 showDivider: false

32 showDivider: false

37 __foregroundColor: "#e8e1d0" // FIXME not in palette yet

33 __foregroundColor: "#e8e1d0" // FIXME not in palette yet

38

34

plugins/Unity/Indicators/qml/ButtonMenuItem.qml+4−9

@@ -24,14 +24,14 @@ import Unity.Indicators 0.1 as Indicators

24

25BaseMenuItem {

26 id: menuItem

27− objectName: menuAction.name

28 implicitHeight: units.gu(7)

27 implicitHeight: units.gu(7)

29− enabled: menuAction.active

28+

29+ property alias text: button.text

30+

31+ signal activate()

30

32

31 Button {

33 Button {

32 id: button

34 id: button

33− enabled: menuAction.enabled

34− text: menu ? menu.label : ""

35 anchors.centerIn: parent

36 height: units.gu(4)

37 width: units.gu(16)

@@ -41,9 +41,4 @@ BaseMenuItem {

41 menuItem.activate();

42 }

43 }

44−

45− Indicators.MenuAction {

46− id: menuAction

47− menu: menuItem.menu

48− }

49}

44}

plugins/Unity/Indicators/qml/FramedMenuItem.qml−2

@@ -23,10 +23,8 @@ import Ubuntu.Components 0.1

23import Ubuntu.Components.ListItems 0.1 as ListItem

24

25BaseMenuItem {

26− text: menu && menu.label ? menu.label : ""

27 implicitHeight: units.gu(7)

26 implicitHeight: units.gu(7)

28

27

29− icon: menu ? menu.icon : ""

30 iconFrame: false

28 iconFrame: false

31

29

32 HLine {

30 HLine {

plugins/Unity/Indicators/qml/IndicatorPage.qml+4−9

@@ -96,18 +96,13 @@ IndicatorBase {

96 }

97 if (item.hasOwnProperty("menu")) {

98 item.menu = Qt.binding(function() { return model; });

99−

100− item.activate.connect(onActivateMenu);

101− item.changeState.connect(onChangeState);

102 }

99 }

103 }

100 }

104

101

105− function onActivateMenu(value) {

102+ Binding {

106− mainMenu.model.activate(index, value);

103+ target: item ? item : null

107− }

104+ property: "objectName"

108−

105+ value: model.action

109− function onChangeState(value) {

110− mainMenu.model.changeState(index, value);

111 }

106 }

112 }

107 }

113 }

108 }

plugins/Unity/Indicators/qml/MenuAction.qmldeleted−59

@@ -1,59 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Renato Araujo Oliveira Filho <renato@canonical.com>

18− * Nick Dedekind <nick.dedekind@canonical.com>

19− */

20−

21−import QtQuick 2.0

22−

23−/*!

24− \qmltype MenuAction

25− \inqmlmodule Indicators 0.1

26− \brief Helper class to connect to a qmenumodel action

27−

28− Example:

29− \qml

30− BaseMenuItem {

31− id: menuItem

32−

33− Switch {

34− checked: menuAction.state

35− }

36−

37− Indicators.MenuAction {

38− id: menuAction

39− menu: menuItem.menu

40− }

41− }

42− \endqml

43−*/

44−

45−Item {

46− id: menuAction

47−

48− /*!

49− \preliminary

50− The dbus action group object

51− */

52− readonly property string name: menu ? menu.action : ""

53−

54− property QtObject menu: null

55−

56− readonly property var state: menu ? menu.actionState : undefined

57−

58− readonly property bool active: menu ? menu.sensitive : false

59−}

plugins/Unity/Indicators/qml/MenuItemFactory.qml+124−7

@@ -20,6 +20,7 @@

20import QtQuick 2.0

21import Unity.Indicators 0.1 as Indicators

22import Unity.Indicators.Network 0.1 as ICNetwork

23+import QMenuModel 0.1 as QMenuModel

23

24

24Item {

25Item {

25 id: menuFactory

26 id: menuFactory

@@ -47,35 +48,151 @@ Item {

47 Component {

48 Component {

48 id: sliderMenu;

49 id: sliderMenu;

49 Indicators.SliderMenuItem {

50 Indicators.SliderMenuItem {

51+ property QtObject menu: null

52+

53+ text: menu && menu.label ? menu.label : ""

54+ icon: menu ? menu.icon : ""

55+ minIcon: menu.ext.minIcon

56+ maxIcon: menu.ext.maxIcon

57+

58+ minimumValue: menu.ext.minValue ? menu.ext.minValue : 0.0

59+ maximumValue: {

60+ var maximum = menu.ext.maxValue ? menu.ext.maxValue : 1.0

61+ if (maximum <= minimumValue) {

62+ return minimumValue + 1;

63+ }

64+ return maximum;

65+ }

66+ value: menu ? menu.actionState : 0.0

67+ enabled: menu ? menu.sensitive : false

68+

50 Component.onCompleted: {

69 Component.onCompleted: {

51 model.loadExtendedAttributes(modelIndex, {'min-value': 'double',

70 model.loadExtendedAttributes(modelIndex, {'min-value': 'double',

52 'max-value': 'double',

71 'max-value': 'double',

53 'min-icon': 'icon',

72 'min-icon': 'icon',

54 'max-icon': 'icon'});

73 'max-icon': 'icon'});

55 }

74 }

75+

76+ // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when

77+ // reaching the boundaries (0.0 or 1.0), the value is converted

78+ // to an integer when automatically wrapped in a variant when

79+ // passed to QStateAction::updateState(…). The server chokes on

80+ // those values, complaining that they’re not of the right type…

81+ onChangeState: {

82+ if (value == Math.round(value)) {

83+ if (value >= maximumValue) {

84+ model.changeState(modelIndex, maximumValue - 0.000001);

85+ } else if (value <= minimumValue) {

86+ model.changeState(modelIndex, minimumValue + 0.000001);

87+ } else {

88+ model.changeState(modelIndex, value * 1.000001);

89+ }

90+ } else {

91+ model.changeState(modelIndex, value);

92+ }

93+ }

56 }

94 }

57 }

95 }

58− Component { id: buttonMenu; Indicators.ButtonMenuItem {} }

96+

59 Component { id: divMenu; Indicators.DivMenuItem {} }

97 Component { id: divMenu; Indicators.DivMenuItem {} }

98+

99+ Component {

100+ id: buttonMenu;

101+ Indicators.ButtonMenuItem {

102+ property QtObject menu: null

103+

104+ text: menu && menu.label ? menu.label : ""

105+ enabled: menu ? menu.sensitive : false

106+

107+ onActivate: model.activate(modelIndex);

108+ }

109+ }

110+ Component {

111+ id: sectionMenu;

60− Component { id: sectionMenu; Indicators.SectionMenuItem {} }

112+ Indicators.SectionMenuItem {

113+ property QtObject menu: null

114+

115+ text: menu && menu.label ? menu.label : ""

116+ }

117+ }

118+

119+ Component {

120+ id: progressMenu;

61− Component { id: progressMenu; Indicators.ProgressMenuItem {} }

121+ Indicators.ProgressMenuItem {

122+ property QtObject menu: null

123+

124+ text: menu && menu.label ? menu.label : ""

125+ icon: menu ? menu.icon : ""

126+ value : menu ? menu.actionState : 0.0

127+ }

128+ }

129+

130+ Component {

131+ id: standardMenu;

62− Component { id: standardMenu; Indicators.StandardMenuItem {} }

132+ Indicators.StandardMenuItem {

133+ property QtObject menu: null

134+

135+ text: menu && menu.label ? menu.label : ""

136+ icon: menu ? menu.icon : ""

137+ checkable: menu ? (menu.isCheck || menu.isRadio) : false

138+ checked: checkable ? menu.isToggled : false

139+ enabled: menu ? menu.sensitive : false

140+

141+ onActivate: model.activate(modelIndex);

142+ }

143+ }

144+

145+ Component {

146+ id: switchMenu;

63− Component { id: switchMenu; Indicators.SwitchMenuItem {} }

147+ Indicators.SwitchMenuItem {

148+ property QtObject menu: null

149+

150+ text: menu && menu.label ? menu.label : ""

151+ icon: menu ? menu.icon : ""

152+ checked: menu ? menu.isToggled : false

153+ enabled: menu ? menu.sensitive : false

154+

155+ onActivate: model.activate(modelIndex);

156+ }

157+ }

158+

64 Component {

159 Component {

65 id: wifiSection;

160 id: wifiSection;

66− ICNetwork.WifiSection {

161+ Indicators.SectionMenuItem {

162+ property QtObject menu: null

163+

164+ text: menu && menu.label ? menu.label : ""

165+ busy: menu ? menu.ext.xCanonicalBusyAction : false

166+

67 Component.onCompleted: {

167 Component.onCompleted: {

68 model.loadExtendedAttributes(modelIndex, {'x-canonical-busy-action': 'bool'});

168 model.loadExtendedAttributes(modelIndex, {'x-canonical-busy-action': 'bool'});

69 }

169 }

70 }

170 }

71 }

171 }

172+

72 Component {

173 Component {

73 id: accessPoint;

174 id: accessPoint;

74 ICNetwork.AccessPoint {

175 ICNetwork.AccessPoint {

176+ property QtObject menu: null

177+// property var strenthAction: QMenuModel.UnityMenuAction {

178+// model: menuFactory.model ? menuFactory.model : null

179+// name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""

180+// }

181+

182+ text: menu && menu.label ? menu.label : ""

183+ icon: menu ? menu.icon : ""

184+ secure: menu ? menu.ext.xCanonicalWifiApIsSecure : false

185+ adHoc: menu ? menu.ext.xCanonicalWifiApIsAdhoc : false

186+ checked: menu ? menu.isToggled : false

187+// signalStrength: strenthAction.valid ? strenthAction.state : 0

188+ enabled: menu ? menu.sensitive : false

189+

75 Component.onCompleted: {

190 Component.onCompleted: {

76 model.loadExtendedAttributes(modelIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',

191 model.loadExtendedAttributes(modelIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',

77− 'x-canonical-wifi-ap-is-secure': 'bool'});

192+ 'x-canonical-wifi-ap-is-secure': 'bool',

193+ 'x-canonical-wifi-ap-strength-action': 'string'});

78 }

194 }

195+ onActivate: model.activate(modelIndex);

79 }

196 }

80 }

197 }

81

198

plugins/Unity/Indicators/qml/ProgressMenuItem.qml+1−8

@@ -23,10 +23,8 @@ import Unity.Indicators 0.1 as Indicators

23

24FramedMenuItem {

25 id: menuItem

26− objectName: menuAction.name

27− enabled: menuAction.active

28

26

29− property int value : menuAction.state

27+ property int value : 0.0

30

28

31 control: Label {

29 control: Label {

32 id: progress

30 id: progress

@@ -37,9 +35,4 @@ FramedMenuItem {

37 fontSize: "medium"

35 fontSize: "medium"

38 color: "#e8e1d0"

36 color: "#e8e1d0"

39 }

37 }

40−

41− Indicators.MenuAction {

42− id: menuAction

43− menu: menuItem.menu

44− }

45}

38}

plugins/Unity/Indicators/qml/SectionMenuItem.qml+3−3

@@ -22,15 +22,15 @@ import Ubuntu.Components 0.1

22import Ubuntu.Components.ListItems 0.1 as ListItem

23

24BaseMenuItem {

25− property string label: menu && menu.label ? menu.label : ""

25+ id: menuItem

26+ property alias text: header.text

26 property bool busy: false

27 property bool busy: false

27

28

28− implicitHeight: label !== "" ? header.height : 0

29+ implicitHeight: text !== "" ? header.height : 0

29

30

30 ListItem.Header {

31 ListItem.Header {

31 id: header

32 id: header

32

33

33− text: label

34 height: units.gu(4)

35 anchors {

36 left: parent.left

plugins/Unity/Indicators/qml/SliderMenuItem.qml+8−23

@@ -24,17 +24,20 @@ import Unity.Indicators 0.1 as Indicators

24

25FramedMenuItem {

26 id: menuItem

27− objectName: menuAction.name

28− enabled: menuAction.active

29

27

30 property alias minimumValue: slider.minimumValue

28 property alias minimumValue: slider.minimumValue

31 property alias maximumValue: slider.maximumValue

29 property alias maximumValue: slider.maximumValue

32− readonly property double value: menu ? menuAction.state : 0.0

30+ property double value: 0.0

31+

32+ property alias minIcon: leftImage.source

33+ property alias maxIcon: rightImage.source

33

34

34 property QtObject d: QtObject {

35 property QtObject d: QtObject {

35 property bool enableValueConnection: true

36 property bool enableValueConnection: true

36 }

37 }

37

38

39+ signal changeState(real value)

40+

38 onValueChanged: {

41 onValueChanged: {

39 // TODO: look into adding a component to manage bi-directional bindings.

42 // TODO: look into adding a component to manage bi-directional bindings.

40 var oldEnable = d.enableValueConnection

43 var oldEnable = d.enableValueConnection

@@ -58,7 +61,6 @@ FramedMenuItem {

58 anchors.verticalCenter: row.verticalCenter

61 anchors.verticalCenter: row.verticalCenter

59 height: units.gu(4)

62 height: units.gu(4)

60 width: height

63 width: height

61− source: menu.ext.minIcon

62 }

64 }

63

65

64 Components.Slider {

66 Components.Slider {

@@ -75,19 +77,8 @@ FramedMenuItem {

75 value = menuItem.value

77 value = menuItem.value

76 }

78 }

77

79

78− // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when

80+ minimumValue: 0.0

79− // reaching the boundaries (0.0 or 1.0), the value is converted

80− // to an integer when automatically wrapped in a variant when

81− // passed to QStateAction::updateState(…). The server chokes on

82− // those values, complaining that they’re not of the right type…

83− minimumValue: menu.ext.minValue ? menu.ext.minValue * 1.000001 : 0.0000001

84− maximumValue: {

81+ maximumValue: 0.1

85− var maximum = menu.ext.maxValue ? menu.ext.maxValue * 1.000001 : 0.9999999

86− if (maximum <= minimumValue) {

87− return minimumValue + 1;

88− }

89− return maximum;

90− }

91

82

92 // FIXME - to be deprecated in Ubuntu.Components.

83 // FIXME - to be deprecated in Ubuntu.Components.

93 // Use this to disable the label, since there is not way to do it on the component.

84 // Use this to disable the label, since there is not way to do it on the component.

@@ -109,12 +100,6 @@ FramedMenuItem {

109 anchors.verticalCenter: row.verticalCenter

100 anchors.verticalCenter: row.verticalCenter

110 height: units.gu(4)

101 height: units.gu(4)

111 width: height

102 width: height

112− source: menu.ext.maxIcon

113 }

103 }

114 }

104 }

115−

116− Indicators.MenuAction {

117− id: menuAction

118− menu: menuItem.menu

119− }

120}

105}

plugins/Unity/Indicators/qml/StandardMenuItem.qml+5−10

@@ -23,16 +23,16 @@ import Unity.Indicators 0.1 as Indicators

23

24FramedMenuItem {

25 id: menuItem

26− objectName: menuAction.name

27− enabled: menuAction.active

28

26

29− readonly property bool checkable: menu ? (menu.isCheck || menu.isRadio) : false

27+ property bool checkable: false

30− readonly property bool checked: checkable ? menu.isToggled : false

28+ property bool checked: false

29+

30+ signal activate()

31

32 // FIXME : need a radio button from sdk

33 // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211866

34 onCheckableChanged: {

35− if (menu && checkable) {

35+ if (checkable) {

36 icon = checkComponent.createObject(menuItem);

37 }

38 }

@@ -68,9 +68,4 @@ FramedMenuItem {

68 }

69 }

70 }

71−

72− Indicators.MenuAction {

73− id: menuAction

74− menu: menuItem.menu

75− }

76}

71}

plugins/Unity/Indicators/qml/SwitchMenuItem.qml+3−8

@@ -24,10 +24,10 @@ import Unity.Indicators 0.1 as Indicators

24

25FramedMenuItem {

26 id: menuItem

27− objectName: menuAction.name

28− enabled: menuAction.enabled

29

27

30− readonly property bool checked: menu ? menu.isToggled : false

28+ property bool checked: false

29+

30+ signal activate()

31

32 onCheckedChanged: {

33 // Can't rely on binding. Checked is assigned on click.

@@ -50,9 +50,4 @@ FramedMenuItem {

50 menuItem.activate();

51 }

52 }

53−

54− Indicators.MenuAction {

55− id: menuAction

56− menu: menuItem.menu

57− }

58}

53}

plugins/Unity/Indicators/qml/qmldir−1

@@ -11,7 +11,6 @@ HLine 0.1 HLine.qml

11IndicatorBase 0.1 IndicatorBase.qml

12IndicatorPage 0.1 IndicatorPage.qml

13IndicatorWidget 0.1 IndicatorWidget.qml

14−MenuAction 0.1 MenuAction.qml

15MenuActionBinding 0.1 MenuActionBinding.qml

14MenuActionBinding 0.1 MenuActionBinding.qml

16MenuItemFactory 0.1 MenuItemFactory.qml

15MenuItemFactory 0.1 MenuItemFactory.qml

17ProgressMenuItem 0.1 ProgressMenuItem.qml

16ProgressMenuItem 0.1 ProgressMenuItem.qml

plugins/Unity/IndicatorsLegacy/Network/plugin.cpp+1−1

@@ -17,7 +17,7 @@

17 */

18

19// Qt

20−#include <QtQml>

20+#include <QtQml/qqml.h>

21

22// self

23#include "plugin.h"

plugins/Unity/IndicatorsLegacy/plugin.cpp+1−1

@@ -17,7 +17,7 @@

17 */

18

19// Qt

20−#include <QtQml>

20+#include <QtQml/qqml.h>

21

22// self

23#include "plugin.h"

plugins/Unity/Launcher/launchermodel.cpp+34

@@ -25,6 +25,9 @@ LauncherModel::LauncherModel(QObject *parent):

25 LauncherModelInterface(parent),

26 m_backend(new LauncherBackend(this))

27{

28+ connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));

29+ connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));

30+

28 Q_FOREACH (const QString &entry, m_backend->storedApplications()) {

31 Q_FOREACH (const QString &entry, m_backend->storedApplications()) {

29 LauncherItem *item = new LauncherItem(entry,

32 LauncherItem *item = new LauncherItem(entry,

30 m_backend->desktopFile(entry),

33 m_backend->desktopFile(entry),

@@ -67,6 +70,10 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

67 return item->icon();

70 return item->icon();

68 case RolePinned:

71 case RolePinned:

69 return item->pinned();

72 return item->pinned();

73+ case RoleCount:

74+ return item->count();

75+ case RoleProgress:

76+ return item->progress();

70 }

77 }

71

78

72 return QVariant();

79 return QVariant();

@@ -177,6 +184,12 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex

177 }

184 }

178}

185}

179

186

187+void LauncherModel::setUser(const QString &username)

188+{

189+ Q_UNUSED(username)

190+ // TODO: Implement this...

191+}

192+

180void LauncherModel::storeAppList()

193void LauncherModel::storeAppList()

181{

194{

182 QStringList appIds;

195 QStringList appIds;

@@ -198,3 +211,24 @@ int LauncherModel::findApplication(const QString &appId)

198 }

211 }

199 return -1;

212 return -1;

200}

213}

214+

215+void LauncherModel::progressChanged(const QString &appId, int progress)

216+{

217+ int idx = findApplication(appId);

218+ if (idx >= 0) {

219+ LauncherItem *item = m_list.at(idx);

220+ item->setProgress(progress);

221+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleProgress);

222+ }

223+}

224+

225+

226+void LauncherModel::countChanged(const QString &appId, int count)

227+{

228+ int idx = findApplication(appId);

229+ if (idx >= 0) {

230+ LauncherItem *item = m_list.at(idx);

231+ item->setCount(count);

232+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);

233+ }

234+}

plugins/Unity/Launcher/launchermodel.h+5

@@ -48,11 +48,16 @@ public:

48 Q_INVOKABLE void pin(const QString &appId, int index = -1);

49 Q_INVOKABLE void requestRemove(const QString &appId);

50 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

51+ Q_INVOKABLE void setUser(const QString &username);

51

52

52private:

53private:

53 void storeAppList();

54 void storeAppList();

54 int findApplication(const QString &appId);

55 int findApplication(const QString &appId);

55

56

57+private Q_SLOTS:

58+ void progressChanged(const QString &appId, int progress);

59+ void countChanged(const QString &appId, int count);

60+

56private:

61private:

57 QList<LauncherItem*> m_list;

62 QList<LauncherItem*> m_list;

58 LauncherBackend *m_backend;

63 LauncherBackend *m_backend;

plugins/Unity/Launcher/plugin.cpp+1−1

@@ -18,7 +18,7 @@

18 */

19

20// Qt

21−#include <QtQml>

21+#include <QtQml/qqml.h>

22

23// self

24#include "plugin.h"

plugins/Unity/genericoptionsmodel.cpp+2−2

@@ -76,9 +76,9 @@ int GenericOptionsModel::rowCount(const QModelIndex& /* parent */) const

76 return m_options.size ();

77}

78

79−void GenericOptionsModel::setActive(QVector<AbstractFilterOption *>::size_type idx, bool value)

79+void GenericOptionsModel::setActive(int idx, bool value)

80{

81− if (idx < m_options.size())

81+ if (idx >= 0 && idx < m_options.size())

82 {

83 m_options[idx]->setActive(value);

84 }

plugins/Unity/genericoptionsmodel.h+1−1

@@ -49,7 +49,7 @@ public:

49 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

50 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

51

52− Q_INVOKABLE void setActive(QVector<AbstractFilterOption *>::size_type idx, bool value);

52+ Q_INVOKABLE void setActive(int idx, bool value);

53 Q_INVOKABLE void setActive(const QString &id, bool value);

54

55 AbstractFilterOption* getRawOption(QVector<AbstractFilterOption *>::size_type idx) const;

plugins/Unity/plugin.cpp+4−1

@@ -17,8 +17,9 @@

17 */

18

19// Qt

20−#include <QtQml>

21#include <QDBusConnection>

20#include <QDBusConnection>

21+#include <QQmlContext>

22+#include <qqml.h>

22

23

23// self

24// self

24#include "plugin.h"

25#include "plugin.h"

@@ -33,6 +34,7 @@

33#include "categories.h"

34#include "categories.h"

34#include "categoryresults.h"

35#include "categoryresults.h"

35#include "bottombarvisibilitycommunicatorshell.h"

36#include "bottombarvisibilitycommunicatorshell.h"

37+#include "genericoptionsmodel.h"

36

38

37// libqtdee

39// libqtdee

38#include "deelistmodel.h"

40#include "deelistmodel.h"

@@ -47,6 +49,7 @@ void UnityPlugin::registerTypes(const char *uri)

47 qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");

49 qmlRegisterUncreatableType<PreviewAction>(uri, 0, 1, "PreviewAction", "Can't create PreviewAction object in QML.");

48 qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");

50 qmlRegisterUncreatableType<PreviewInfoHint>(uri, 0, 1, "PreviewInfoHint", "Can't create PreviewInfoHint object in QML.");

49 qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");

51 qmlRegisterUncreatableType<SocialPreviewComment>(uri, 0, 1, "SocialPreviewComment", "Can't create SocialPreviewComment object in QML.");

52+ qmlRegisterUncreatableType<GenericOptionsModel>(uri, 0, 1, "GenericOptionsModel", "Can't create options model in QML.");

50 qmlRegisterType<Scope>(uri, 0, 1, "Scope");

53 qmlRegisterType<Scope>(uri, 0, 1, "Scope");

51 qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

54 qmlRegisterType<Scopes>(uri, 0, 1, "Scopes");

52 qmlRegisterType<Categories>(uri, 0, 1, "Categories");

55 qmlRegisterType<Categories>(uri, 0, 1, "Categories");

plugins/Utils/plugin.cpp+1−1

@@ -17,7 +17,7 @@

17 */

18

19// Qt

20−#include <QtQml>

20+#include <QtQml/qqml.h>

21#include <QtQuick/QQuickWindow>

22

23// self

po/fi.po+13−13

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-09 12:18+0200\n"

11−"PO-Revision-Date: 2013-08-12 17:45+0000\n"

11+"PO-Revision-Date: 2013-08-23 16:15+0000\n"

12−"Last-Translator: Aleksi Kinnunen <Unknown>\n"

12+"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-22 06:11+0000\n"

18+"X-Launchpad-Export-Date: 2013-08-24 05:59+0000\n"

19−"X-Generator: Launchpad (build 16734)\n"

19+"X-Generator: Launchpad (build 16738)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

@@ -94,35 +94,35 @@ msgstr "Viimeisimmät haut"

94#: Dash/Apps/AppInfo.qml:72

95#, qt-format

96msgid "(%1)"

97−msgstr ""

97+msgstr "(%1)"

98

99#. TRANSLATORS: Number of persons who wrote reviews for this app

100#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115

101#, qt-format

102msgid "%1 review"

103msgid_plural "%1 reviews"

104−msgstr[0] ""

104+msgstr[0] "%1 arvostelu"

105−msgstr[1] ""

105+msgstr[1] "%1 arvostelua"

106

107#: Dash/Apps/AppPreview.qml:181

108msgid "Rate this"

109−msgstr ""

109+msgstr "Arvioi tämä"

110

111#: Dash/Apps/AppReviews.qml:72

112msgid "Add a review"

113−msgstr ""

113+msgstr "Lisää arvostelu"

114

115#: Dash/Apps/AppReviews.qml:84

116msgid "Review"

117−msgstr ""

117+msgstr "Arvostelu"

118

119#: Dash/Apps/AppReviews.qml:118

120msgid "Send"

121−msgstr ""

121+msgstr "Lähetä"

122

123#: Dash/Apps/AppReviews.qml:136

124msgid "Comments:"

125−msgstr ""

125+msgstr "Kommentit:"

126

127#: Dash/DashApps.qml:65

128msgid "Running apps"

@@ -244,4 +244,4 @@ msgstr "Hakuun täsmääviä tuloksia ei löydy."

244#: Shell.qml:399

245#, qt-format

246msgid "Please enter %1"

247−msgstr ""

247+msgstr "Kirjoita %1"

tests/autopilot/unity8/shell/emulators/create_interactive_notification.pynew file+102

@@ -0,0 +1,102 @@

1+#!/usr/bin/env python

2+

3+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

4+#

5+# Unity Autopilot Test Suite

7+#

8+# This program is free software: you can redistribute it and/or modify

9+# it under the terms of the GNU General Public License as published by

10+# the Free Software Foundation, either version 3 of the License, or

11+# (at your option) any later version.

12+#

13+# This program is distributed in the hope that it will be useful,

14+# but WITHOUT ANY WARRANTY; without even the implied warranty of

15+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

16+# GNU General Public License for more details.

17+#

18+# You should have received a copy of the GNU General Public License

19+# along with this program. If not, see <http://www.gnu.org/licenses/>.

20+#

21+

22+import argparse

23+from gi.repository import GLib, Notify

24+import signal

25+

26+

27+def action_callback(notification, action_id, data):

28+ print action_id

29+

30+

31+def quit_callback(notification):

32+ loop.quit()

33+

34+

35+if __name__ == '__main__':

36+ parser = argparse.ArgumentParser(

37+ description='Create an interactive notification'

38+ )

39+

40+ parser.add_argument(

41+ '--summary',

42+ help='summary text of the notification',

43+ default='Summary'

44+ )

45+ parser.add_argument(

46+ '--body',

47+ help='body text of the notification',

48+ default='Body'

49+ )

50+ parser.add_argument(

51+ '--icon',

52+ help='path to the icon to display',

53+ default=None

54+ )

55+ parser.add_argument(

56+ '--action',

57+ help='id and label for the callback in the format: id,label',

58+ action='append',

59+ default=[]

60+ )

61+ parser.add_argument(

62+ '--urgency',

63+ help='LOW, NORMAL, CRITICAL',

64+ choices=['LOW', 'NORMAL', 'CRITICAL'],

65+ default='NORMAL'

66+ )

67+ parser.add_argument(

68+ '--hints',

69+ help='list of comma sep options',

70+ action='append',

71+ default=[]

72+ )

73+

74+ args = parser.parse_args()

75+

76+ Notify.init('Interactive Notifications')

77+

78+ notification = Notify.Notification.new(args.summary, args.body, args.icon)

79+

80+ for hint in args.hints:

81+ key, value = hint.split(',', 1)

82+ notification.set_hint_string(key, value)

83+

84+ for action in args.action:

85+ action_id, action_label = action.split(',', 1)

86+ notification.add_action(

87+ action_id,

88+ action_label,

89+ action_callback,

90+ None,

91+ None

92+ )

93+

94+ def signal_handler(signam, frame):

95+ loop.quit()

96+

97+ signal.signal(signal.SIGINT, signal_handler)

98+

99+ loop = GLib.MainLoop.new(None, False)

100+ notification.connect('closed', quit_callback)

101+ notification.show()

102+ loop.run()

tests/autopilot/unity8/shell/tests/__init__.py+20−20

@@ -51,26 +51,25 @@ UNITYSHELL_GSETTINGS_PATH = "/org/compiz/profiles/unity/plugins/unityshell/"

51UNITYSHELL_LAUNCHER_KEY = "launcher-hide-mode"

52UNITYSHELL_LAUNCHER_MODE = 1 # launcher hidden

53

54−def _get_device_emulation_scenarios():

54+def _get_device_emulation_scenarios(devices='All'):

55+ nexus4 = ('Desktop Nexus 4',

56+ dict(app_width=768, app_height=1280, grid_unit_px=18))

57+ nexus10 = ('Desktop Nexus 10',

58+ dict(app_width=2560, app_height=1600, grid_unit_px=20))

59+ native = ('Native Device',

60+ dict(app_width=0, app_height=0, grid_unit_px=0))

61+

55 if model() == 'Desktop':

62 if model() == 'Desktop':

63+ if devices == 'All':

56− return [

64+ return [nexus4, nexus10]

57− (

65+ elif devices == 'Nexus4':

58− 'Desktop Nexus 4',

66+ return [nexus4]

59− dict(app_width=768, app_height=1280, grid_unit_px=18)

67+ elif devices == 'Nexus10':

60− ),

68+ return [nexus10]

61− (

69+ else:

62− 'Desktop Nexus 10',

70+ raise RuntimeException('Unrecognized device-option "%s" passed.' % devices)

63− dict(app_width=2560, app_height=1600, grid_unit_px=20)

64− ),

65− ]

66 else:

71 else:

67− return [

72+ return [native]

68− (

69− 'Native Device',

70− dict(app_width=0, app_height=0, grid_unit_px=0)

71− )

72− ]

73−

74

73

75class UnityTestCase(AutopilotTestCase):

74class UnityTestCase(AutopilotTestCase):

76

75

@@ -148,7 +147,7 @@ class UnityTestCase(AutopilotTestCase):

148 divisor = divisor * 2

147 divisor = divisor * 2

149 return divisor

148 return divisor

150

149

151− def launch_unity(self):

150+ def launch_unity(self, **kwargs):

152 """Launch the unity shell, return a proxy object for it."""

151 """Launch the unity shell, return a proxy object for it."""

153 binary_path = get_binary_path()

152 binary_path = get_binary_path()

154 lib_path = get_lib_path()

153 lib_path = get_lib_path()

@@ -167,7 +166,8 @@ class UnityTestCase(AutopilotTestCase):

167 binary_path,

166 binary_path,

168 *self.unity_geometry_args,

167 *self.unity_geometry_args,

169 app_type='qt',

168 app_type='qt',

170− emulator_base=UnityEmulatorBase

169+ emulator_base=UnityEmulatorBase,

170+ **kwargs

171 )

172 self._set_proxy(app_proxy)

173

tests/autopilot/unity8/shell/tests/test_notifications.pynew file+737

@@ -0,0 +1,737 @@

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Autopilot Test Suite

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

11+# This program is distributed in the hope that it will be useful,

12+# but WITHOUT ANY WARRANTY; without even the implied warranty of

13+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+# GNU General Public License for more details.

15+#

16+# You should have received a copy of the GNU General Public License

17+# along with this program. If not, see <http://www.gnu.org/licenses/>.

18+#

19+

20+"""Tests for Notifications"""

21+

22+from __future__ import absolute_import

23+

24+from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios

25+

26+from testtools.matchers import Equals, NotEquals

27+from autopilot.matchers import Eventually

28+

29+from gi.repository import Notify

30+import time

31+import os

32+import logging

33+import signal

34+import subprocess

35+

36+logger = logging.getLogger(__name__)

37+

38+

39+class NotificationsBase(UnityTestCase):

40+ """Base class for all notification tests that provides helper methods."""

41+

42+ scenarios = _get_device_emulation_scenarios('Nexus4')

43+

44+ def _get_icon_path(self, icon_name):

45+ """Given an icons file name returns the full path (either system or

46+ source tree.

47+

48+ Consider the graphics directory as root so for example (runnign tests

49+ from installed unity8-autopilot package):

50+ >>> self.get_icon_path('clock.png')

51+ /usr/share/unity8/graphics/clock.png

52+

53+ >>> self.get_icon_path('applicationIcons/facebook.png')

54+ /usr/share/unity8/graphics/applicationIcons/facebook.png

55+

56+ """

57+ if os.path.abspath(__file__).startswith('/usr/'):

58+ return '/usr/share/unity8/graphics/' + icon_name

59+ else:

60+ return os.path.abspath(

61+ os.getcwd() + "/../../graphics/" + icon_name

62+ )

63+

64+ def _get_notifications_list(self):

65+ main_view = self.main_window.get_qml_view()

66+ return main_view.select_single(

67+ "QQuickListView",

68+ objectName='notificationList'

69+ )

70+

71+ def _assert_notification(

72+ self,

73+ notification,

74+ summary=None,

75+ body=None,

76+ icon=True,

77+ secondary_icon=False,

78+ opacity=None

79+ ):

80+ """Assert that the expected qualities of a notification are as

81+ expected.

82+

83+ """

84+

85+ if summary is not None:

86+ self.assertThat(notification.summary, Eventually(Equals(summary)))

87+

88+ if body is not None:

89+ self.assertThat(notification.body, Eventually(Equals(body)))

90+

91+ if icon:

92+ self.assertThat(notification.iconSource, Eventually(NotEquals("")))

93+ else:

94+ self.assertThat(notification.iconSource, Eventually(Equals("")))

95+

96+ if secondary_icon:

97+ self.assertThat(

98+ notification.secondaryIconSource,

99+ Eventually(NotEquals(""))

100+ )

101+ else:

102+ self.assertThat(

103+ notification.secondaryIconSource,

104+ Eventually(Equals(""))

105+ )

106+

107+ if opacity is not None:

108+ self.assertThat(notification.opacity, Eventually(Equals(opacity)))

109+

110+

111+class InteractiveNotificationBase(NotificationsBase):

112+ """Collection of test for Interactive tests including snap decisions."""

113+

114+ def setUp(self):

115+ super(InteractiveNotificationBase, self).setUp()

116+ # Need to keep track when we launch the notification script.

117+ self._notify_proc = None

118+

119+ def test_interactive(self):

120+ """Interactive notification must react upon click on itself."""

121+ self.launch_unity()

122+ greeter = self.main_window.get_greeter()

123+ greeter.swipe()

124+

125+ notify_list = self._get_notifications_list()

126+

127+ summary = "Interactive notification"

128+ body = "This notification can be clicked on to trigger an action."

129+ icon_path = self._get_icon_path('avatars/anna_olsson.png')

130+ actions = [("action_id", "dummy")]

131+ hints = [

132+ ("x-canonical-switch-to-application", "true"),

133+ (

134+ "x-canonical-secondary-icon",

135+ self._get_icon_path('applicationIcons/phone-app.png')

136+ )

137+ ]

138+

139+ self._create_interactive_notification(

140+ summary,

141+ body,

142+ icon_path,

143+ "NORMAL",

144+ actions,

145+ hints,

146+ )

147+

148+ get_notification = lambda: notify_list.select_single('Notification')

149+ self.assertThat(get_notification, Eventually(NotEquals(None)))

150+ notification = get_notification()

151+

152+ self.touch.tap_object(

153+ notification.select_single(objectName="interactiveArea")

154+ )

155+

156+ self.assert_notification_action_id_was_called('action_id')

157+

158+ def test_sd_incoming_call(self):

159+ """Rejecting a call should make notification expand and offer more options."""

160+ self.launch_unity()

161+ greeter = self.main_window.get_greeter()

162+ greeter.swipe()

163+

164+ notify_list = self._get_notifications_list()

165+

166+ summary = "Incoming call"

167+ body = "Frank Zappa\n+44 (0)7736 027340"

168+ icon_path = self._get_icon_path('avatars/anna_olsson.png')

169+ hints = [

170+ (

171+ "x-canonical-secondary-icon",

172+ self._get_icon_path('applicationIcons/phone-app.png')

173+ ),

174+ ("x-canonical-snap-decisions", "true"),

175+ ]

176+

177+ actions = [

178+ ('action_accept', 'Accept'),

179+ ('action_decline_1', 'Decline'),

180+ ('action_decline_2', '"Can\'t talk now, what\'s up?"'),

181+ ('action_decline_3', '"I call you back."'),

182+ ('action_decline_4', 'Send custom message...'),

183+ ]

184+

185+ self._create_interactive_notification(

186+ summary,

187+ body,

188+ icon_path,

189+ "NORMAL",

190+ actions,

191+ hints

192+ )

193+

194+ get_notification = lambda: notify_list.select_single('Notification')

195+ self.assertThat(get_notification, Eventually(NotEquals(None)))

196+ notification = get_notification()

197+ self._assert_notification(notification, None, None, True, True, 1.0)

198+ initial_height = notification.height

199+ self.touch.tap_object(notification.select_single(objectName="button1"))

200+ self.assertThat(

201+ notification.height,

202+ Eventually(Equals(initial_height +

203+ 3 * notification.select_single(objectName="buttonColumn").spacing +

204+ 3 * notification.select_single(objectName="button4").height)))

205+ self.touch.tap_object(notification.select_single(objectName="button4"))

206+ self.assert_notification_action_id_was_called("action_decline_4")

207+

208+ def _create_interactive_notification(

209+ self,

210+ summary="",

211+ body="",

212+ icon=None,

213+ urgency="NORMAL",

214+ actions=[],

215+ hints=[]

216+ ):

217+ """Create a interactive notification command.

218+

219+ :param summary: Summary text for the notification

220+ :param body: Body text to display in the notification

221+ :param icon: Path string to the icon to use

222+ :param urgency: Urgency string for the noticiation, either: 'LOW',

223+ 'NORMAL', 'CRITICAL'

224+ :param actions: List of tuples containing the 'id' and 'label' for all

225+ the actions to add

226+ :param hint_strings: List of tuples containing the 'name' and value for

227+ setting the hint strings for the notification

228+

229+ """

230+

231+ logger.info(

232+ "Creating snap-decision notification with summary(%s), body(%s) "

233+ "and urgency(%r)",

234+ summary,

235+ body,

236+ urgency

237+ )

238+

239+ script_args = [

240+ '--summary', summary,

241+ '--body', body,

242+ '--urgency', urgency

243+ ]

244+

245+ if icon is not None:

246+ script_args.extend(['--icon', icon])

247+

248+ for hint in hints:

249+ key, value = hint

250+ script_args.extend(['--hint', "%s,%s" % (key, value)])

251+

252+ for action in actions:

253+ action_id, action_label = action

254+ action_string = "%s,%s" % (action_id, action_label)

255+ script_args.extend(['--action', action_string])

256+

257+ python_bin = subprocess.check_output(['which', 'python']).strip()

258+ command = [python_bin, self._get_notify_script()] + script_args

259+ logger.info("Launching snap-decision notification as: %s", command)

260+ self._notify_proc = subprocess.Popen(

261+ command,

262+ stdin=subprocess.PIPE,

263+ stdout=subprocess.PIPE,

264+ stderr=subprocess.PIPE,

265+ close_fds=True,

266+ )

267+

268+ self.addCleanup(self._tidy_up_script_process)

269+

270+ poll_result = self._notify_proc.poll()

271+ if poll_result is not None and self._notify_proc.returncode != 0:

272+ error_output = self._notify_proc.communicate()[1]

273+ raise RuntimeError("Call to script failed with: %s" % error_output)

274+

275+ def _get_notify_script(self):

276+ """Returns the path to the interactive notification creation script."""

277+ file_path = "../../emulators/create_interactive_notification.py"

278+

279+ the_path = os.path.abspath(

280+ os.path.join(__file__, file_path))

281+

282+ return the_path

283+

284+ def _tidy_up_script_process(self):

285+ if self._notify_proc is not None and self._notify_proc.poll() is None:

286+ logger.error("Notification process wasn't killed, killing now.")

287+ os.killpg(self._notify_proc.pid, signal.SIGTERM)

288+

289+ def assert_notification_action_id_was_called(self, action_id, timeout=10):

290+ """Assert that the interactive notification callback of id *action_id*

291+ was called.

292+

293+ :raises AssertionError: If no interactive notification has actually

294+ been created.

295+ :raises AssertionError: When *action_id* does not match the actual

296+ returned.

297+ :raises AssertionError: If no callback was called at all.

298+ """

299+

300+ if self._notify_proc is None:

301+ raise AssertionError("No interactive notification was created.")

302+

303+ for i in xrange(timeout):

304+ self._notify_proc.poll()

305+ if self._notify_proc.returncode is not None:

306+ output = self._notify_proc.communicate()

307+ actual_action_id = output[0].strip("\n")

308+ if actual_action_id != action_id:

309+ raise AssertionError(

310+ "action id '%s' does not match actual returned '%s'"

311+ % (action_id, actual_action_id)

312+ )

313+ else:

314+ return

315+ time.sleep(1)

316+

317+ os.killpg(self._notify_proc.pid, signal.SIGTERM)

318+ self._notify_proc = None

319+ raise AssertionError(

320+ "No callback was called, killing interactivenotification script"

321+ )

322+

323+

324+class EphemeralNotificationsTests(NotificationsBase):

325+ """Collection of tests for Emphemeral notifications (non-interactive.)"""

326+

327+ def setUp(self):

328+ super(EphemeralNotificationsTests, self).setUp()

329+ # Because we are using the Notify library we need to init and un-init

330+ # otherwise we get crashes.

331+ Notify.init("Autopilot Ephemeral Notification Tests")

332+ self.addCleanup(Notify.uninit)

333+

334+ def test_icon_summary_body(self):

335+ """Notification must display the expected summary and body text."""

336+ self.launch_unity()

337+ greeter = self.main_window.get_greeter()

338+ greeter.swipe()

339+

340+ notify_list = self._get_notifications_list()

341+

342+ summary = "Icon-Summary-Body"

343+ body = "Hey pal, what's up with the party next weekend? Will you " \

344+ "join me and Anna?"

345+ icon_path = self._get_icon_path('avatars/anna_olsson.png')

346+ hints = [

347+ (

348+ "x-canonical-secondary-icon",

349+ self._get_icon_path('applicationIcons/phone-app.png')

350+ )

351+ ]

352+

353+ notification = self._create_ephemeral_notification(

354+ summary,

355+ body,

356+ icon_path,

357+ hints,

358+ "NORMAL",

359+ )

360+

361+ notification.show()

362+

363+ get_notification = lambda: notify_list.select_single('Notification')

364+ self.assertThat(get_notification, Eventually(NotEquals(None)))

365+ notification = get_notification()

366+ self._assert_notification(notification, summary, body, True, True, 1.0)

367+

368+ def test_icon_summary(self):

369+ """Notification must display the expected summary and secondary icon."""

370+ self.launch_unity()

371+ greeter = self.main_window.get_greeter()

372+ greeter.swipe()

373+

374+ notify_list = self._get_notifications_list()

375+

376+ summary = "Upload of image completed"

377+ hints = [

378+ (

379+ "x-canonical-secondary-icon",

380+ self._get_icon_path('applicationIcons/facebook.png')

381+ )

382+ ]

383+

384+ notification = self._create_ephemeral_notification(

385+ summary,

386+ None,

387+ None,

388+ hints,

389+ "NORMAL",

390+ )

391+

392+ notification.show()

393+

394+ get_notification = lambda: notify_list.select_single('Notification')

395+ self.assertThat(get_notification, Eventually(NotEquals(None)))

396+ notification = get_notification()

397+ self._assert_notification(

398+ notification,

399+ summary,

400+ None,

401+ False,

402+ True,

403+ 1.0

404+ )

405+

406+ def test_urgency_order(self):

407+ """Notifications must be displayed in order according to their urgency."""

408+ self.launch_unity()

409+ greeter = self.main_window.get_greeter()

410+ greeter.swipe()

411+

412+ notify_list = self._get_notifications_list()

413+

414+ summary_low = 'Low Urgency'

415+ body_low = "No, I'd rather see paint dry, pal *yawn*"

416+ icon_path_low = self._get_icon_path('avatars/amanda.png')

417+

418+ summary_normal = 'Normal Urgency'

419+ body_normal = "Hey pal, what's up with the party next weekend? Will " \

420+ "you join me and Anna?"

421+ icon_path_normal = self._get_icon_path('avatars/funky.png')

422+

423+ summary_critical = 'Critical Urgency'

424+ body_critical = 'Dude, this is so urgent you have no idea :)'

425+ icon_path_critical = self._get_icon_path('avatars/anna_olsson.png')

426+

427+ notification_normal = self._create_ephemeral_notification(

428+ summary_normal,

429+ body_normal,

430+ icon_path_normal,

431+ urgency="NORMAL"

432+ )

433+ notification_normal.show()

434+

435+ notification_low = self._create_ephemeral_notification(

436+ summary_low,

437+ body_low,

438+ icon_path_low,

439+ urgency="LOW"

440+ )

441+ notification_low.show()

442+

443+ notification_critical = self._create_ephemeral_notification(

444+ summary_critical,

445+ body_critical,

446+ icon_path_critical,

447+ urgency="CRITICAL"

448+ )

449+ notification_critical.show()

450+

451+ get_notification = lambda: notify_list.select_single(

452+ 'Notification',

453+ summary=summary_critical

454+ )

455+ self.assertThat(get_notification, Eventually(NotEquals(None)))

456+

457+ notification = get_notification()

458+ self._assert_notification(

459+ notification,

460+ summary_critical,

461+ body_critical,

462+ True,

463+ False,

464+ 1.0

465+ )

466+

467+ get_normal_notification = lambda: notify_list.select_single(

468+ 'Notification',

469+ summary=summary_normal

470+ )

471+ self.assertThat(get_normal_notification, Eventually(NotEquals(None)))

472+ notification = get_normal_notification()

473+ self._assert_notification(

474+ notification,

475+ summary_normal,

476+ body_normal,

477+ True,

478+ False,

479+ 1.0

480+ )

481+

482+ get_low_notification = lambda: notify_list.select_single(

483+ 'Notification',

484+ summary=summary_low

485+ )

486+ self.assertThat(get_low_notification, Eventually(NotEquals(None)))

487+ notification = get_low_notification()

488+ self._assert_notification(

489+ notification,

490+ summary_low,

491+ body_low,

492+ True,

493+ False,

494+ 1.0

495+ )

496+

497+ def test_summary_and_body(self):

498+ """Notification must display the expected summary- and body-text."""

499+ self.launch_unity()

500+ greeter = self.main_window.get_greeter()

501+ greeter.swipe()

502+

503+ notify_list = self._get_notifications_list()

504+

505+ summary = 'Summary-Body'

506+ body = 'This is a superfluous notification'

507+

508+ notification = self._create_ephemeral_notification(summary, body)

509+ notification.show()

510+

511+ get_notification = lambda: notify_list.select_single('Notification')

512+ self.assertThat(get_notification, Eventually(NotEquals(None)))

513+ notification = get_notification()

514+ self._assert_notification(

515+ notification,

516+ summary,

517+ body,

518+ False,

519+ False,

520+ 1.0

521+ )

522+

523+ def test_summary_only(self):

524+ """Notification must display only the expected summary-text."""

525+ self.launch_unity()

526+ greeter = self.main_window.get_greeter()

527+ greeter.swipe()

528+

529+ notify_list = self._get_notifications_list()

530+

531+ summary = 'Summary-Only'

532+

533+ notification = self._create_ephemeral_notification(summary)

534+ notification.show()

535+

536+ get_notification = lambda: notify_list.select_single('Notification')

537+ self.assertThat(get_notification, Eventually(NotEquals(None)))

538+ notification = get_notification()

539+

540+ self._assert_notification(notification, summary, '', False, False, 1.0)

541+

542+ def test_update_notification_same_layout(self):

543+ """Notification must allow updating its contents while being displayed."""

544+ self.launch_unity()

545+ greeter = self.main_window.get_greeter()

546+ greeter.swipe()

547+

548+ notify_list = self._get_notifications_list()

549+

550+ summary = 'Initial notification'

551+ body = 'This is the original content of this notification-bubble.'

552+ icon_path = self._get_icon_path('avatars/funky.png')

553+

554+ notification = self._create_ephemeral_notification(

555+ summary,

556+ body,

557+ icon_path

558+ )

559+ notification.show()

560+

561+ get_notification = lambda: notify_list.select_single('Notification', summary=summary)

562+ self.assertThat(get_notification, Eventually(NotEquals(None)))

563+ self._assert_notification(

564+ get_notification(),

565+ summary,

566+ body,

567+ True,

568+ False,

569+ 1.0

570+ )

571+

572+ summary = 'Updated notification'

573+ body = 'Here the same bubble with new title- and body-text, even ' \

574+ 'the icon can be changed on the update.'

575+ icon_path = self._get_icon_path('avatars/amanda.png')

576+ notification.update(summary, body, icon_path)

577+ notification.show()

578+ self.assertThat(get_notification, Eventually(NotEquals(None)))

579+ self._assert_notification(get_notification(), summary, body)

580+

581+ def test_update_notification_layout_change(self):

582+ """Notification must allow updating its contents and layout while being displayed."""

583+ self.launch_unity()

584+ greeter = self.main_window.get_greeter()

585+ greeter.swipe()

586+

587+ notify_list = self._get_notifications_list()

588+

589+ summary = 'Initial layout'

590+ body = 'This bubble uses the icon-title-body layout with a ' \

591+ 'secondary icon.'

592+ icon_path = self._get_icon_path('avatars/anna_olsson.png')

593+ hint_icon = self._get_icon_path('applicationIcons/phone-app.png')

594+

595+ notification = self._create_ephemeral_notification(

596+ summary,

597+ body,

598+ icon_path

599+ )

600+ notification.set_hint_string(

601+ 'x-canonical-secondary-icon',

602+ hint_icon

603+ )

604+ notification.show()

605+

606+ get_notification = lambda: notify_list.select_single('Notification')

607+ self.assertThat(get_notification, Eventually(NotEquals(None)))

608+ self._assert_notification(

609+ get_notification(),

610+ summary,

611+ body,

612+ True,

613+ True,

614+ 1.0

615+ )

616+

617+ notification.clear_hints()

618+ summary = 'Updated layout'

619+ body = 'After the update we now have a bubble using the title-body ' \

620+ 'layout.'

621+ notification.update(summary, body, None)

622+ notification.show()

623+

624+ self.assertThat(get_notification, Eventually(NotEquals(None)))

625+ self._assert_notification(get_notification(), summary, body, False)

626+

627+ def test_append_hint(self):

628+ """Notification has to accumulate body-text using append-hint."""

629+ self.launch_unity()

630+ greeter = self.main_window.get_greeter()

631+ greeter.swipe()

632+

633+ notify_list = self._get_notifications_list()

634+

635+ summary = 'Cole Raby'

636+ body = 'Hey Bro Coly!'

637+ icon_path = self._get_icon_path('avatars/amanda.png')

638+ body_sum = body

639+ notification = self._create_ephemeral_notification(

640+ summary,

641+ body,

642+ icon_path,

643+ hints=[('x-canonical-append', 'true')]

644+ )

645+

646+ notification.show()

647+

648+ get_notification = lambda: notify_list.select_single('Notification')

649+ self.assertThat(get_notification, Eventually(NotEquals(None)))

650+ notification = get_notification()

651+ self._assert_notification(

652+ notification,

653+ summary,

654+ body_sum,

655+ True,

656+ False,

657+ 1.0

658+ )

659+

660+ bodies = [

661+ 'What\'s up dude?',

662+ 'Did you watch the air-race in Oshkosh last week?',

663+ 'Phil owned the place like no one before him!',

664+ 'Did really everything in the race work according to regulations?',

665+ 'Somehow I think to remember Burt Williams did cut corners and was not punished for this.',

666+ 'Hopefully the referees will watch the videos of the race.',

667+ 'Burt could get fined with US$ 50000 for that rule-violation :)'

668+ ]

669+

670+ for new_body in bodies:

671+ body = new_body

672+ body_sum += '\n' + body

673+ notification = self._create_ephemeral_notification(

674+ summary,

675+ body,

676+ icon_path,

677+ hints=[('x-canonical-append', 'true')]

678+ )

679+ notification.show()

680+ get_notification = lambda: notify_list.select_single(

681+ 'Notification'

682+ )

683+ self.assertThat(get_notification, Eventually(NotEquals(None)))

684+ notification = get_notification()

685+ self._assert_notification(

686+ notification,

687+ summary,

688+ body_sum,

689+ True,

690+ False,

691+ 1.0

692+ )

693+

694+ def _create_ephemeral_notification(

695+ self,

696+ summary="",

697+ body="",

698+ icon=None,

699+ hints=[],

700+ urgency="NORMAL"

701+ ):

702+ """Create an ephemeral (non-interactive) notification

703+

704+ :param summary: Summary text for the notification

705+ :param body: Body text to display in the notification

706+ :param icon: Path string to the icon to use

707+ :param hint_strings: List of tuples containing the 'name' and value

708+ for setting the hint strings for the notification

709+ :param urgency: Urgency string for the noticiation, either: 'LOW',

710+ 'NORMAL', 'CRITICAL'

711+

712+ """

713+ logger.info(

714+ "Creating ephemeral: summary(%s), body(%s), urgency(%r) "

715+ "and Icon(%s)",

716+ summary,

717+ body,

718+ urgency,

719+ icon

720+ )

721+

722+ n = Notify.Notification.new(summary, body, icon)

723+

724+ for hint in hints:

725+ key, value = hint

726+ n.set_hint_string(key, value)

727+ logger.info("Adding hint to notification: (%s, %s)", key, value)

728+ n.set_urgency(self._get_urgency(urgency))

729+

730+ return n

731+

732+ def _get_urgency(self, urgency):

733+ """Translates urgency string to enum."""

734+ _urgency_enums = {'LOW': Notify.Urgency.LOW,

735+ 'NORMAL': Notify.Urgency.NORMAL,

736+ 'CRITICAL': Notify.Urgency.CRITICAL}

737+ return _urgency_enums.get(urgency.upper())

tests/mocks/GSettings.1.0/fake_gsettings.h+1−1

@@ -18,7 +18,7 @@

18#define FAKE_GSETTINGS_H

19

20#include <QList>

21−#include <QtQml>

21+#include <QObject>

22

23class GSettingsSchemaQml: public QObject

24{

tests/mocks/GSettings.1.0/plugin.cpp+1−1

@@ -17,7 +17,7 @@

17#include "plugin.h"

18#include "fake_gsettings.h"

19

20−#include <QtQml>

20+#include <QtQml/qqml.h>

21

22static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)

23{

tests/mocks/Powerd/plugin.cpp+1−1

@@ -19,7 +19,7 @@

19#include "plugin.h"

20#include "Powerd.h"

21

22−#include <QtQml/QtQml>

22+#include <QtQml/qqml.h>

23

24static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25{

tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp−1

@@ -17,7 +17,6 @@

17#include "plugin.h"

18#include "MockDownloadTracker.h"

19

20−#include <QtQml>

21#include <QtQml/QQmlContext>

20#include <QtQml/QQmlContext>

22#include <qqml.h>

21#include <qqml.h>

23

22

tests/mocks/Unity/Indicators/fakeplugin.cpp+1−1

@@ -17,7 +17,7 @@

17 */

18

19// Qt

20−#include <QtQml>

20+#include <QtQml/qqml.h>

21

22// self

23#include "fakeplugin.h"

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+6

@@ -174,3 +174,9 @@ int MockLauncherModel::findApp(const QString &appId)

174 }

175 return -1;

176}

177+

178+void MockLauncherModel::setUser(const QString &username)

179+{

180+ Q_UNUSED(username)

181+ // TODO: implement this...

182+}

tests/mocks/Unity/Launcher/MockLauncherModel.h+1

@@ -43,6 +43,7 @@ public:

43 Q_INVOKABLE void pin(const QString &appId, int index = -1);

44 Q_INVOKABLE void requestRemove(const QString &appId);

45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

46+ Q_INVOKABLE void setUser(const QString &username);

46

47

47Q_SIGNALS:

48Q_SIGNALS:

48 void quickListTriggered(const QString &appId, int index);

49 void quickListTriggered(const QString &appId, int index);

tests/mocks/Unity/fake_unity_plugin.cpp+2−1

@@ -26,7 +26,8 @@

26

27// External

28#include <glib-object.h>

29+

29−#include <QtQml>

30+#include <QtQml/qqml.h>

30

31

31void FakeUnityPlugin::registerTypes(const char *uri)

32void FakeUnityPlugin::registerTypes(const char *uri)

32{

33{

tests/qmltests/Launcher/tst_Launcher.qml+38−14

@@ -277,19 +277,24 @@ Item {

277

278 function test_dragndrop_data() {

279 return [

280− {tag: "startDrag", fullDrag: false},

280+ {tag: "startDrag", fullDrag: false },

281+ {tag: "fullDrag horizontal", fullDrag: true, orientation: ListView.Horizontal },

281− {tag: "fullDrag", fullDrag: true},

282+ {tag: "fullDrag vertical", fullDrag: true, orientation: ListView.Vertical },

282 ];

283 ];

283 }

284 }

284

285

285 function test_dragndrop(data) {

286 function test_dragndrop(data) {

286 revealer.dragLauncherIntoView();

287 revealer.dragLauncherIntoView();

287− var draggedItem = findChild(launcher, "launcherDelegate5")

288+ var draggedItem = findChild(launcher, "launcherDelegate4")

288 var item0 = findChild(launcher, "launcherDelegate0")

289 var item0 = findChild(launcher, "launcherDelegate0")

289 var fakeDragItem = findChild(launcher, "fakeDragItem")

290 var fakeDragItem = findChild(launcher, "fakeDragItem")

290 var initialItemHeight = draggedItem.height

291 var initialItemHeight = draggedItem.height

291− var item5Name = LauncherModel.get(5).iconName

292− var item4Name = LauncherModel.get(4).iconName

292+ var item4 = LauncherModel.get(4).appId

293+ var item3 = LauncherModel.get(3).appId

294+

295+ var listView = findChild(launcher, "launcherListView");

296+ listView.flick(0, units.gu(200));

297+ tryCompare(listView, "flicking", false);

293

298

294 // Initial state

299 // Initial state

295 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")

300 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")

@@ -297,28 +302,43 @@ Item {

297 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

302 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

298

303

299 // Doing longpress

304 // Doing longpress

305+ var currentMouseX = draggedItem.width / 2

300− mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

306+ var currentMouseY = draggedItem.height / 2

307+ mousePress(draggedItem, currentMouseX, currentMouseY)

301 // DraggedItem needs to hide and fakeDragItem become visible

308 // DraggedItem needs to hide and fakeDragItem become visible

302 tryCompare(draggedItem, "itemOpacity", 0)

309 tryCompare(draggedItem, "itemOpacity", 0)

303 tryCompare(fakeDragItem, "visible", true)

310 tryCompare(fakeDragItem, "visible", true)

304

311

305 // Dragging a bit (> 1.5 gu)

312 // Dragging a bit (> 1.5 gu)

306− mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)

313+ currentMouseX -= units.gu(2)

314+ mouseMove(draggedItem, currentMouseX, currentMouseY)

307 // Other items need to expand and become 0.6 opaque

315 // Other items need to expand and become 0.6 opaque

308 tryCompare(item0, "angle", 0)

316 tryCompare(item0, "angle", 0)

309 tryCompare(item0, "itemOpacity", 0.6)

317 tryCompare(item0, "itemOpacity", 0.6)

310

318

311 if (data.fullDrag) {

319 if (data.fullDrag) {

312 // Dragging a bit more

320 // Dragging a bit more

321+ if (data.orientation == ListView.Horizontal) {

322+ currentMouseX -= units.gu(15)

323+ mouseMove(draggedItem, currentMouseX, currentMouseY, 100)

324+

325+ tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

313− mouseMove(draggedItem, -units.gu(15), draggedItem.height / 2, 100)

326+ tryCompare(draggedItem, "height", units.gu(1))

327+

328+ // Dragging downwards. Item needs to move in the model

329+ currentMouseY -= initialItemHeight * 1.5

330+ mouseMove(draggedItem, currentMouseX, currentMouseY)

331+ } else if (data.orientation == ListView.Vertical) {

332+ currentMouseY -= initialItemHeight * 1.5

333+ mouseMove(draggedItem, currentMouseX, currentMouseY, 100)

334+

314− tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

335+ tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

315− tryCompare(draggedItem, "height", units.gu(1))

336+ tryCompare(draggedItem, "height", units.gu(1))

337+ }

316

338

317− // Dragging downwards. Item needs to move in the model

318− mouseMove(draggedItem, -units.gu(15), -initialItemHeight)

319 waitForRendering(draggedItem)

339 waitForRendering(draggedItem)

320− compare(LauncherModel.get(5).iconName, item4Name)

340+ compare(LauncherModel.get(4).appId, item3)

321− compare(LauncherModel.get(5).iconName, item5Name)

341+ compare(LauncherModel.get(3).appId, item4)

322 }

342 }

323

343

324 // Releasing and checking if initial values are restored

344 // Releasing and checking if initial values are restored

@@ -326,6 +346,10 @@ Item {

326 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

346 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)

327 tryCompare(draggedItem, "itemOpacity", 1)

347 tryCompare(draggedItem, "itemOpacity", 1)

328 tryCompare(fakeDragItem, "visible", false)

348 tryCompare(fakeDragItem, "visible", false)

349+

350+ // Click somewhere in the empty space to make it hide in case it isn't

351+ mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));

352+ revealer.waitUntilLauncherDisappears();

329 }

353 }

330

354

331 function test_quicklist_dismiss() {

355 function test_quicklist_dismiss() {

tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+1−1

@@ -19,7 +19,7 @@

19

20#include <QtCore/QObject>

21#include <QtTest/QTest>

22−#include <QtQml/QtQml>

22+#include <QtQml/qqml.h>

23

24class TouchEventSequenceWrapper : public QObject

25{

tests/utils/modules/Unity/Test/UnityTestCase.qml+21−2

@@ -69,9 +69,28 @@ TestCase {

69 }

70

71

72− // Find an object with the given name recursively, starting

72+ // Find an object with the given name in the children tree of "obj"

73− // at the given object "obj"

74 function findChild(obj,objectName) {

73 function findChild(obj,objectName) {

74+ var childs = new Array(0);

75+ childs.push(obj)

76+ while (childs.length > 0) {

77+ if (childs[0].objectName == objectName) {

78+ return childs[0]

79+ }

80+ for (var i in childs[0].children) {

81+ childs.push(childs[0].children[i])

82+ }

83+ childs.splice(0, 1);

84+ }

85+ return undefined;

86+ }

87+

88+ // Find an object with the given name in the children tree of "obj"

89+ // Including invisible children like animations, timers etc.

90+ // Note: you should use findChild if you're not sure you need this

91+ // as this tree is much bigger and might contain stuff that goes

92+ // away randomly.

93+ function findInvisibleChild(obj,objectName) {

75 var childs = new Array(0);

94 var childs = new Array(0);

76 childs.push(obj)

95 childs.push(obj)

77 while (childs.length > 0) {

96 while (childs.length > 0) {