017d1e8 · unity8 · git.iko.soy

cmake/modules/QmlTest.cmake+2−2

compare with xenial

unifiedsplit

@@ -135,7 +135,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

135 set(testCommand

136 LD_LIBRARY_PATH=${LD_PATH}

137 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

138− -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml

138+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml

139 -o -,txt)

140

141 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)

@@ -151,7 +151,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

151 LD_LIBRARY_PATH=${LD_PATH}

152 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum

153 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

154− -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml

154+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml

155 -o -,txt)

156

157 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)

debian/changelog+58

@@ -1,3 +1,61 @@

1+unity8 (8.00+14.10.20140806.1-0ubuntu1) utopic; urgency=low

2+

3+ [ Michal Hruby ]

4+ * Work with the scopes-v4 branch + departments->navigation renaming

5+

6+ [ Michał Sawicz ]

7+ * Hardcode art shape size for click scope local and predefined

8+ categories While at it, drop the fillmode of cards

9+ * Use the correct API in PageHeader. (LP: #1353048)

10+ * Refactor dash activity indicator. (LP: #1351539)

11+

12+ [ Albert Astals ]

13+ * Dash Departments fixes Update maxHeight manually since it depends on

14+ the position of the item and its parents and it can't know when the

15+ binding has to be updated Make parent stuff non interactive when the

16+ department list is shown

17+ * PageHeader: when on search clip y-coordinates otherwise the

18+ background spills out when on search (LP: #1350398)

19+ * Dash: Implement OverlayColor support in Cards

20+ * Hardcode art shape size for click scope local and predefined

21+ categories While at it, drop the fillmode of cards

22+ * Make test_departments test more stable There's various

23+ DashDepartments on the dash, make sure we're working over the one

24+ that is on screen, otherwise clicks don't end up where they should

25+ * Work with the scopes-v4 branch + departments->navigation renaming

26+ * Fixes for dash as app Load i18n catalog Process command line options

27+ Add the posibility to have a mouse touch adaptor (LP: #1353351)

28+ * Implement the Expandable Preview Widget Now TextSummary is not

29+ expandable by itself anymore, you have to use it inside an

30+ Expandable to get the behaviour

31+ * Add test prefix to xml output, seems CI needs it

32+

33+ [ Antti Kaijanmäki ]

34+ * Indicators: Adds new ModemInfoItem to be used with indicator-network

35+ (LP: #1329204)

36+

37+ [ Michael Terry ]

38+ * When the edge demo is running, don't show the greeter if the screen

39+ is turned off. This avoids an odd interaction where parts of the

40+ greeter are disabled but the edge demo isn't visible until you slide

41+ the greeter away. (LP: #1283425)

42+ * Don't hardcode the phablet password in our testing script.

43+

44+ [ Ying-Chun Liu ]

45+ * Add divider dots.

46+

47+ [ Mirco Müller ]

48+ * Make sure the TextField of a snap-decision notification has the

49+ active focus upon creation, thus the osk shows up right away. (LP:

50+ #1346867)

51+

52+ [ Andrea Cimitan ]

53+ * Add touchdown effect to dash cards.

54+ * Import Ubuntu.Components for preview image gallery to pick up

55+ default flicking speeds.

56+

57+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 06 Aug 2014 19:40:05 +0000

58+

1unity8 (8.00+14.10.20140805-0ubuntu1) utopic; urgency=low

59unity8 (8.00+14.10.20140805-0ubuntu1) utopic; urgency=low

2

60

3 [ Michael Zanetti ]

61 [ Michael Zanetti ]

debian/control+2−2

@@ -24,7 +24,7 @@ Build-Depends: cmake,

24 libpulse-dev,

25 libqmenumodel-dev (>= 0.2.8),

26 libqt5xmlpatterns5-dev,

27− libunity-api-dev (>= 7.87),

27+ libunity-api-dev (>= 7.88),

28 libusermetricsoutput1-dev,

29 libxcb1-dev,

30 pkg-config,

@@ -112,7 +112,7 @@ Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

112 unity-application-impl-2,

113 unity-notifications-impl-3,

114 unity-plugin-scopes | unity-scopes-impl,

115− unity-scopes-impl-2,

115+ unity-scopes-impl-4,

116 unity8-fake-env | unity-application-impl,

117 ${misc:Depends},

118Breaks: unity8 (<< 7.86),

plugins/Dash/CardCreator.js+26−12

@@ -71,19 +71,14 @@ var kArtShapeHolderCode = 'Item { \n\

71 visible: image.status == Image.Ready; \n\

72 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\

73 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1; \n\

74− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect; \n\

75 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; } \n\

74 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; } \n\

76− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\

77 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

75 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

78 function updateWidthHeightBindings() { \n\

76 function updateWidthHeightBindings() { \n\

79 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

77 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

80 width = root.fixedArtShapeSize.width; \n\

78 width = root.fixedArtShapeSize.width; \n\

81 height = root.fixedArtShapeSize.height; \n\

79 height = root.fixedArtShapeSize.height; \n\

82− } else if (aspectSmallerThanImageAspect) { \n\

83− width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\

84− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect }); \n\

85 } else { \n\

80 } else { \n\

86− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect }); \n\

81+ width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\

87 height = Qt.binding(function() { return !visible ? 0 : image.height }); \n\

82 height = Qt.binding(function() { return !visible ? 0 : image.height }); \n\

88 } \n\

83 } \n\

89 } \n\

84 } \n\

@@ -92,8 +87,7 @@ var kArtShapeHolderCode = 'Item { \n\

92 source: cardData && cardData["art"] || ""; \n\

87 source: cardData && cardData["art"] || ""; \n\

93 cache: true; \n\

88 cache: true; \n\

94 asynchronous: root.asynchronous; \n\

89 asynchronous: root.asynchronous; \n\

95− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop; \n\

90+ fillMode: Image.PreserveAspectCrop; \n\

96− readonly property real aspect: implicitWidth / implicitHeight; \n\

97 width: %2; \n\

91 width: %2; \n\

98 height: %3; \n\

92 height: %3; \n\

99 } \n\

93 } \n\

@@ -114,7 +108,7 @@ var kOverlayLoaderCode = 'Loader { \n\

114 sourceComponent: ShaderEffect { \n\

108 sourceComponent: ShaderEffect { \n\

115 id: overlay; \n\

109 id: overlay; \n\

116 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\

110 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\

117− opacity: 0.6; \n\

111+ property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\

118 property var source: ShaderEffectSource { \n\

112 property var source: ShaderEffectSource { \n\

119 id: shaderSource; \n\

113 id: shaderSource; \n\

120 sourceItem: artShapeLoader.item; \n\

114 sourceItem: artShapeLoader.item; \n\

@@ -135,9 +129,10 @@ var kOverlayLoaderCode = 'Loader { \n\

135 varying highp vec2 coord; \n\

129 varying highp vec2 coord; \n\

136 uniform sampler2D source; \n\

130 uniform sampler2D source; \n\

137 uniform lowp float qt_Opacity; \n\

131 uniform lowp float qt_Opacity; \n\

132+ uniform highp vec4 overlayColor; \n\

138 void main() { \n\

133 void main() { \n\

139 lowp vec4 tex = texture2D(source, coord); \n\

134 lowp vec4 tex = texture2D(source, coord); \n\

140− gl_FragColor = vec4(0, 0, 0, tex.a) * qt_Opacity; \n\

135+ gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a; \n\

141 }"; \n\

136 }"; \n\

142 } \n\

137 } \n\

143 }\n';

138 }\n';

@@ -257,6 +252,16 @@ var kTitleLabelCode = 'Label { \n\

257 horizontalAlignment: root.headerAlignment; \n\

252 horizontalAlignment: root.headerAlignment; \n\

258 }\n';

253 }\n';

259

254

255+// %1 is used as anchors of touchdown effect

256+var kTouchdownCode = 'UbuntuShape { \n\

257+ id: touchdown; \n\

258+ objectName: "touchdown"; \n\

259+ anchors { %1 } \n\

260+ visible: root.pressed; \n\

261+ radius: "medium"; \n\

262+ borderSource: "radius_pressed.sci" \n\

263+ }\n';

264+

260// %1 is used as anchors of subtitleLabel

265// %1 is used as anchors of subtitleLabel

261// %2 is used as color of subtitleLabel

266// %2 is used as color of subtitleLabel

262var kSubtitleLabelCode = 'Label { \n\

267var kSubtitleLabelCode = 'Label { \n\

@@ -279,7 +284,7 @@ var kAttributesRowCode = 'CardAttributes { \n\

279 objectName: "attributesRow"; \n\

284 objectName: "attributesRow"; \n\

280 anchors { %1 } \n\

285 anchors { %1 } \n\

281 color: %2; \n\

286 color: %2; \n\

282− model: cardData && cardData["attributes"] || undefined; \n\

287+ model: cardData["attributes"]; \n\

283 }\n';

288 }\n';

284

289

285// %1 is used as top anchor of summary

290// %1 is used as top anchor of summary

@@ -569,6 +574,16 @@ function cardString(template, components) {

569 code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);

574 code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);

570 }

575 }

571

576

577+ var touchdownAnchors;

578+ if (hasBackground) {

579+ touchdownAnchors = 'fill: backgroundLoader';

580+ } else if (hasArt && !hasMascot && !hasSummary) {

581+ touchdownAnchors = 'fill: artShapeHolder';

582+ } else {

583+ touchdownAnchors = 'fill: root'

584+ }

585+ code += kTouchdownCode.arg(touchdownAnchors);

586+

572 if (hasSummary) {

587 if (hasSummary) {

573 code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';

588 code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';

574 } else if (hasHeaderRow) {

589 } else if (hasHeaderRow) {

@@ -593,7 +608,6 @@ function cardString(template, components) {

593function createCardComponent(parent, template, components) {

608function createCardComponent(parent, template, components) {

594 var imports = 'import QtQuick 2.2; \n\

609 var imports = 'import QtQuick 2.2; \n\

595 import Ubuntu.Components 0.1; \n\

610 import Ubuntu.Components 0.1; \n\

596− import Ubuntu.Thumbnailer 0.1;\n\

597 import Dash 0.1;\n';

611 import Dash 0.1;\n';

598 var card = cardString(template, components);

612 var card = cardString(template, components);

599 var code = imports + 'Component {\n' + card + '}\n';

613 var code = imports + 'Component {\n' + card + '}\n';

plugins/Dash/ScopeStyle.qml+11−8

@@ -38,14 +38,20 @@ QtObject {

38 /// Color used for text and symbolic icons

39 readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark

40

41+ /// Luminance of the foreground color

42+ readonly property real foregroundLuminance: foreground ? luminance(foreground) : d.defaultForegroundLuminance

43+

41 /// Color used for the overall background

44 /// Color used for the overall background

42 readonly property color background: "background-color" in style ? style["background-color"] : "transparent"

45 readonly property color background: "background-color" in style ? style["background-color"] : "transparent"

43

46

47+ /// Luminance of the foreground color

48+ readonly property real backgroundLuminance: background ? luminance(background) : d.defaultBackgroundLuminance

49+

44 /*! \brief Luminance threshold for switching between fore and background color

50 /*! \brief Luminance threshold for switching between fore and background color

45

51

46 \note If background colour is not fully opaque, it's not taken into account.

52 \note If background colour is not fully opaque, it's not taken into account.

47 */

53 */

48− readonly property real threshold: background.a !== 1.0 ? d.foregroundLuminance : (d.foregroundLuminance + d.backgroundLuminance) / 2

54+ readonly property real threshold: background.a !== 1.0 ? foregroundLuminance : (foregroundLuminance + backgroundLuminance) / 2

49

55

50 /*! \brief The lighter of foreground and background colors

56 /*! \brief The lighter of foreground and background colors

51

57

@@ -53,8 +59,8 @@ QtObject {

53 and defaults to the theme-provided light color.

59 and defaults to the theme-provided light color.

54 */

60 */

55 readonly property color light: {

61 readonly property color light: {

56− if (background.a !== 1.0) return d.foregroundLuminance > d.defaultLightLuminance ? foreground : d.defaultLight;

62+ if (background.a !== 1.0) return foregroundLuminance > d.defaultLightLuminance ? foreground : d.defaultLight;

57− return d.foregroundLuminance > d.backgroundLuminance ? foreground : background;

63+ return foregroundLuminance > backgroundLuminance ? foreground : background;

58 }

64 }

59

65

60 /*! \brief The darker of foreground and background colors

66 /*! \brief The darker of foreground and background colors

@@ -63,8 +69,8 @@ QtObject {

63 and defaults to the theme-provided dark color.

69 and defaults to the theme-provided dark color.

64 */

70 */

65 readonly property color dark: {

71 readonly property color dark: {

66− if (background.a !== 1.0) return d.foregroundLuminance < d.defaultDarkLuminance ? foreground : d.defaultDark;

72+ if (background.a !== 1.0) return foregroundLuminance < d.defaultDarkLuminance ? foreground : d.defaultDark;

67− return d.foregroundLuminance < d.backgroundLuminance ? foreground : background;

73+ return foregroundLuminance < backgroundLuminance ? foreground : background;

68 }

74 }

69

75

70 /// Source of the logo image for the header

76 /// Source of the logo image for the header

@@ -78,9 +84,6 @@ QtObject {

78

84

79 //! @cond

85 //! @cond

80 property var d: QtObject {

86 property var d: QtObject {

81− readonly property real foregroundLuminance: luminance(foreground)

82− readonly property real backgroundLuminance: luminance(background)

83−

84 // FIXME: should be taken from the theme

87 // FIXME: should be taken from the theme

85 readonly property color defaultLight: "white"

88 readonly property color defaultLight: "white"

86 readonly property color defaultDark: "grey"

89 readonly property color defaultDark: "grey"

po/es.po+5−5

@@ -8,14 +8,14 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-07-26 06:22+0000\n"

11+"PO-Revision-Date: 2014-08-06 15:24+0000\n"

12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"

12+"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"

13"Language-Team: Spanish <es@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−"X-Launchpad-Export-Date: 2014-07-27 06:35+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"

18−"X-Generator: Launchpad (build 17131)\n"

18+"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -116,7 +116,7 @@ msgstr "Recientes"

116

117#: qml/Dash/GenericScopeView.qml:330

118msgid "See all"

119−msgstr "Ver todo"

119+msgstr "Ver todas"

120

121#: qml/Dash/Previews/PreviewActionCombo.qml:34

122msgid "More..."

po/eu.po+7−6

@@ -8,14 +8,14 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-07-25 12:38+0000\n"

11+"PO-Revision-Date: 2014-08-06 22:51+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@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−"X-Launchpad-Export-Date: 2014-07-26 07:16+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"

18−"X-Generator: Launchpad (build 17131)\n"

18+"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -36,7 +36,8 @@ msgstr "Eskuineko ertza"

36

37#: qml/Components/EdgeDemo.qml:114

38msgid "Try swiping from the right edge to unlock the phone"

39+msgstr ""

39−msgstr "Probatu eskuineko ertzetik arrastatzen telefonoa desblokeatzeko"

40+"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"

40

41

41#: qml/Components/EdgeDemo.qml:145

42#: qml/Components/EdgeDemo.qml:145

42msgid "Top edge"

43msgid "Top edge"

@@ -44,7 +45,7 @@ msgstr "Goiko ertza"

44

45

45#: qml/Components/EdgeDemo.qml:146

46#: qml/Components/EdgeDemo.qml:146

46msgid "Try swiping from the top edge to access the indicators"

47msgid "Try swiping from the top edge to access the indicators"

47−msgstr "Probatu goiko ertzetik arrastatzen adierazleak ikusteko"

48+msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"

48

49

49#: qml/Components/EdgeDemo.qml:171

50#: qml/Components/EdgeDemo.qml:171

50msgid "Close"

51msgid "Close"

@@ -52,7 +53,7 @@ msgstr "Itxi"

52

53

53#: qml/Components/EdgeDemo.qml:172

54#: qml/Components/EdgeDemo.qml:172

54msgid "Swipe up again to close the settings screen"

55msgid "Swipe up again to close the settings screen"

55−msgstr "Pasatu hatza gora berriro ezarpenen leihoa ixteko"

56+msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"

56

57

57#: qml/Components/EdgeDemo.qml:199

58#: qml/Components/EdgeDemo.qml:199

58msgid "Left edge"

59msgid "Left edge"

po/hu.po+4−4

@@ -8,14 +8,14 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-08-04 09:10+0000\n"

11+"PO-Revision-Date: 2014-08-06 07:41+0000\n"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@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−"X-Launchpad-Export-Date: 2014-08-05 06:45+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"

18−"X-Generator: Launchpad (build 17147)\n"

18+"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -91,7 +91,7 @@ msgstr "Üdv %1"

91

92#: qml/Components/PassphraseLockscreen.qml:60

93msgid "Hello"

94−msgstr "Üdv"

94+msgstr "Üdvözöljük"

95

96#: qml/Components/PinLockscreen.qml:198

97msgid "CANCEL"

po/ja.po+15−15

@@ -8,14 +8,14 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-01-18 07:01+0000\n"

11+"PO-Revision-Date: 2014-08-08 06:18+0000\n"

12−"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"

12+"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"

13"Language-Team: Japanese <ja@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−"X-Launchpad-Export-Date: 2014-07-26 07:16+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"

18−"X-Generator: Launchpad (build 17131)\n"

18+"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -28,7 +28,7 @@ msgstr ""

28

29#: qml/Components/EdgeDemoOverlay.qml:151

30msgid "Skip intro"

31−msgstr ""

31+msgstr "導入ガイドをスキップ"

32

33#: qml/Components/EdgeDemo.qml:113

34msgid "Right edge"

@@ -44,7 +44,7 @@ msgstr "上端"

44

45#: qml/Components/EdgeDemo.qml:146

46msgid "Try swiping from the top edge to access the indicators"

47−msgstr ""

47+msgstr "インジケーターにアクセスするには上端からスワイプしてみてください"

48

49#: qml/Components/EdgeDemo.qml:171

50msgid "Close"

@@ -52,7 +52,7 @@ msgstr "閉じる"

52

53#: qml/Components/EdgeDemo.qml:172

54msgid "Swipe up again to close the settings screen"

55−msgstr ""

55+msgstr "設定画面を閉じるにはもう一度上にスワイプしてください"

56

57#: qml/Components/EdgeDemo.qml:199

58msgid "Left edge"

@@ -60,11 +60,11 @@ msgstr "左端"

60

61#: qml/Components/EdgeDemo.qml:200

62msgid "Swipe from the left to reveal the launcher for quick access to apps"

63−msgstr ""

63+msgstr "アプリに素早くアクセスできるLauncherを表示するには左からスワイプしてください"

64

65#: qml/Components/EdgeDemo.qml:227

66msgid "Well done"

67−msgstr ""

67+msgstr "よくできました！"

68

69#: qml/Components/EdgeDemo.qml:228

70msgid ""

@@ -74,16 +74,16 @@ msgstr ""

74

75#: qml/Components/Lockscreen.qml:214

76msgid "Emergency Call"

77−msgstr ""

77+msgstr "緊急通報"

78

79#: qml/Components/Lockscreen.qml:231

80msgid "OK"

81−msgstr ""

81+msgstr "OK"

82

83#: qml/Components/PassphraseLockscreen.qml:60

84#, qt-format

85msgid "Hello %1"

86−msgstr ""

86+msgstr "こんにちは %1 さん"

87

88#: qml/Components/PassphraseLockscreen.qml:60

89msgid "Hello"

@@ -99,7 +99,7 @@ msgstr ""

99

100#: qml/Components/SeeMore.qml:35

101msgid "See more"

102−msgstr ""

102+msgstr "さらに表示する"

103

104#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330

105msgid "See less"

@@ -127,7 +127,7 @@ msgstr ""

127

128#: qml/Dash/Previews/PreviewRatingInput.qml:126

129msgid "Add a review"

130−msgstr ""

130+msgstr "レビューを追加"

131

132#: qml/Dash/Previews/PreviewRatingInput.qml:166

133msgid "Send"

@@ -155,7 +155,7 @@ msgstr "音声入力を開始..."

155

156#: qml/Hud/Hud.qml:94

157msgid "Speaking..."

158−msgstr ""

158+msgstr "入力中..."

159

160#: qml/Notifications/NotificationMenuItemFactory.qml:91

161msgid "Show password"

po/pt_BR.po+7−7

@@ -8,23 +8,23 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-07-11 14:59+0200\n"

11−"PO-Revision-Date: 2014-08-04 18:33+0000\n"

11+"PO-Revision-Date: 2014-08-07 12:34+0000\n"

12−"Last-Translator: Rafael Neri <Unknown>\n"

12+"Last-Translator: Salomão Carneiro de Brito <salomaocar@gmail.com>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@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−"X-Launchpad-Export-Date: 2014-08-05 06:45+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"

18−"X-Generator: Launchpad (build 17147)\n"

18+"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

22msgid "Pin shortcut"

23−msgstr ""

23+msgstr "Fixar atalho"

24

25#: plugins/Unity/Launcher/launcheritem.cpp:73

26msgid "Unpin shortcut"

27−msgstr ""

27+msgstr "Desafixar atalho"

28

29#: qml/Components/EdgeDemoOverlay.qml:151

30msgid "Skip intro"

@@ -179,7 +179,7 @@ msgstr "Conferência"

179

180#: qml/Panel/Indicators/MenuItemFactory.qml:583

181msgid "In queue…"

182−msgstr ""

182+msgstr "Em fila..."

183

184#: qml/Panel/Indicators/MenuItemFactory.qml:587

185msgid "Downloading"

po/sl.po+2−2

@@ -14,8 +14,8 @@ msgstr ""

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-08-06 06:55+0000\n"

17+"X-Launchpad-Export-Date: 2014-08-08 07:07+0000\n"

18−"X-Generator: Launchpad (build 17147)\n"

18+"X-Generator: Launchpad (build 17156)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

qml/Components/EdgeDemo.qml+15−15

@@ -24,13 +24,13 @@ Item {

24 property Item greeter

25 property Item launcher

26 property Item indicators

27− property Item underlay

27+ property Item stages

28

29 property bool launcherEnabled: true

30− property bool dashEnabled: true

30+ property bool stagesEnabled: true

31 property bool panelEnabled: true

32 property bool panelContentEnabled: true

33− property bool running: !launcherEnabled || !dashEnabled || !panelEnabled || !panelContentEnabled

33+ property bool running: !launcherEnabled || !stagesEnabled || !panelEnabled || !panelContentEnabled

34

35 property bool paused: false

36

@@ -58,7 +58,7 @@ Item {

58

59 function stopDemo() {

60 launcherEnabled = true

61− dashEnabled = true

61+ stagesEnabled = true

62 panelEnabled = true

63 panelContentEnabled = true

64 if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()

@@ -74,11 +74,11 @@ Item {

74 }

75

76 launcherEnabled = false;

77− dashEnabled = false;

77+ stagesEnabled = false;

78 panelEnabled = false;

79 panelContentEnabled = false;

80

81− // Begin with either greeter or dash, depending on which is visible

81+ // Begin with either greeter or top, depending on which is visible

82 if (greeter && greeter.shown) {

83 startRightEdgeDemo()

84 } else {

@@ -138,12 +138,12 @@ Item {

138

139 function startTopEdgeDemo() {

140 demo.panelEnabled = true;

141− if (demo.dash && demo.underlay) {

141+ if (demo.stages) {

142− d.topEdgeDemo = d.overlay.createObject(demo.underlay, {

142+ d.topEdgeDemo = d.overlay.createObject(demo.stages, {

143 "edge": "top",

144 "title": i18n.tr("Top edge"),

145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),

146− "anchors.fill": demo.underlay,

146+ "anchors.fill": demo.stages,

147 });

148 }

149 if (d.topEdgeDemo) {

@@ -192,12 +192,12 @@ Item {

192 function startLeftEdgeDemo() {

193 demo.panelEnabled = false;

194 demo.launcherEnabled = true;

195− if (demo.underlay) {

195+ if (demo.stages) {

196− d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {

196+ d.leftEdgeDemo = d.overlay.createObject(demo.stages, {

197 "edge": "left",

198 "title": i18n.tr("Left edge"),

199 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),

200− "anchors.fill": demo.underlay,

200+ "anchors.fill": demo.stages,

201 });

202 }

203 if (d.leftEdgeDemo) {

@@ -220,12 +220,12 @@ Item {

220

221 function startFinalEdgeDemo() {

222 demo.launcherEnabled = false;

223− if (demo.underlay) {

223+ if (demo.stages) {

224− d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {

224+ d.finalEdgeDemo = d.overlay.createObject(demo.stages, {

225 "edge": "none",

226 "title": i18n.tr("Well done"),

227 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),

228− "anchors.fill": demo.underlay,

228+ "anchors.fill": demo.stages,

229 "showSkip": false,

230 });

231 }

qml/Components/PageHeader.qml+25−16

@@ -32,9 +32,10 @@ Item {

32 property bool searchEntryEnabled: false

33 property ListModel searchHistory: SearchHistoryModel

34 property alias searchQuery: searchTextField.text

35− property bool searchInProgress: false

36

35

37 property alias bottomItem: bottomContainer.children

36 property alias bottomItem: bottomContainer.children

37+ property int paginationCount: 0

38+ property int paginationIndex: -1

38

39

39 // TODO We should use foreground for the icons

40 // TODO We should use foreground for the icons

40 // of the toolbar but unfortunately Action does not have

41 // of the toolbar but unfortunately Action does not have

@@ -125,7 +126,7 @@ Item {

125 Flickable {

126 Flickable {

126 id: headerContainer

127 id: headerContainer

127 objectName: "headerContainer"

128 objectName: "headerContainer"

128− clip: openSearchAnimation.running

129+ clip: contentY < height

129 anchors { left: parent.left; top: parent.top; right: parent.right }

130 anchors { left: parent.left; top: parent.top; right: parent.right }

130 height: units.gu(6.5)

131 height: units.gu(6.5)

131 contentHeight: headersColumn.height

132 contentHeight: headersColumn.height

@@ -169,6 +170,7 @@ Item {

169 property var styledItem: searchHeader

170 property var styledItem: searchHeader

170 property string title

171 property string title

171 property var config: PageHeadConfiguration {

172 property var config: PageHeadConfiguration {

173+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"

172 backAction: Action {

174 backAction: Action {

173 iconName: "back"

175 iconName: "back"

174 onTriggered: {

176 onTriggered: {

@@ -200,25 +202,13 @@ Item {

200 anchors.fill: parent

202 anchors.fill: parent

201 anchors.margins: units.gu(.75)

203 anchors.margins: units.gu(.75)

202 source: "image://theme/clear"

204 source: "image://theme/clear"

203− opacity: searchTextField.text.length > 0 && !searchActivityIndicator.running

205+ opacity: searchTextField.text.length > 0

204 visible: opacity > 0

206 visible: opacity > 0

205 Behavior on opacity {

207 Behavior on opacity {

206 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }

208 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }

207 }

209 }

208 }

210 }

209

211

210− ActivityIndicator {

211− id: searchActivityIndicator

212− objectName: "searchIndicator"

213− anchors.fill: parent

214− anchors.margins: units.gu(.75)

215− running: root.searchInProgress

216− opacity: running ? 1 : 0

217− Behavior on opacity {

218− UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }

219− }

220− }

221−

222 onClicked: {

212 onClicked: {

223 root.resetSearch(true);

213 root.resetSearch(true);

224 root.openSearchHistory();

214 root.openSearchHistory();

@@ -247,10 +237,10 @@ Item {

247 contentHeight: height

237 contentHeight: height

248 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

238 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout

249 separatorSource: ""

239 separatorSource: ""

250− textColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"

251 property var styledItem: header

240 property var styledItem: header

252 property string title: root.title

241 property string title: root.title

253 property var config: PageHeadConfiguration {

242 property var config: PageHeadConfiguration {

243+ foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"

254 backAction: Action {

244 backAction: Action {

255 iconName: "back"

245 iconName: "back"

256 visible: root.showBackButton

246 visible: root.showBackButton

@@ -294,6 +284,25 @@ Item {

294 }

284 }

295 }

285 }

296

286

287+ Row {

288+ spacing: units.gu(.5)

289+ Repeater {

290+ objectName: "paginationRepeater"

291+ model: root.paginationCount

292+ Image {

293+ objectName: "paginationDots_" + index

294+ height: units.gu(1)

295+ width: height

296+ source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"

297+ }

298+ }

299+ anchors {

300+ top: headerContainer.bottom

301+ horizontalCenter: headerContainer.horizontalCenter

302+ topMargin: units.gu(.5)

303+ }

304+ }

305+

297 Component {

306 Component {

298 id: popoverComponent

307 id: popoverComponent

299 Popover {

308 Popover {

qml/Components/SeeMore.qmldeleted−70

@@ -1,70 +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 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−

17−import QtQuick 2.0

18−import Ubuntu.Components 0.1

19−

20−/*! Widget that can be used in combination with a text area to allow easy 'expand/collapse' functionality. */

21−

22−Item {

23− //! Boolean set to true when it suggests expanded functionality

24− property bool more: false

25−

26− implicitHeight: seeMoreLabel.height + units.gu(2)

27−

28− Row {

29− anchors.centerIn: parent

30− spacing: units.gu(2)

31−

32− Label {

33− id: seeMoreLabel

34− objectName: "seeMoreLabel"

35− text: i18n.tr("See more")

36− opacity: !more ? 0.8 : 0.4

37− // TODO: Fix requiring Palette update

38− color: "grey" //Theme.palette.selected.backgroundText

39− font.weight: Font.Bold

40−

41− MouseArea {

42− anchors.fill: parent

43− onClicked: more = true

44− }

45− }

46−

47− Image {

48− anchors {

49− top: parent.top

50− bottom: parent.bottom

51− }

52− width: units.dp(2)

53− source: "ListItems/graphics/ListItemDividerVertical.png"

54− }

55−

56− Label {

57− objectName: "seeLessLabel"

58− text: i18n.tr("See less")

59− opacity: more ? 0.8 : 0.4

60− // TODO: Fix requiring Palette update

61− color: "grey" //Theme.palette.selected.backgroundText

62− font.weight: Font.Bold

63−

64− MouseArea {

65− anchors.fill: parent

66− onClicked: more = false

67− }

68− }

69− }

70−}

qml/Components/graphics/pagination_dot_off@30.pngnew file

Binary file not shown.

qml/Components/graphics/pagination_dot_on@30.pngnew file

Binary file not shown.

qml/Dash/CardTool.qml+1−1

@@ -126,7 +126,7 @@ Item {

126 type:real \brief Height of the card's header.

127 */

128 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0

129− readonly property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

129+ property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

130

131 /*!

132 \brief Desired alignment of header components.

qml/Dash/Dash.qml+84−11

@@ -14,7 +14,7 @@

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

15 */

16

17−import QtQuick 2.0

17+import QtQuick 2.2

18import Ubuntu.Components 0.1

19import Unity 0.2

20import Utils 0.1

@@ -38,7 +38,13 @@ Showable {

38 }

39

40 function setCurrentScope(scopeId, animate, reset) {

41− var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)

41+ var scopeIndex = -1;

42+ for (var i = 0; i < scopes.count; ++i) {

43+ if (scopes.getScope(i).id == scopeId) {

44+ scopeIndex = i;

45+ break;

46+ }

47+ }

42

48

43 if (scopeIndex == -1) {

49 if (scopeIndex == -1) {

44 console.warn("No match for scope with id: %1".arg(scopeId))

50 console.warn("No match for scope with id: %1".arg(scopeId))

@@ -63,15 +69,16 @@ Showable {

63 }

69 }

64 }

70 }

65

71

66− SortFilterProxyModel {

67− id: filteredScopes

68− model: Scopes {

72+ Scopes {

69− id: scopes

73+ id: scopes

70− }

74+ }

71− dynamicSortFilter: true

72

75

73− filterRole: Scopes.RoleVisible

76+ Image {

74− filterRegExp: RegExp("^true$")

77+ anchors.fill: parent

78+ source: parent.width > parent.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"

79+ fillMode: Image.PreserveAspectCrop

80+ horizontalAlignment: Image.AlignRight

81+ verticalAlignment: Image.AlignTop

75 }

82 }

76

83

77 DashContent {

84 DashContent {

@@ -79,7 +86,6 @@ Showable {

79 objectName: "dashContent"

86 objectName: "dashContent"

80 width: parent.width

87 width: parent.width

81 height: parent.height

88 height: parent.height

82− model: filteredScopes

83 scopes: scopes

89 scopes: scopes

84 visible: x != -width

90 visible: x != -width

85 onGotoScope: {

91 onGotoScope: {

@@ -134,4 +140,71 @@ Showable {

134 }

140 }

135 }

141 }

136 }

142 }

143+

144+ Rectangle {

145+ id: indicator

146+ objectName: "processingIndicator"

147+ anchors {

148+ left: parent.left

149+ right: parent.right

150+ bottom: parent.bottom

151+ }

152+ height: units.dp(3)

153+ color: scopeStyle.backgroundLuminance > 0.7 ? "#50000000" : "#50ffffff"

154+ opacity: 0

155+ visible: opacity > 0

156+

157+ readonly property bool processing: dashContent.processing || scopeItem.processing

158+

159+ Behavior on opacity {

160+ UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }

161+ }

162+

163+ onProcessingChanged: {

164+ if (processing) delay.start();

165+ else if (!persist.running) indicator.opacity = 0;

166+ }

167+

168+ Timer {

169+ id: delay

170+ interval: 200

171+ onTriggered: if (indicator.processing) {

172+ persist.restart();

173+ indicator.opacity = 1;

174+ }

175+ }

176+

177+ Timer {

178+ id: persist

179+ interval: 2 * UbuntuAnimation.SleepyDuration - UbuntuAnimation.FastDuration

180+ onTriggered: if (!indicator.processing) indicator.opacity = 0

181+ }

182+

183+ Rectangle {

184+ id: orange

185+ anchors { top: parent.top; bottom: parent.bottom }

186+ width: parent.width / 4

187+ color: Theme.palette.selected.foreground

188+

189+ SequentialAnimation {

190+ running: indicator.visible

191+ loops: Animation.Infinite

192+ XAnimator {

193+ from: -orange.width / 2

194+ to: indicator.width - orange.width / 2

195+ duration: UbuntuAnimation.SleepyDuration

196+ easing.type: Easing.InOutSine

197+ target: orange

198+ }

199+ XAnimator {

200+ from: indicator.width - orange.width / 2

201+ to: -orange.width / 2

202+ duration: UbuntuAnimation.SleepyDuration

203+ easing.type: Easing.InOutSine

204+ target: orange

205+ }

206+ }

207+ }

208+ }

209+

137}

210}

qml/Dash/DashApplication.qml+7

@@ -16,6 +16,7 @@

16

17import QtQuick 2.2

18import Ubuntu.Components 1.0

19+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/

19

20

20MainView {

21MainView {

21 width: units.gu(40)

22 width: units.gu(40)

@@ -23,6 +24,12 @@ MainView {

23

24

24 useDeprecatedToolbar: false

25 useDeprecatedToolbar: false

25

26

27+ Binding {

28+ target: i18n

29+ property: "domain"

30+ value: "unity8"

31+ }

32+

26 Dash {

33 Dash {

27 anchors.fill: parent

34 anchors.fill: parent

28 }

35 }

qml/Dash/DashContent.qml+7−4

@@ -23,9 +23,10 @@ import "../Components"

23Item {

24 id: dashContent

25

26− property var model: null

26+ property alias scopes: dashContentList.model

27− property var scopes: null

28 readonly property alias currentIndex: dashContentList.currentIndex

27 readonly property alias currentIndex: dashContentList.currentIndex

28+ readonly property bool processing: dashContentList.currentItem && dashContentList.currentItem.item

29+ && dashContentList.currentItem.item.processing || false

29

30

30 signal scopeLoaded(string scopeId)

31 signal scopeLoaded(string scopeId)

31 signal gotoScope(string scopeId)

32 signal gotoScope(string scopeId)

@@ -89,10 +90,9 @@ Item {

89 id: dashContentList

90 id: dashContentList

90 objectName: "dashContentList"

91 objectName: "dashContentList"

91

92

92− interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving

93+ interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown

93

94

94 anchors.fill: parent

95 anchors.fill: parent

95− model: dashContent.model

96 orientation: ListView.Horizontal

97 boundsBehavior: Flickable.DragAndOvershootBounds

98 flickDeceleration: units.gu(625)

@@ -130,6 +130,7 @@ Item {

130 objectName: scope.id + " loader"

131

132 readonly property bool moving: item ? item.moving : false

133+ readonly property bool navigationShown: item ? item.navigationShown : false

133 readonly property var categoryView: item ? item.categoryView : null

134 readonly property var categoryView: item ? item.categoryView : null

134 readonly property var theScope: scope

135 readonly property var theScope: scope

135

136

@@ -143,6 +144,8 @@ Item {

143 item.scope = Qt.binding(function() { return scope })

144 item.scope = Qt.binding(function() { return scope })

144 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })

145 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })

145 dashContent.scopeLoaded(item.scope.id)

146 dashContent.scopeLoaded(item.scope.id)

147+ item.paginationCount = Qt.binding(function() { return dashContentList.count } )

148+ item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )

146 }

149 }

147 Connections {

150 Connections {

148 target: isCurrent ? scope : null

151 target: isCurrent ? scope : null

qml/Dash/DashDepartments.qml → qml/Dash/DashNavigation.qmlrenamed+50−43

@@ -15,17 +15,17 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

19

20AbstractButton {

21 id: root

22− objectName: "dashDepartments"

22+ objectName: "dashNavigation"

23

24 property var scope: null

25

26 property bool showList: false

27

28− readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null

28+ readonly property var currentNavigation: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null

29

30 property alias windowWidth: blackRect.width

31 property alias windowHeight: blackRect.height

@@ -34,20 +34,21 @@ AbstractButton {

34 // Are we drilling down the tree or up?

35 property bool isGoingBack: false

36

37− visible: root.currentDepartment != null

37+ visible: root.currentNavigation != null

38

39 height: visible ? units.gu(5) : 0

40

41 onClicked: {

42+ navigationListView.updateMaxHeight();

42 root.showList = !root.showList;

43 root.showList = !root.showList;

43 }

44 }

44

45

45 Rectangle {

46 Rectangle {

46 id: blackRect

47 id: blackRect

47 color: "black"

48 color: "black"

48− opacity: departmentListView.currentItem && departmentListView.currentItem.visible ? 0.3 : 0

49+ opacity: navigationListView.currentItem && navigationListView.currentItem.visible ? 0.3 : 0

49 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }

50 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }

50− anchors.top: departmentListView.top

51+ anchors.top: navigationListView.top

51 anchors.right: parent.right

52 anchors.right: parent.right

52 visible: opacity != 0

53 visible: opacity != 0

53 }

54 }

@@ -78,7 +79,7 @@ AbstractButton {

78 anchors.fill: parent

79 anchors.fill: parent

79 anchors.margins: units.gu(2)

80 anchors.margins: units.gu(2)

80 verticalAlignment: Text.AlignVCenter

81 verticalAlignment: Text.AlignVCenter

81− text: root.currentDepartment ? root.currentDepartment.label : ""

82+ text: root.currentNavigation ? root.currentNavigation.label : ""

82 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

83 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

83 }

84 }

84

85

@@ -92,18 +93,18 @@ AbstractButton {

92 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

93 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

93 }

94 }

94

95

95− // departmentListView is outside root

96+ // navigationListView is outside root

96 ListView {

97 ListView {

97− id: departmentListView

98+ id: navigationListView

98− objectName: "departmentListView"

99+ objectName: "navigationListView"

99 orientation: ListView.Horizontal

100 orientation: ListView.Horizontal

100 interactive: false

101 interactive: false

101 clip: root.width != windowWidth

102 clip: root.width != windowWidth

102 model: ListModel {

103 model: ListModel {

103− id: departmentModel

104+ id: navigationModel

104 // We have two roles

105 // We have two roles

105− // departmentId: the department id of the department the list represents

106+ // navigationId: the navigation id of the navigation the list represents

106− // nullifyDepartment: overrides departmentId to be null

107+ // nullifyNavigation: overrides navigationId to be null

107 // This is used to "clear" the delegate when going "right" on the tree

108 // This is used to "clear" the delegate when going "right" on the tree

108 }

109 }

109 anchors {

110 anchors {

@@ -111,7 +112,12 @@ AbstractButton {

111 right: parent.right

112 right: parent.right

112 top: root.bottom

113 top: root.bottom

113 }

114 }

115+ property int maxHeight: -1

116+ Component.onCompleted: updateMaxHeight();

117+ function updateMaxHeight()

118+ {

114− readonly property int maxHeight: (windowHeight - mapToItem(null, root.x, root.y).y) - units.gu(8)

119+ maxHeight = (windowHeight - mapToItem(null, 0, 0).y) - units.gu(8);

120+ }

115 property int prevHeight: maxHeight

121 property int prevHeight: maxHeight

116 height: currentItem ? currentItem.height : maxHeight

122 height: currentItem ? currentItem.height : maxHeight

117 onHeightChanged: {

123 onHeightChanged: {

@@ -120,83 +126,84 @@ AbstractButton {

120 }

126 }

121 }

127 }

122 highlightMoveDuration: UbuntuAnimation.FastDuration

128 highlightMoveDuration: UbuntuAnimation.FastDuration

123− delegate: DashDepartmentsList {

129+ delegate: DashNavigationList {

124− objectName: "department" + index

130+ objectName: "navigation" + index

125 visible: height != 0

131 visible: height != 0

126− width: departmentListView.width

132+ width: navigationListView.width

127 scopeStyle: root.scopeStyle

133 scopeStyle: root.scopeStyle

128 property real desiredHeight: {

134 property real desiredHeight: {

129 if (root.showList) {

135 if (root.showList) {

130− if (department && department.loaded && x == departmentListView.contentX)

136+ if (navigation && navigation.loaded && x == navigationListView.contentX)

131 {

137 {

138+ navigationListView.updateMaxHeight();

132− return Math.min(implicitHeight, departmentListView.maxHeight);

139+ return Math.min(implicitHeight, navigationListView.maxHeight);

133 } else {

140 } else {

134− return departmentListView.prevHeight;

141+ return navigationListView.prevHeight;

135 }

142 }

136 } else {

143 } else {

137 return 0;

144 return 0;

138 }

145 }

139 }

146 }

140 height: desiredHeight

147 height: desiredHeight

141− department: (nullifyDepartment || !scope) ? null : scope.getDepartment(departmentId)

148+ navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)

142− currentDepartment: root.currentDepartment

149+ currentNavigation: root.currentNavigation

143− onEnterDepartment: {

150+ onEnterNavigation: {

144− scope.loadDepartment(newDepartmentId);

151+ scope.setNavigationState(newNavigationId, false);

145 // We only need to add a new item to the model

152 // We only need to add a new item to the model

146 // if we have children, otherwise just load it

153 // if we have children, otherwise just load it

147 if (hasChildren) {

154 if (hasChildren) {

148 isGoingBack = false;

155 isGoingBack = false;

149− departmentModel.append({"departmentId": newDepartmentId, "nullifyDepartment": false});

156+ navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});

150− departmentListView.currentIndex++;

157+ navigationListView.currentIndex++;

151 } else {

158 } else {

152 showList = false;

159 showList = false;

153 }

160 }

154 }

161 }

155 onGoBackToParentClicked: {

162 onGoBackToParentClicked: {

156− scope.loadDepartment(department.parentDepartmentId);

163+ scope.setNavigationState(navigation.parentNavigationId, false);

157 isGoingBack = true;

164 isGoingBack = true;

158− departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);

165+ navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);

159− departmentListView.currentIndex--;

166+ navigationListView.currentIndex--;

160 }

167 }

161− onAllDepartmentClicked: {

168+ onAllNavigationClicked: {

162 showList = false;

169 showList = false;

163− if (root.currentDepartment.parentDepartmentId == department.departmentId) {

170+ if (root.currentNavigation.parentNavigationId == navigation.navigationId) {

164 // For leaves we have to go to the parent too

171 // For leaves we have to go to the parent too

165− scope.loadDepartment(root.currentDepartment.parentDepartmentId);

172+ scope.setNavigationState(root.currentNavigation.parentNavigationId, false);

166 }

173 }

167 }

174 }

168 }

175 }

169 onContentXChanged: {

176 onContentXChanged: {

170− if (contentX == width * departmentListView.currentIndex) {

177+ if (contentX == width * navigationListView.currentIndex) {

171 if (isGoingBack) {

178 if (isGoingBack) {

172− departmentModel.remove(departmentListView.currentIndex + 1);

179+ navigationModel.remove(navigationListView.currentIndex + 1);

173 } else {

180 } else {

174− departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", true);

181+ navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", true);

175 }

182 }

176 }

183 }

177 }

184 }

178 }

185 }

179

186

180 InverseMouseArea {

187 InverseMouseArea {

181− anchors.fill: departmentListView

188+ anchors.fill: navigationListView

182 enabled: root.showList

189 enabled: root.showList

183 onClicked: root.showList = false

190 onClicked: root.showList = false

184 }

191 }

185

192

186 onScopeChanged: {

193 onScopeChanged: {

187− departmentModel.clear();

194+ navigationModel.clear();

188− if (scope && scope.hasDepartments) {

195+ if (scope && scope.hasNavigation) {

189− departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});

196+ navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});

190 }

197 }

191 }

198 }

192

199

193 Connections {

200 Connections {

194 target: scope

201 target: scope

195− onHasDepartmentsChanged: {

202+ onHasNavigationChanged: {

196− if (scope.hasDepartments) {

203+ if (scope.hasNavigation) {

197− departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});

204+ navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});

198 } else {

205 } else {

199− departmentModel.clear();

206+ navigationModel.clear();

200 }

207 }

201 }

208 }

202 }

209 }

qml/Dash/DashDepartmentsList.qml → qml/Dash/DashNavigationList.qmlrenamed+14−18

@@ -15,16 +15,16 @@

15 */

16

17import QtQuick 2.2

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

19

20Item {

21 id: root

22− property var department: null

22+ property var navigation: null

23− property var currentDepartment: null

23+ property var currentNavigation: null

24 property var scopeStyle: null

25− signal enterDepartment(var newDepartmentId, bool hasChildren)

25+ signal enterNavigation(var newNavigationId, bool hasChildren)

26 signal goBackToParentClicked()

27− signal allDepartmentClicked()

27+ signal allNavigationClicked()

28

29 readonly property int itemHeight: units.gu(5)

30 readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"

@@ -35,11 +35,6 @@ Item {

35 anchors.fill: parent

36 }

37

38− ActivityIndicator {

39− id: loadingIndicator

40− anchors.centerIn: parent

41− running: !(department && department.loaded)

42− }

43 clip: true

38 clip: true

44

39

45 Behavior on height {

40 Behavior on height {

@@ -54,6 +49,7 @@ Item {

54

49

55 anchors.fill: parent

50 anchors.fill: parent

56

51

52+ flickableDirection: Flickable.VerticalFlick

57 contentHeight: column.height

53 contentHeight: column.height

58 contentWidth: width

54 contentWidth: width

59

55

@@ -68,7 +64,7 @@ Item {

68 id: backButton

64 id: backButton

69 objectName: "backButton"

65 objectName: "backButton"

70 width: parent.width

66 width: parent.width

71− visible: department && !department.isRoot || false

67+ visible: navigation && !navigation.isRoot || false

72 height: itemHeight

68 height: itemHeight

73

69

74 onClicked: root.goBackToParentClicked();

70 onClicked: root.goBackToParentClicked();

@@ -92,7 +88,7 @@ Item {

92 left: backImage.right

88 left: backImage.right

93 leftMargin: units.gu(0.5)

89 leftMargin: units.gu(0.5)

94 }

90 }

95− text: department ? department.parentLabel : ""

91+ text: navigation ? navigation.parentLabel : ""

96 color: root.foregroundColor

92 color: root.foregroundColor

97 }

93 }

98

94

@@ -114,7 +110,7 @@ Item {

114 id: allButton

110 id: allButton

115 objectName: "allButton"

111 objectName: "allButton"

116 width: parent.width

112 width: parent.width

117− visible: department && (!department.isRoot || (root.currentDepartment && !root.currentDepartment.isRoot && root.currentDepartment.parentDepartmentId == department.departmentId)) || false

113+ visible: navigation && (!navigation.isRoot || (root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false

118 height: itemHeight

114 height: itemHeight

119

115

120 Label {

116 Label {

@@ -123,7 +119,7 @@ Item {

123 left: parent.left

119 left: parent.left

124 leftMargin: units.gu(2)

120 leftMargin: units.gu(2)

125 }

121 }

126− text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""

122+ text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""

127 font.bold: true

123 font.bold: true

128 color: root.foregroundColor

124 color: root.foregroundColor

129 }

125 }

@@ -141,18 +137,18 @@ Item {

141 height: units.dp(1)

137 height: units.dp(1)

142 }

138 }

143

139

144− onClicked: root.allDepartmentClicked();

140+ onClicked: root.allNavigationClicked();

145 }

141 }

146

142

147 Repeater {

143 Repeater {

148− model: department && department.loaded ? department : null

144+ model: navigation && navigation.loaded ? navigation : null

149 clip: true

145 clip: true

150 delegate: AbstractButton {

146 delegate: AbstractButton {

151 objectName: root.objectName + "child" + index

147 objectName: root.objectName + "child" + index

152 height: root.itemHeight

148 height: root.itemHeight

153 width: root.width

149 width: root.width

154

150

155− onClicked: root.enterDepartment(departmentId, hasChildren)

151+ onClicked: root.enterNavigation(navigationId, hasChildren)

156

152

157 Label {

153 Label {

158 anchors {

154 anchors {

@@ -188,7 +184,7 @@ Item {

188 color: root.foregroundColor

184 color: root.foregroundColor

189 opacity: 0.1

185 opacity: 0.1

190 height: units.dp(1)

186 height: units.dp(1)

191− visible: index != department.count - 1

187+ visible: index != navigation.count - 1

192 }

188 }

193 }

189 }

194 }

190 }

qml/Dash/GenericScopeView.qml+12−12

@@ -25,6 +25,7 @@ import "../Components/ListItems" as ListItems

25FocusScope {

26 id: scopeView

27

28+ readonly property alias navigationShown: dashNavigation.showList

28 property var scope: null

29 property var scope: null

29 property SortFilterProxyModel categories: categoryFilter

30 property SortFilterProxyModel categories: categoryFilter

30 property bool isCurrent: false

31 property bool isCurrent: false

@@ -32,22 +33,16 @@ FocusScope {

32 property bool hasBackAction: false

33 property bool hasBackAction: false

33 property bool enableHeightBehaviorOnNextCreation: false

34 property bool enableHeightBehaviorOnNextCreation: false

34 property var categoryView: categoryView

35 property var categoryView: categoryView

36+ property alias paginationCount: pageHeader.paginationCount

37+ property alias paginationIndex: pageHeader.paginationIndex

35

38

36 property var scopeStyle: ScopeStyle {

39 property var scopeStyle: ScopeStyle {

37 style: scope ? scope.customizations : {}

40 style: scope ? scope.customizations : {}

38 }

41 }

39

42

40− signal backClicked()

43+ readonly property bool processing: scope ? scope.searchInProgress || previewListView.processing : false

41−

42− onScopeChanged: {

43− if (scope) {

44− scope.activateApplication.connect(activateApp);

45− }

46− }

47

44

48− function activateApp(appId) {

45+ signal backClicked()

49− Qt.openUrlExternally(appId);

50− }

51

46

52 function positionAtBeginning() {

47 function positionAtBeginning() {

53 categoryView.positionAtBeginning()

48 categoryView.positionAtBeginning()

@@ -119,6 +114,7 @@ FocusScope {

119 model: scopeView.categories

114 model: scopeView.categories

120 forceNoClip: previewListView.open

115 forceNoClip: previewListView.open

121 pixelAligned: true

116 pixelAligned: true

117+ interactive: !dashNavigation.showList

122

118

123 property string expandedCategoryId: ""

119 property string expandedCategoryId: ""

124

120

@@ -211,6 +207,10 @@ FocusScope {

211 baseItem.expand(shouldExpand, false /*animate*/);

207 baseItem.expand(shouldExpand, false /*animate*/);

212 }

208 }

213 updateDelegateCreationRange();

209 updateDelegateCreationRange();

210+ if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {

211+ // Yeah, hackish :/

212+ cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

213+ }

214 item.cardTool = cardTool;

215 }

216

@@ -387,10 +387,10 @@ FocusScope {

387 title: scopeView.scope ? scopeView.scope.name : ""

388 showBackButton: scopeView.hasBackAction

389 searchEntryEnabled: true

390− searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false

391 scopeStyle: scopeView.scopeStyle

390 scopeStyle: scopeView.scopeStyle

392

391

393− bottomItem: DashDepartments {

392+ bottomItem: DashNavigation {

393+ id: dashNavigation

394 scope: scopeView.scope

395 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)

396 anchors.right: parent.right

qml/Dash/PreviewListView.qml+23−27

@@ -32,6 +32,9 @@ Item {

32 property alias currentItem: previewListView.currentItem

33 property alias count: previewListView.count

34

35+ readonly property bool processing: currentItem && (!currentItem.previewModel.loaded

36+ || currentItem.previewModel.processingAction)

37+

35 PageHeader {

38 PageHeader {

36 id: header

39 id: header

37 objectName: "pageHeader"

40 objectName: "pageHeader"

@@ -83,39 +86,32 @@ Item {

83 }

86 }

84 }

87 }

85

88

86− delegate: Item {

89+ delegate: Previews.Preview {

90+ id: preview

87− objectName: "previewItem" + index

91+ objectName: "preview" + index

88 height: previewListView.height

92 height: previewListView.height

89 width: previewListView.width

93 width: previewListView.width

90

94

91− readonly property bool ready: preview.previewModel.loaded

95+ isCurrent: ListView.isCurrentItem

92−

93− Previews.Preview {

94− id: preview

95− objectName: "preview" + index

96− anchors.fill: parent

97

96

98− isCurrent: parent.ListView.isCurrentItem

99−

100− previewModel: {

97+ previewModel: {

101− var previewStack = root.scope.preview(result);

98+ var previewStack = root.scope.preview(result);

102− return previewStack.getPreviewModel(0);

99+ return previewStack.getPreviewModel(0);

103− }

104− scopeStyle: root.scopeStyle

105 }

100 }

101+ scopeStyle: root.scopeStyle

102+ }

103+ }

106

104

107− MouseArea {

105+ MouseArea {

108− id: processingMouseArea

106+ id: processingMouseArea

109− objectName: "processingMouseArea"

107+ objectName: "processingMouseArea"

110− anchors.fill: parent

108+ anchors {

111− enabled: !preview.previewModel.loaded || preview.previewModel.processingAction

109+ left: parent.left

112−

110+ right: parent.right

113− ActivityIndicator {

111+ top: pageHeader.bottom

114− anchors.centerIn: parent

112+ bottom: parent.bottom

115− visible: root.open && parent.enabled

116− running: visible

117− }

118− }

119 }

113 }

114+

115+ enabled: root.processing

120 }

116 }

121}

117}

qml/Dash/Previews/PreviewExpandable.qmlnew file+101

@@ -0,0 +1,101 @@

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+

17+import QtQuick 2.3

18+import Ubuntu.Components 1.1

19+import "../../Components"

20+

21+/*! \brief Preview widget for expandable widgets.

22+

23+ This widget shows a list of widgets defined in widgetData["widgets"]

24+ Those widgets can be collapsed or uncollapsed. When uncollapsed

25+ all the widgets are shown, when collapsed only the first

26+ widgetData["collapsed-widgets"] are shown. It has a title that comes

27+ in via widgetData["title"]

28+ */

29+

30+PreviewWidget {

31+ id: root

32+ implicitHeight: childrenRect.height

33+

34+ expanded: false

35+

36+ Label {

37+ id: titleLabel

38+ objectName: "titleLabel"

39+ anchors {

40+ left: parent.left

41+ right: expandButton.left

42+ }

43+ fontSize: "large"

44+ color: root.scopeStyle ? root.scopeStyle.foreground : "grey"

45+ visible: text !== ""

46+ opacity: .8

47+ text: widgetData["title"] || ""

48+ wrapMode: Text.Wrap

49+ }

50+

51+ AbstractButton {

52+ id: expandButton

53+ objectName: "expandButton"

54+ width: titleLabel.height

55+ height: titleLabel.height

56+ anchors.right: parent.right

57+ onClicked: {

58+ root.expanded = !root.expanded;

59+ }

60+ Icon {

61+ anchors.fill: parent

62+ width: 64

63+ height: 64

64+ name: root.expanded ? "view-collapse" : "view-expand"

65+ }

66+ }

67+

68+ Column {

69+ anchors {

70+ top: titleLabel.bottom

71+ topMargin: units.gu(1)

72+ left: parent.left

73+ right: parent.right

74+ }

75+ spacing: units.gu(1)

76+ Repeater {

77+ id: repeater

78+ objectName: "repeater"

79+ model: widgetData["widgets"]

80+ delegate: PreviewWidgetFactory {

81+ height: visible ? implicitHeight : 0

82+ width: parent.width

83+ widgetId: modelData.widgetId

84+ widgetType: modelData.type

85+ widgetData: modelData.properties

86+ isCurrentPreview: root.isCurrentPreview

87+ scopeStyle: root.scopeStyle

88+ anchors {

89+ left: parent.left

90+ right: parent.right

91+ }

92+ expanded: root.expanded

93+ visible: root.expanded || index < root.widgetData["collapsed-widgets"]

94+

95+ onTriggered: {

96+ root.triggered(widgetId, actionId, data);

97+ }

98+ }

99+ }

100+ }

101+}

qml/Dash/Previews/PreviewImageGallery.qml+1

@@ -15,6 +15,7 @@

15 */

16

17import QtQuick 2.0

18+import Ubuntu.Components 1.1

18import "../../Components"

19import "../../Components"

19

20

20/*! This preview widget shows a horizontal list of images.

21/*! This preview widget shows a horizontal list of images.

qml/Dash/Previews/PreviewTextSummary.qml+3−16

@@ -23,7 +23,7 @@ import "../../Components"

23 This widget shows text contained in widgetData["text"]

24 along with a title that comes from widgetData["title"].

25

26− In case the text does not fit in 7 lines a See More / Less widget is also shown.

26+ In case the widget is collapsed it only shows 3 lines of text.

27 */

28

29PreviewWidget {

@@ -50,14 +50,14 @@ PreviewWidget {

50 id: textLabel

51 objectName: "textLabel"

52

53− readonly property int maximumCollapsedLineCount: 7

53+ readonly property int maximumCollapsedLineCount: 3

54

55 anchors {

56 left: parent.left

57 right: parent.right

58 top: titleLabel.visible ? titleLabel.bottom : parent.top

59 }

60− height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)

60+ height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount

61 clip: true

62 fontSize: "small"

63 lineHeight: 1.2

@@ -70,17 +70,4 @@ PreviewWidget {

70 UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }

71 }

72 }

73−

74− SeeMore {

75− id: seeMore

76− objectName: "seeMore"

77− anchors {

78− left: parent.left

79− right: parent.right

80− top: textLabel.bottom

81− topMargin: visible ? units.gu(1) : 0

82− }

83− height: visible ? implicitHeight : 0

84− visible: textLabel.lineCount > textLabel.maximumCollapsedLineCount

85− }

86}

73}

qml/Dash/Previews/PreviewWidget.qml+3

@@ -31,6 +31,9 @@ Item {

31 //! The ScopeStyle component.

32 property var scopeStyle: null

33

34+ //! Should the widget show in expanded mode (For those that support it)

35+ property bool expanded: true

36+

34 /*! \brief This signal should be emitted when a preview action was triggered.

37 /*! \brief This signal should be emitted when a preview action was triggered.

35 *

38 *

36 * \param widgetId, actionId Respective identifiers from widgetData.

39 * \param widgetId, actionId Respective identifiers from widgetData.

qml/Dash/Previews/PreviewWidgetFactory.qml+5

@@ -34,6 +34,9 @@ Loader {

34 //! The ScopeStyle component.

35 property var scopeStyle: null

36

37+ //! Should the widget show in expanded mode (For those that support it)

38+ property bool expanded: true

39+

37 //! Set to true if the parent preview is displayed.

40 //! Set to true if the parent preview is displayed.

38 property bool isCurrentPreview: false

41 property bool isCurrentPreview: false

39

42

@@ -47,6 +50,7 @@ Loader {

47 switch (widgetType) {

50 switch (widgetType) {

48 case "actions": return "PreviewActions.qml";

51 case "actions": return "PreviewActions.qml";

49 case "audio": return "PreviewAudioPlayback.qml";

52 case "audio": return "PreviewAudioPlayback.qml";

53+ case "expandable": return "PreviewExpandable.qml";

50 case "gallery": return "PreviewImageGallery.qml";

54 case "gallery": return "PreviewImageGallery.qml";

51 case "header": return "PreviewHeader.qml";

55 case "header": return "PreviewHeader.qml";

52 case "image": return "PreviewZoomableImage.qml";

56 case "image": return "PreviewZoomableImage.qml";

@@ -65,6 +69,7 @@ Loader {

65 item.widgetId = Qt.binding(function() { return root.widgetId } )

69 item.widgetId = Qt.binding(function() { return root.widgetId } )

66 item.widgetData = Qt.binding(function() { return root.widgetData } )

70 item.widgetData = Qt.binding(function() { return root.widgetData } )

67 item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )

71 item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )

72+ item.expanded = Qt.binding(function() { return root.expanded } )

68 if (item.hasOwnProperty("scopeStyle")) item.scopeStyle = root.scopeStyle;

73 if (item.hasOwnProperty("scopeStyle")) item.scopeStyle = root.scopeStyle;

69 }

74 }

70

75

qml/Greeter/Greeter.qml+1−1

@@ -70,7 +70,7 @@ Showable {

70 DraggingArea {

71 id: dragHandle

72 anchors.fill: parent

73− enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled

73+ enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled && greeter.shown

74 orientation: Qt.Horizontal

75 propagateComposedEvents: true

76

qml/Notifications/NotificationMenuItemFactory.qml+3

@@ -78,6 +78,9 @@ Loader {

78 }

79 echoMode: checkBox.checked ? TextInput.Normal : TextInput.Password

80 height: units.gu(5)

81+ Component.onCompleted: {

82+ forceActiveFocus();

83+ }

81 onTextChanged: {

84 onTextChanged: {

82 menuModel.changeState(menuIndex, text);

85 menuModel.changeState(menuIndex, text);

83 }

86 }

qml/Panel/Indicators/MenuItemFactory.qml+74

@@ -57,6 +57,7 @@ Item {

57

58 "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,

59 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,

60+ "com.canonical.indicator.network.modeminfoitem" : modeminfoitem,

60 }

61 }

61

62

62 function getExtendedProperty(object, propertyName, defaultValue) {

63 function getExtendedProperty(object, propertyName, defaultValue) {

@@ -374,6 +375,79 @@ Item {

374 }

375 }

376 }

376

377

378+ Component {

379+ id: modeminfoitem;

380+ ModemInfoItem {

381+ objectName: "modemInfoItem"

382+ property QtObject menuData: null

383+ property var menuModel: menuFactory.menuModel

384+ property int menuIndex: -1

385+ property var extendedData: menuData && menuData.ext || undefined

386+

387+ property var statusLabelAction: UnityMenuAction {

388+ model: menuModel

389+ index: menuIndex

390+ name: getExtendedProperty(extendedData, "xCanonicalModemStatusLabelAction", "")

391+ }

392+ statusText: statusLabelAction.valid ? statusLabelAction.state : ""

393+

394+ property var statusIconAction: UnityMenuAction {

395+ model: menuModel

396+ index: menuIndex

397+ name: getExtendedProperty(extendedData, "xCanonicalModemStatusIconAction", "")

398+ }

399+ statusIcon: statusIconAction.valid ? statusIconAction.state : ""

400+

401+ property var connectivityIconAction: UnityMenuAction {

402+ model: menuModel

403+ index: menuIndex

404+ name: getExtendedProperty(extendedData, "xCanonicalModemConnectivityIconAction", "")

405+ }

406+ connectivityIcon: connectivityIconAction.valid ? connectivityIconAction.state : ""

407+

408+ property var simIdentifierLabelAction: UnityMenuAction {

409+ model: menuModel

410+ index: menuIndex

411+ name: getExtendedProperty(extendedData, "xCanonicalModemSimIdentifierLabelAction", "")

412+ }

413+ simIdentifierText: simIdentifierLabelAction.valid ? simIdentifierLabelAction.state : ""

414+

415+ property var roamingAction: UnityMenuAction {

416+ model: menuModel

417+ index: menuIndex

418+ name: getExtendedProperty(extendedData, "xCanonicalModemRoamingAction", "")

419+ }

420+ roaming: roamingAction.valid ? roamingAction.state : false

421+

422+ property var unlockAction: UnityMenuAction {

423+ model: menuModel

424+ index: menuIndex

425+ name: getExtendedProperty(extendedData, "xCanonicalModemLockedAction", "")

426+ }

427+ onUnlock: {

428+ unlockAction.activate();

429+ }

430+ locked: unlockAction.valid ? unlockAction.state : false

431+

432+ onMenuModelChanged: {

433+ loadAttributes();

434+ }

435+ onMenuIndexChanged: {

436+ loadAttributes();

437+ }

438+

439+ function loadAttributes() {

440+ if (!menuModel || menuIndex == -1) return;

441+ menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-modem-status-label-action': 'string',

442+ 'x-canonical-modem-status-icon-action': 'string',

443+ 'x-canonical-modem-connectivity-icon-action': 'string',

444+ 'x-canonical-modem-sim-identifier-label-action': 'string',

445+ 'x-canonical-modem-roaming-action': 'string',

446+ 'x-canonical-modem-locked-action': 'string'});

447+ }

448+ }

449+ }

450+

377 Component {

451 Component {

378 id: messageItem

452 id: messageItem

379

453

qml/Panel/Indicators/ModemInfoItem.qmlnew file+111

@@ -0,0 +1,111 @@

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+

17+import QtQuick 2.0

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 0.1

20+import Ubuntu.Components.ListItems 0.1 as ListItem

21+

22+ListItem.Empty {

23+ id: menu

24+ implicitHeight: mainColumn.implicitHeight

25+ + mainColumn.anchors.topMargin

26+ + mainColumn.anchors.bottomMargin

27+

28+ property alias statusIcon: statusIcon.name

29+ property alias statusText: labelStatus.text

30+ property alias connectivityIcon: iconConnectivity.name

31+ property alias simIdentifierText: labelSimIdentifier.text

32+ property bool locked : false

33+ property bool roaming: false

34+ signal unlock

35+

36+ ColumnLayout {

37+ id: mainColumn

38+ anchors.fill: parent

39+ anchors.margins: menu.__contentsMargins

40+ spacing: units.gu(0.5)

41+

42+ Label {

43+ id: labelSimIdentifier

44+ elide: Text.ElideRight

45+ visible: text !== ""

46+ font.bold: true

47+ opacity: menu.locked ? 0.6 : 1.0

48+ }

49+

50+ RowLayout {

51+ id: statusRow

52+ spacing: units.gu(1)

53+

54+ height: labelStatus.height

55+ width: parent.width

56+

57+ Label {

58+ id: labelStatus

59+ elide: Text.ElideRight

60+ opacity: 0.6

61+ }

62+

63+ RowLayout {

64+ spacing: 0.5

65+ height: parent.height

66+ Icon {

67+ id: statusIcon

68+ color: Theme.palette.selected.backgroundText

69+

70+ Layout.preferredHeight: parent.height

71+ Layout.preferredWidth: Layout.preferredHeight

72+

73+ visible: name !== ""

74+ }

75+

76+ Icon {

77+ id: iconConnectivity

78+ color: Theme.palette.selected.backgroundText

79+

80+ Layout.preferredHeight: parent.height

81+ Layout.preferredWidth: Layout.preferredHeight

82+

83+ visible: name !== ""

84+ }

85+ }

86+

87+ Item {

88+ // eat up all the excess space so that RoamingIndication

89+ // ends up to the far right

90+ Layout.fillWidth: true

91+ }

92+

93+ RoamingIndication {

94+ id: roamingIndication

95+ visible: menu.roaming

96+ Layout.fillHeight: true

97+ }

98+ }

99+

100+ Button {

101+ id: buttonUnlock

102+ objectName: "buttonUnlockSim"

103+ visible: menu.locked

104+

105+ text: i18n.tr("Unlock SIM")

106+ Layout.preferredWidth: implicitWidth + units.gu(5)

107+

108+ onTriggered: menu.unlock()

109+ }

110+ }

111+}

qml/Panel/Indicators/RoamingIndication.qmlnew file+40

@@ -0,0 +1,40 @@

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+

17+import QtQuick 2.0

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 0.1

20+

21+RowLayout {

22+ spacing: units.gu(0.5)

23+ Label {

24+ id: labelRoaming

25+ elide: Text.ElideRight

26+ fontSize: "x-small"

27+ text: i18n.tr("Roaming")

28+ opacity: 0.6

29+ }

30+

31+ Icon {

32+ id: iconRoaming

33+ color: Theme.palette.selected.backgroundText

34+

35+ Layout.preferredHeight: parent.height

36+ Layout.preferredWidth: Layout.preferredHeight

37+

38+ name: "network-cellular-roaming"

39+ }

40+}

qml/ScopeTool.qml+2−11

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

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19import Ubuntu.Components.Popups 0.1

20+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/

20import Utils 0.1

21import Utils 0.1

21import Unity 0.2

22import Unity 0.2

22import "Components"

23import "Components"

@@ -45,16 +46,6 @@ Rectangle {

45 signal searchClicked

46 signal searchClicked

46 }

47 }

47

48

48− SortFilterProxyModel {

49− id: filteredScopes

50− model: Scopes {

51− id: scopes

52− }

53− dynamicSortFilter: true

54−

55− filterRole: Scopes.RoleVisible

56− filterRegExp: RegExp("^true$")

57− }

58

49

59 Rectangle {

50 Rectangle {

60 anchors.fill: dashContent

51 anchors.fill: dashContent

@@ -72,8 +63,8 @@ Rectangle {

72 DashContent {

63 DashContent {

73 id: dashContent

64 id: dashContent

74

65

75− model: filteredScopes

76 property var scope: scopes.getScope(currentIndex)

66 property var scope: scopes.getScope(currentIndex)

67+ scopes: Scopes { }

77

68

78 anchors {

69 anchors {

79 top: parent.top

70 top: parent.top

qml/Shell.qml+4−23

@@ -112,25 +112,6 @@ Item {

112 }

113 }

114

115− Item {

116− id: underlay

117− objectName: "underlay"

118− anchors.fill: parent

119−

120− // Whether the underlay is fully covered by opaque UI elements.

121− property bool fullyCovered: (panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)

122− || stages.fullyShown || greeterWrapper.fullyShown

123− visible: !fullyCovered

124−

125− Image {

126− anchors.fill: underlay

127− source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"

128− fillMode: Image.PreserveAspectCrop

129− horizontalAlignment: Image.AlignRight

130− verticalAlignment: Image.AlignTop

131− }

132− }

133−

134 Item {

115 Item {

135 id: stages

116 id: stages

136 objectName: "stages"

117 objectName: "stages"

@@ -186,12 +167,12 @@ Item {

186 Binding {

167 Binding {

187 target: applicationsDisplayLoader.item

168 target: applicationsDisplayLoader.item

188 property: "interactive"

169 property: "interactive"

189− value: !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0

170+ value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0

190 }

171 }

191 Binding {

172 Binding {

192 target: applicationsDisplayLoader.item

173 target: applicationsDisplayLoader.item

193 property: "spreadEnabled"

174 property: "spreadEnabled"

194− value: greeter.fakeActiveForApp === "" // to support emergency dialer hack

175+ value: edgeDemo.stagesEnabled && greeter.fakeActiveForApp === "" // to support emergency dialer hack

195 }

176 }

196 Binding {

177 Binding {

197 target: applicationsDisplayLoader.item

178 target: applicationsDisplayLoader.item

@@ -400,7 +381,7 @@ Item {

400 onDisplayPowerStateChange: {

381 onDisplayPowerStateChange: {

401 // We ignore any display-off signals when the proximity sensor

382 // We ignore any display-off signals when the proximity sensor

402 // is active. This usually indicates something like a phone call.

383 // is active. This usually indicates something like a phone call.

403− if (status == Powerd.Off && reason != Powerd.Proximity) {

384+ if (status == Powerd.Off && reason != Powerd.Proximity && !edgeDemo.running) {

404 greeter.showNow();

385 greeter.showNow();

405 }

386 }

406

387

@@ -580,7 +561,7 @@ Item {

580 greeter: greeter

561 greeter: greeter

581 launcher: launcher

562 launcher: launcher

582 indicators: panel.indicators

563 indicators: panel.indicators

583− underlay: underlay

564+ stages: stages

584 }

565 }

585

566

586 Connections {

567 Connections {

run_on_device.sh+1−3

@@ -2,7 +2,6 @@

2CODE_DIR=shell

3USER=phablet

4USER_ID=32011

5−PASSWORD=phablet

6PACKAGE=unity8

5PACKAGE=unity8

7BINARY=unity8

6BINARY=unity8

8TARGET_IP=${TARGET_IP-127.0.0.1}

7TARGET_IP=${TARGET_IP-127.0.0.1}

@@ -13,7 +12,6 @@ SETUP=false

13GDB=false

12GDB=false

14PINLOCK=false

13PINLOCK=false

15KEYLOCK=false

14KEYLOCK=false

16−SUDO="echo $PASSWORD | sudo -S"

17NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'

15NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'

18FLIPPED=false

16FLIPPED=false

19CHROOT_PREFIX="/data/ubuntu"

17CHROOT_PREFIX="/data/ubuntu"

@@ -76,7 +74,7 @@ setup_adb_forwarding() {

76

74

77install_dependencies() {

75install_dependencies() {

78 exec_with_adb apt-get update

76 exec_with_adb apt-get update

79− exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs unity-plugin-scopes

77+ exec_with_adb apt-get -y --force-yes install build-essential rsync bzr ccache gdb ninja-build devscripts equivs unity-plugin-scopes

80}

78}

81

79

82sync_code() {

80sync_code() {

src/Dash/CMakeLists.txt+1

@@ -1,5 +1,6 @@

1set(DASH_SRCS

2 main.cpp

3+ ../MouseTouchAdaptor.cpp

3)

4)

4

5

5add_executable(unity8-dash ${DASH_SRCS})

6add_executable(unity8-dash ${DASH_SRCS})

src/Dash/main.cpp+26−4

@@ -24,8 +24,10 @@

24#include <QDebug>

25#include <QCommandLineParser>

26#include <QLibrary>

27+#include <libintl.h>

27

28

28#include <paths.h>

29#include <paths.h>

30+#include "../MouseTouchAdaptor.h"

29

31

30int main(int argc, const char *argv[])

32int main(int argc, const char *argv[])

31{

33{

@@ -35,11 +37,21 @@ int main(int argc, const char *argv[])

35 parser.setApplicationDescription("Description: Unity 8 Shell Dash");

37 parser.setApplicationDescription("Description: Unity 8 Shell Dash");

36 parser.addHelpOption();

38 parser.addHelpOption();

37

39

38− QCommandLineOption testabilityOption("testability",

40+ QCommandLineOption mousetouchOption("mousetouch",

39− "Load the testability driver (Alternatively export QT_LOAD_TESTABILITY");

41+ "Allow the mouse to provide touch input");

40− parser.addOption(testabilityOption);

42+ parser.addOption(mousetouchOption);

41

43

44+ // FIXME Remove once we drop the need of the hint

45+ QCommandLineOption desktopFileHintOption("desktop_file_hint",

46+ "The desktop_file_hint option for QtMir", "hint_file");

47+ parser.addOption(desktopFileHintOption);

48+

49+ // Treat args with single dashes the same as arguments with two dashes

50+ // Ex: -fullscreen == --fullscreen

51+ parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);

52+ parser.process(*application);

53+

42− if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {

54+ if (getenv("QT_LOAD_TESTABILITY")) {

43 QLibrary testLib(QLatin1String("qttestability"));

55 QLibrary testLib(QLatin1String("qttestability"));

44 if (testLib.load()) {

56 if (testLib.load()) {

45 typedef void (*TasInitialize)(void);

57 typedef void (*TasInitialize)(void);

@@ -54,10 +66,20 @@ int main(int argc, const char *argv[])

54 }

66 }

55 }

67 }

56

68

69+ bindtextdomain("unity8", translationDirectory().toUtf8().data());

70+

57 QQuickView* view = new QQuickView();

71 QQuickView* view = new QQuickView();

58 view->setResizeMode(QQuickView::SizeRootObjectToView);

72 view->setResizeMode(QQuickView::SizeRootObjectToView);

59 view->setTitle("Unity Dash");

73 view->setTitle("Unity Dash");

60

74

75+ // You will need this if you want to interact with touch-only components using a mouse

76+ // Needed only when manually testing on a desktop.

77+ MouseTouchAdaptor *mouseTouchAdaptor = 0;

78+ if (parser.isSet(mousetouchOption)) {

79+ mouseTouchAdaptor = new MouseTouchAdaptor;

80+ application->installNativeEventFilter(mouseTouchAdaptor);

81+ }

82+

61 QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

83 QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

62 prependImportPaths(view->engine(), ::overrideImportPaths());

84 prependImportPaths(view->engine(), ::overrideImportPaths());

63 appendImportPaths(view->engine(), ::fallbackImportPaths());

85 appendImportPaths(view->engine(), ::fallbackImportPaths());

tests/autopilot/unity8/shell/emulators/dash.py+1−1

@@ -150,7 +150,7 @@ class Dash(emulators.UnityEmulatorBase):

150 headerContainer.contentY.wait_for(0)

151 search_text_field = self._get_search_text_field()

152 search_text_field.write(query)

153− current_header.select_single(objectName="searchIndicator").running.wait_for(False)

153+ self.select_single(objectName="processingIndicator").visible.wait_for(False)

154

155 def _get_search_text_field(self):

156 page_header = self._get_current_page_header()

tests/mocks/Unity/CMakeLists.txt+3−3

@@ -7,7 +7,7 @@ add_subdirectory(DashCommunicator)

7pkg_search_module(DEE dee-1.0 REQUIRED)

8pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

9pkg_search_module(DEEQT libdee-qt5 REQUIRED)

10−pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)

10+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)

11

12include_directories(

13 ${CMAKE_CURRENT_BINARY_DIR}

@@ -23,14 +23,14 @@ set(UnityQML_SOURCES

23 fake_scope.cpp

24 fake_scopes.cpp

25 fake_categories.cpp

26− fake_department.cpp

26+ fake_navigation.cpp

27 fake_resultsmodel.cpp

28 fake_previewmodel.cpp

29 fake_previewstack.cpp

30 fake_previewwidgetmodel.cpp

31 fake_unity_plugin.cpp

32 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h

33− ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/DepartmentInterface.h

33+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/NavigationInterface.h

34 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h

35 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewStackInterface.h

36 ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewWidgetModelInterface.h

tests/mocks/Unity/Unity.qmltypes+79−27

@@ -24,6 +24,12 @@ Module {

24 Parameter { name: "categoryId"; type: "string" }

25 Parameter { name: "json"; type: "string" }

26 }

27+ Method {

28+ name: "data"

29+ type: "QVariant"

30+ Parameter { name: "row"; type: "int" }

31+ Parameter { name: "role"; type: "int" }

32+ }

27 }

33 }

28 Component {

34 Component {

29 name: "PreviewModel"

35 name: "PreviewModel"

@@ -62,6 +68,10 @@ Module {

62 prototype: "unity::shell::scopes::ScopeInterface"

68 prototype: "unity::shell::scopes::ScopeInterface"

63 exports: ["Unity/MockScope 0.2"]

69 exports: ["Unity/MockScope 0.2"]

64 exportMetaObjectRevisions: [0]

70 exportMetaObjectRevisions: [0]

71+ Signal {

72+ name: "performQuery"

73+ Parameter { name: "query"; type: "string" }

74+ }

65 Method {

75 Method {

66 name: "setSearchInProgress"

76 name: "setSearchInProgress"

67 Parameter { name: "inProg"; type: "bool" }

77 Parameter { name: "inProg"; type: "bool" }

@@ -81,18 +91,21 @@ Module {

81 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }

91 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }

82 }

92 }

83 Method {

93 Method {

84− name: "getDepartment"

94+ name: "getNavigation"

85− type: "unity::shell::scopes::DepartmentInterface*"

95+ type: "unity::shell::scopes::NavigationInterface*"

86− Parameter { name: "id"; type: "string" }

96+ Parameter { name: "navigationId"; type: "string" }

87 }

97 }

88 Method {

98 Method {

89− name: "loadDepartment"

99+ name: "getAltNavigation"

100+ type: "unity::shell::scopes::NavigationInterface*"

90− Parameter { name: "id"; type: "string" }

101+ Parameter { name: "altNavigationId"; type: "string" }

91 }

102 }

92 Method {

103 Method {

93− name: "performQuery"

104+ name: "setNavigationState"

94− Parameter { name: "query"; type: "string" }

105+ Parameter { name: "navigationId"; type: "string" }

106+ Parameter { name: "isAltNavigation"; type: "bool" }

95 }

107 }

108+ Method { name: "refresh" }

96 }

109 }

97 Component {

110 Component {

98 name: "Scopes"

111 name: "Scopes"

@@ -137,6 +150,7 @@ Module {

137 "RoleRawRendererTemplate": 3,

150 "RoleRawRendererTemplate": 3,

138 "RoleRenderer": 4,

151 "RoleRenderer": 4,

139 "RoleComponents": 5,

152 "RoleComponents": 5,

153+ "RoleHeaderLink": 6,

140 "RoleResults": 7,

154 "RoleResults": 7,

141 "RoleCount": 8

155 "RoleCount": 8

142 }

156 }

@@ -157,27 +171,28 @@ Module {

157 }

171 }

158 }

172 }

159 Component {

173 Component {

160− name: "unity::shell::scopes::DepartmentInterface"

174+ name: "unity::shell::scopes::NavigationInterface"

161 prototype: "QAbstractListModel"

175 prototype: "QAbstractListModel"

162− exports: ["Unity/Department 0.2"]

176+ exports: ["Unity/Navigation 0.2"]

163 isCreatable: false

177 isCreatable: false

164 exportMetaObjectRevisions: [0]

178 exportMetaObjectRevisions: [0]

165 Enum {

179 Enum {

166 name: "Roles"

180 name: "Roles"

167 values: {

181 values: {

168− "RoleDepartmentId": 0,

182+ "RoleNavigationId": 0,

169 "RoleLabel": 1,

183 "RoleLabel": 1,

170 "RoleHasChildren": 2,

184 "RoleHasChildren": 2,

171 "RoleIsActive": 3

185 "RoleIsActive": 3

172 }

186 }

173 }

187 }

174− Property { name: "departmentId"; type: "string"; isReadonly: true }

188+ Property { name: "navigationId"; type: "string"; isReadonly: true }

175 Property { name: "label"; type: "string"; isReadonly: true }

189 Property { name: "label"; type: "string"; isReadonly: true }

176 Property { name: "allLabel"; type: "string"; isReadonly: true }

190 Property { name: "allLabel"; type: "string"; isReadonly: true }

177− Property { name: "parentDepartmentId"; type: "string"; isReadonly: true }

191+ Property { name: "parentNavigationId"; type: "string"; isReadonly: true }

178 Property { name: "parentLabel"; type: "string"; isReadonly: true }

192 Property { name: "parentLabel"; type: "string"; isReadonly: true }

179 Property { name: "loaded"; type: "bool"; isReadonly: true }

193 Property { name: "loaded"; type: "bool"; isReadonly: true }

180 Property { name: "isRoot"; type: "bool"; isReadonly: true }

194 Property { name: "isRoot"; type: "bool"; isReadonly: true }

195+ Property { name: "hidden"; type: "bool"; isReadonly: true }

181 Property { name: "count"; type: "int"; isReadonly: true }

196 Property { name: "count"; type: "int"; isReadonly: true }

182 }

197 }

183 Component {

198 Component {

@@ -247,7 +262,8 @@ Module {

247 "RoleEmblem": 8,

262 "RoleEmblem": 8,

248 "RoleSummary": 9,

263 "RoleSummary": 9,

249 "RoleAttributes": 10,

264 "RoleAttributes": 10,

250− "RoleBackground": 11

265+ "RoleBackground": 11,

266+ "RoleOverlayColor": 12

251 }

267 }

252 }

268 }

253 Property { name: "categoryId"; type: "string" }

269 Property { name: "categoryId"; type: "string" }

@@ -259,13 +275,22 @@ Module {

259 exports: ["Unity/Scope 0.2"]

275 exports: ["Unity/Scope 0.2"]

260 isCreatable: false

276 isCreatable: false

261 exportMetaObjectRevisions: [0]

277 exportMetaObjectRevisions: [0]

278+ Enum {

279+ name: "Status"

280+ values: {

281+ "Okay": 0,

282+ "NoInternet": 1,

283+ "NoLocationData": 2,

284+ "Unknown": 3

285+ }

286+ }

262 Property { name: "id"; type: "string"; isReadonly: true }

287 Property { name: "id"; type: "string"; isReadonly: true }

263 Property { name: "name"; type: "string"; isReadonly: true }

288 Property { name: "name"; type: "string"; isReadonly: true }

264 Property { name: "iconHint"; type: "string"; isReadonly: true }

289 Property { name: "iconHint"; type: "string"; isReadonly: true }

265 Property { name: "description"; type: "string"; isReadonly: true }

290 Property { name: "description"; type: "string"; isReadonly: true }

266 Property { name: "searchHint"; type: "string"; isReadonly: true }

291 Property { name: "searchHint"; type: "string"; isReadonly: true }

267 Property { name: "searchInProgress"; type: "bool"; isReadonly: true }

292 Property { name: "searchInProgress"; type: "bool"; isReadonly: true }

268− Property { name: "visible"; type: "bool"; isReadonly: true }

293+ Property { name: "favorite"; type: "bool" }

269 Property { name: "shortcut"; type: "string"; isReadonly: true }

294 Property { name: "shortcut"; type: "string"; isReadonly: true }

270 Property {

295 Property {

271 name: "categories"

296 name: "categories"

@@ -273,13 +298,27 @@ Module {

273 isReadonly: true

298 isReadonly: true

274 isPointer: true

299 isPointer: true

275 }

300 }

301+ Property {

302+ name: "settings"

303+ type: "unity::shell::scopes::SettingsModelInterface"

304+ isReadonly: true

305+ isPointer: true

306+ }

276 Property { name: "searchQuery"; type: "string" }

307 Property { name: "searchQuery"; type: "string" }

277 Property { name: "noResultsHint"; type: "string" }

308 Property { name: "noResultsHint"; type: "string" }

278 Property { name: "formFactor"; type: "string" }

309 Property { name: "formFactor"; type: "string" }

279 Property { name: "isActive"; type: "bool" }

310 Property { name: "isActive"; type: "bool" }

311+ Property { name: "currentNavigationId"; type: "string"; isReadonly: true }

312+ Property { name: "hasNavigation"; type: "bool"; isReadonly: true }

280− Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }

313+ Property { name: "currentAltNavigationId"; type: "string"; isReadonly: true }

281− Property { name: "hasDepartments"; type: "bool"; isReadonly: true }

314+ Property { name: "hasAltNavigation"; type: "bool"; isReadonly: true }

282 Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }

315 Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }

316+ Property {

317+ name: "status"

318+ type: "unity::shell::scopes::ScopeInterface::Status"

319+ isReadonly: true

320+ }

321+ Signal { name: "detailsChanged" }

283 Signal { name: "showDash" }

322 Signal { name: "showDash" }

284 Signal { name: "hideDash" }

323 Signal { name: "hideDash" }

285 Signal {

324 Signal {

@@ -298,10 +337,6 @@ Module {

298 name: "openScope"

337 name: "openScope"

299 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }

338 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }

300 }

339 }

301− Signal {

302− name: "activateApplication"

303− Parameter { name: "desktop"; type: "string" }

304− }

305 Method {

340 Method {

306 name: "activate"

341 name: "activate"

307 Parameter { name: "result"; type: "QVariant" }

342 Parameter { name: "result"; type: "QVariant" }

@@ -317,14 +352,25 @@ Module {

317 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }

352 Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }

318 }

353 }

319 Method {

354 Method {

320− name: "getDepartment"

355+ name: "getNavigation"

321− type: "unity::shell::scopes::DepartmentInterface*"

356+ type: "unity::shell::scopes::NavigationInterface*"

322− Parameter { name: "departmentId"; type: "string" }

357+ Parameter { name: "navigationId"; type: "string" }

358+ }

359+ Method {

360+ name: "getAltNavigation"

361+ type: "unity::shell::scopes::NavigationInterface*"

362+ Parameter { name: "altNavigationId"; type: "string" }

323 }

363 }

324 Method {

364 Method {

325− name: "loadDepartment"

365+ name: "setNavigationState"

326− Parameter { name: "departmentId"; type: "string" }

366+ Parameter { name: "navId"; type: "string" }

367+ Parameter { name: "altNavigation"; type: "bool" }

327 }

368 }

369+ Method {

370+ name: "performQuery"

371+ Parameter { name: "cannedQuery"; type: "string" }

372+ }

373+ Method { name: "refresh" }

328 }

374 }

329 Component {

375 Component {

330 name: "unity::shell::scopes::ScopesInterface"

376 name: "unity::shell::scopes::ScopesInterface"

@@ -334,11 +380,17 @@ Module {

334 values: {

380 values: {

335 "RoleScope": 0,

381 "RoleScope": 0,

336 "RoleId": 1,

382 "RoleId": 1,

337− "RoleVisible": 2,

338− "RoleTitle": 3

383+ "RoleTitle": 2

339 }

384 }

340 }

385 }

341 Property { name: "loaded"; type: "bool"; isReadonly: true }

386 Property { name: "loaded"; type: "bool"; isReadonly: true }

387+ Property { name: "count"; type: "int"; isReadonly: true }

388+ Property {

389+ name: "overviewScope"

390+ type: "unity::shell::scopes::ScopeInterface"

391+ isReadonly: true

392+ isPointer: true

393+ }

342 Method {

394 Method {

343 name: "getScope"

395 name: "getScope"

344 type: "unity::shell::scopes::ScopeInterface*"

396 type: "unity::shell::scopes::ScopeInterface*"

tests/mocks/Unity/fake_department.cpp → tests/mocks/Unity/fake_navigation.cpprenamed+32−40

@@ -14,14 +14,15 @@

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

15 */

16

17−#include "fake_department.h"

17+#include "fake_navigation.h"

18

19#include "fake_scope.h"

20

21+#include <QDebug>

21#include <QTimer>

22#include <QTimer>

22

23

23−Department::Department(const QString& departmentId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)

24+Navigation::Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)

24− : m_departmentId(departmentId)

25+ : m_navigationId(navigationId)

25 , m_label(label)

26 , m_label(label)

26 , m_allLabel(allLabel)

27 , m_allLabel(allLabel)

27 , m_parentId(parentId)

28 , m_parentId(parentId)

@@ -30,96 +31,87 @@ Department::Department(const QString& departmentId, const QString& label, const

30 , m_scope(scope)

31 , m_scope(scope)

31{

32{

32 QTimer::singleShot(1500, this, SLOT(slotLoaded()));

33 QTimer::singleShot(1500, this, SLOT(slotLoaded()));

33− connect(scope, SIGNAL(currentDepartmentIdChanged()), this, SLOT(slotCurrentDepartmentChanged()));

34+ connect(scope, SIGNAL(currentNavigationIdChanged()), this, SLOT(slotCurrentNavigationChanged()));

34}

35}

35

36

36−QString Department::departmentId() const

37+QString Navigation::navigationId() const

37{

38{

38− return m_departmentId;

39+ return m_navigationId;

39}

40}

40

41

41−QString Department::label() const

42+QString Navigation::label() const

42{

43{

43 return m_label;

44 return m_label;

44}

45}

45

46

46−QString Department::allLabel() const

47+QString Navigation::allLabel() const

47{

48{

48 return m_allLabel;

49 return m_allLabel;

49}

50}

50

51

51−QString Department::parentDepartmentId() const

52+QString Navigation::parentNavigationId() const

52{

53{

53 return m_parentId;

54 return m_parentId;

54}

55}

55

56

56−QString Department::parentLabel() const

57+QString Navigation::parentLabel() const

57{

58{

58 return m_parentLabel;

59 return m_parentLabel;

59}

60}

60

61

61−void Department::slotLoaded()

62+void Navigation::slotLoaded()

62{

63{

63 m_loaded = true;

64 m_loaded = true;

64 Q_EMIT loadedChanged();

65 Q_EMIT loadedChanged();

65}

66}

66

67

67−bool Department::loaded() const

68+bool Navigation::loaded() const

68{

69{

69 return m_loaded;

70 return m_loaded;

70}

71}

71

72

72−int Department::count() const

73+int Navigation::count() const

73{

74{

74 return rowCount();

75 return rowCount();

75}

76}

76

77

77−bool Department::isRoot() const

78+bool Navigation::isRoot() const

78{

79{

79− return m_departmentId == "root";

80+ return m_navigationId == "root" || m_navigationId == "altroot";

80}

81}

81

82

82−int Department::rowCount(const QModelIndex & /*parent*/) const

83+bool Navigation::hidden() const

83{

84{

84− if (!m_loaded || m_departmentId.startsWith("child") || m_departmentId == "middle3")

85+ return m_navigationId == "altroot";

85− return 0;

86− else

87− return 8;

88}

86}

89

87

90−QHash<int, QByteArray> Department::roleNames() const

88+int Navigation::rowCount(const QModelIndex & /*parent*/) const

91{

89{

92− QHash<int, QByteArray> res;

90+ if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId == "middle3")

93− res[RoleDepartmentId] = "departmentId";

91+ return 0;

94− res[RoleLabel] = "label";

92+ else

95− res[RoleHasChildren] = "hasChildren";

96− res[RoleIsActive] = "isActive";

97− return res;

93+ return 8;

98}

94}

99

95

100−QVariant Department::data(const QModelIndex &index, int role) const

96+QVariant Navigation::data(const QModelIndex &index, int role) const

101{

97{

102 switch (role) {

98 switch (role) {

103− case RoleDepartmentId:

99+ case RoleNavigationId:

104− if (m_departmentId == "root")

100+ if (m_navigationId == "root")

105 return QString("middle%1").arg(index.row());

101 return QString("middle%1").arg(index.row());

106− else if (m_departmentId.startsWith("middle"))

102+ else if (m_navigationId.startsWith("middle"))

107− return QString("child%1%2").arg(m_departmentId).arg(index.row());

103+ return QString("child%1%2").arg(m_navigationId).arg(index.row());

108− break;

109 case RoleLabel:

104 case RoleLabel:

110− return QString("%1Child%2").arg(m_departmentId).arg(index.row());

105+ return QString("%1Child%2").arg(m_navigationId).arg(index.row());

111− break;

112 case RoleHasChildren:

106 case RoleHasChildren:

113− return m_departmentId == "root" && index.row() != 3;

107+ return m_navigationId == "root" && index.row() != 3;

114− break;

115 case RoleIsActive:

108 case RoleIsActive:

116− return m_scope->currentDepartmentId() == data(index, RoleDepartmentId);

109+ return m_scope->currentNavigationId() == data(index, RoleNavigationId);

117− break;

118 }

110 }

119 return QVariant();

111 return QVariant();

120}

112}

121

113

122−void Department::slotCurrentDepartmentChanged()

114+void Navigation::slotCurrentNavigationChanged()

123{

115{

124 // This is wasteful, should only emit it if really something changed in this

116 // This is wasteful, should only emit it if really something changed in this

125 // deparment, but this is a mock, so no need to optimize

117 // deparment, but this is a mock, so no need to optimize

tests/mocks/Unity/fake_department.h → tests/mocks/Unity/fake_navigation.hrenamed+13−13

@@ -14,48 +14,48 @@

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

15 */

16

17−#ifndef FAKE_DEPARTMENT_H

17+#ifndef FAKE_NAVIGATION_H

18−#define FAKE_DEPARTMENT_H

18+#define FAKE_NAVIGATION_H

19

20−#include <unity/shell/scopes/DepartmentInterface.h>

20+#include <unity/shell/scopes/NavigationInterface.h>

21

22class Scope;

23

24−class Department : public unity::shell::scopes::DepartmentInterface

24+class Navigation : public unity::shell::scopes::NavigationInterface

25{

26 Q_OBJECT

27

28public:

29− Department(const QString& departmentId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);

29+ Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);

30

31− QString departmentId() const override;

31+ QString navigationId() const override;

32 QString label() const override;

33 QString allLabel() const override;

34− QString parentDepartmentId() const override;

34+ QString parentNavigationId() const override;

35 QString parentLabel() const override;

36 bool loaded() const override;

37− int count() const override;

38 bool isRoot() const override;

37 bool isRoot() const override;

38+ bool hidden() const override;

39+ int count() const override;

39

40

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

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

41− QHash<int, QByteArray> roleNames() const;

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

43

44public Q_SLOTS:

45− void slotCurrentDepartmentChanged();

45+ void slotCurrentNavigationChanged();

46

47private Q_SLOTS:

48 void slotLoaded();

49

50private:

51− QString m_departmentId;

51+ QString m_navigationId;

52 QString m_label;

53 QString m_allLabel;

54 QString m_parentId;

55 QString m_parentLabel;

56 bool m_loaded;

57− QString m_currentDepartment;

57+ QString m_currentNavigation;

58 Scope *m_scope;

59};

60

61−#endif // FAKE_DEPARTMENT_H

61+#endif // FAKE_NAVIGATION_H

tests/mocks/Unity/fake_scope.cpp+65−17

@@ -14,24 +14,26 @@

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

15 */

16

17+#include <QDebug>

17#include <QUrl>

18#include <QUrl>

18

19

19#include "fake_scope.h"

20#include "fake_scope.h"

20−#include "fake_department.h"

21+#include "fake_navigation.h"

21#include "fake_resultsmodel.h"

22#include "fake_resultsmodel.h"

22

23

23Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)

24Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)

24{

25{

25}

26}

26

27

27−Scope::Scope(QString const& id, QString const& name, bool visible, QObject* parent, int categories)

28+Scope::Scope(QString const& id, QString const& name, bool favorite, QObject* parent, int categories)

28 : unity::shell::scopes::ScopeInterface(parent)

29 : unity::shell::scopes::ScopeInterface(parent)

29 , m_id(id)

30 , m_id(id)

30 , m_name(name)

31 , m_name(name)

31− , m_visible(visible)

32 , m_searching(false)

33+ , m_favorite(favorite)

33 , m_isActive(false)

34 , m_isActive(false)

34− , m_currentDeparment("root")

35+ , m_currentNavigationId("root")

36+ , m_currentAltNavigationId("altroot")

35 , m_previewRendererName("preview-generic")

37 , m_previewRendererName("preview-generic")

36 , m_categories(new Categories(categories, this))

38 , m_categories(new Categories(categories, this))

37{

39{

@@ -77,6 +79,11 @@ bool Scope::searchInProgress() const

77 return m_searching;

79 return m_searching;

78}

80}

79

81

82+bool Scope::favorite() const

83+{

84+ return m_favorite;

85+}

86+

80unity::shell::scopes::CategoriesInterface* Scope::categories() const

87unity::shell::scopes::CategoriesInterface* Scope::categories() const

81{

88{

82 return m_categories;

89 return m_categories;

@@ -97,11 +104,6 @@ QString Scope::formFactor() const

97 return m_formFactor;

104 return m_formFactor;

98}

105}

99

106

100−bool Scope::visible() const

101−{

102− return m_visible;

103−}

104−

105bool Scope::isActive() const

107bool Scope::isActive() const

106{

108{

107 return m_isActive;

109 return m_isActive;

@@ -131,6 +133,13 @@ void Scope::setActive(const bool active)

131 }

133 }

132}

134}

133

135

136+void Scope::setFavorite(const bool favorite)

137+{

138+ if (favorite != m_favorite) {

139+ m_favorite = favorite;

140+ Q_EMIT favoriteChanged();

141+ }

142+}

134void Scope::setSearchInProgress(const bool inProg)

143void Scope::setSearchInProgress(const bool inProg)

135{

144{

136 if (inProg != m_searching) {

145 if (inProg != m_searching) {

@@ -170,16 +179,31 @@ void Scope::closeScope(unity::shell::scopes::ScopeInterface* /*scope*/)

170 qFatal("Scope::closeScope is not implemented");

179 qFatal("Scope::closeScope is not implemented");

171}

180}

172

181

173−QString Scope::currentDepartmentId() const

182+QString Scope::currentNavigationId() const

183+{

184+ return m_currentNavigationId;

185+}

186+

187+bool Scope::hasNavigation() const

188+{

189+ return true;

190+}

191+

192+QString Scope::currentAltNavigationId() const

174{

193{

175− return m_currentDeparment;

194+ return m_currentAltNavigationId;

176}

195}

177

196

178−bool Scope::hasDepartments() const

197+bool Scope::hasAltNavigation() const

179{

198{

180 return true;

199 return true;

181}

200}

182

201

202+Scope::Status Scope::status() const

203+{

204+ return Status::Okay;

205+}

206+

183QVariantMap Scope::customizations() const

207QVariantMap Scope::customizations() const

184{

208{

185 QVariantMap m, h;

209 QVariantMap m, h;

@@ -196,7 +220,12 @@ QVariantMap Scope::customizations() const

196 return m;

220 return m;

197}

221}

198

222

223+void Scope::refresh()

224+{

225+ qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";

226+}

227+

199−unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)

228+unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)

200{

229{

201 if (id.isEmpty())

230 if (id.isEmpty())

202 return nullptr;

231 return nullptr;

@@ -210,11 +239,30 @@ unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& i

210 parentId = id.mid(5, 7);

239 parentId = id.mid(5, 7);

211 parentLabel = parentId;

240 parentLabel = parentId;

212 }

241 }

242+ return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

243+}

244+

245+unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& id)

246+{

247+ if (id.isEmpty())

248+ return nullptr;

249+

250+ QString parentId;

251+ QString parentLabel;

252+ if (id.startsWith("altmiddle")) {

253+ parentId = "altroot";

254+ parentLabel = "altroot";

255+ }

213− return new Department(id, id, "all"+id, parentId, parentLabel, this);

256+ return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

214}

257}

215

258

216−void Scope::loadDepartment(const QString& id)

259+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)

217{

260{

218− m_currentDeparment = id;

261+ if (isAltNavigation) {

219− Q_EMIT currentDepartmentIdChanged();

262+ m_currentAltNavigationId = navigationId;

263+ Q_EMIT currentAltNavigationIdChanged();

264+ } else {

265+ m_currentNavigationId = navigationId;

266+ Q_EMIT currentNavigationIdChanged();

267+ }

220}

268}

tests/mocks/Unity/fake_scope.h+16−8

@@ -30,7 +30,7 @@ class Scope : public unity::shell::scopes::ScopeInterface

30

31public:

32 Scope(QObject* parent = 0);

33− Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0, int categories = 20);

33+ Scope(QString const& id, QString const& name, bool favorite, QObject* parent = 0, int categories = 20);

34

35 /* getters */

36 QString id() const override;

@@ -38,9 +38,9 @@ public:

38 QString iconHint() const override;

39 QString description() const override;

40 QString searchHint() const override;

41− bool visible() const override;

42 QString shortcut() const override;

41 QString shortcut() const override;

43 bool searchInProgress() const override;

42 bool searchInProgress() const override;

43+ bool favorite() const override;

44 unity::shell::scopes::CategoriesInterface* categories() const override;

45 QString searchQuery() const override;

46 QString noResultsHint() const override;

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

53 void setNoResultsHint(const QString& hint) override;

54 void setFormFactor(const QString& form_factor) override;

55 void setActive(const bool) override;

56+ void setFavorite(const bool) override;

56 Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits

57 Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits

57

58

58 Q_INVOKABLE void activate(QVariant const& result) override;

59 Q_INVOKABLE void activate(QVariant const& result) override;

@@ -60,14 +61,20 @@ public:

60 Q_INVOKABLE void cancelActivation() override;

61 Q_INVOKABLE void cancelActivation() override;

61 Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;

62 Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;

62

63

63− QString currentDepartmentId() const override;

64+ QString currentNavigationId() const override;

64− bool hasDepartments() const override;

65+ bool hasNavigation() const override;

65− Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;

66+ QString currentAltNavigationId() const override;

67+ bool hasAltNavigation() const override;

68+ Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

69+ Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;

66− Q_INVOKABLE void loadDepartment(const QString& id) override;

70+ Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;

67 Q_SIGNAL void performQuery(const QString& query) override;

71 Q_SIGNAL void performQuery(const QString& query) override;

68

72

73+ Status status() const override;

69 QVariantMap customizations() const override;

74 QVariantMap customizations() const override;

70

75

76+ Q_INVOKABLE void refresh() override;

77+

71protected:

78protected:

72

79

73 QString m_id;

80 QString m_id;

@@ -77,10 +84,11 @@ protected:

77 QString m_searchQuery;

84 QString m_searchQuery;

78 QString m_noResultsHint;

85 QString m_noResultsHint;

79 QString m_formFactor;

86 QString m_formFactor;

80− bool m_visible;

81 bool m_searching;

87 bool m_searching;

88+ bool m_favorite;

82 bool m_isActive;

89 bool m_isActive;

83− QString m_currentDeparment;

90+ QString m_currentNavigationId;

91+ QString m_currentAltNavigationId;

84

92

85 QString m_previewRendererName;

93 QString m_previewRendererName;

86

94

tests/mocks/Unity/fake_scopes.cpp+10−2

@@ -32,6 +32,11 @@ Scopes::Scopes(QObject *parent)

32 timer.setSingleShot(true);

33 timer.setInterval(100);

34 QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateScopes()));

35+

36+ QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

37+ QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

38+ QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));

39+

35 load();

40 load();

36}

41}

37

42

@@ -92,8 +97,6 @@ QVariant Scopes::data(const QModelIndex& index, int role) const

92 return QVariant::fromValue(scope);

97 return QVariant::fromValue(scope);

93 } else if (role == Scopes::RoleId) {

98 } else if (role == Scopes::RoleId) {

94 return QVariant::fromValue(scope->id());

99 return QVariant::fromValue(scope->id());

95− } else if (role == Scopes::RoleVisible) {

96− return QVariant::fromValue(scope->visible());

97 } else if (role == Scopes::RoleTitle) {

100 } else if (role == Scopes::RoleTitle) {

98 return QVariant::fromValue(scope->name());

101 return QVariant::fromValue(scope->name());

99 } else {

102 } else {

@@ -125,6 +128,11 @@ bool Scopes::loaded() const

125 return m_loaded;

128 return m_loaded;

126}

129}

127

130

131+int Scopes::count() const

132+{

133+ return rowCount();

134+}

135+

128unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const

136unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const

129{

137{

130 return nullptr;

138 return nullptr;

tests/mocks/Unity/fake_scopes.h+1

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

50 QModelIndex parent ( const QModelIndex & index ) const;

51

52 bool loaded() const override;

53+ int count() const override;

53 unity::shell::scopes::ScopeInterface* overviewScope() const override;

54 unity::shell::scopes::ScopeInterface* overviewScope() const override;

54

55

55private Q_SLOTS:

56private Q_SLOTS:

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

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

22// local

23#include "fake_scopes.h"

24#include "fake_categories.h"

25−#include "fake_department.h"

25+#include "fake_navigation.h"

26#include "fake_previewmodel.h"

27#include "fake_previewwidgetmodel.h"

28#include "fake_resultsmodel.h"

@@ -43,7 +43,7 @@ void FakeUnityPlugin::registerTypes(const char *uri)

43 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");

44 qmlRegisterType<Scope>(uri, 0, 2, "MockScope");

45 qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Scope object in QML.");

46− qmlRegisterUncreatableType<unity::shell::scopes::DepartmentInterface>(uri, 0, 2, "Department", "Can't create Department object in QML.");

46+ qmlRegisterUncreatableType<unity::shell::scopes::NavigationInterface>(uri, 0, 2, "Navigation", "Can't create Navigation object in QML.");

47 qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");

48 qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");

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

tests/plugins/Dash/cardcreator/1.res+12−10

@@ -33,20 +33,15 @@ Item {

33 visible: image.status == Image.Ready;

34 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

37− Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

36+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

38− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

39 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

40 function updateWidthHeightBindings() {

38 function updateWidthHeightBindings() {

41 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

39 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

42 width = root.fixedArtShapeSize.width;

40 width = root.fixedArtShapeSize.width;

43 height = root.fixedArtShapeSize.height;

41 height = root.fixedArtShapeSize.height;

44− } else if (aspectSmallerThanImageAspect) {

45− width = Qt.binding(function() { return !visible ? 0 : image.width });

46− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });

47 } else {

42 } else {

48− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

49− height = Qt.binding(function() { return !visible ? 0 : image.height });

44+ height = Qt.binding(function() { return !visible ? 0 : image.height });

50 }

45 }

51 }

46 }

52 image: Image {

47 image: Image {

@@ -54,8 +49,7 @@ Item {

54 source: cardData && cardData["art"] || "";

49 source: cardData && cardData["art"] || "";

55 cache: true;

50 cache: true;

56 asynchronous: root.asynchronous;

51 asynchronous: root.asynchronous;

57− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

58− readonly property real aspect: implicitWidth / implicitHeight;

59 width: root.width;

53 width: root.width;

60 height: width / artShape.aspect;

54 height: width / artShape.aspect;

61 }

55 }

@@ -84,5 +78,13 @@ leftMargin: units.gu(1);

84 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

78 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

85 horizontalAlignment: root.headerAlignment;

79 horizontalAlignment: root.headerAlignment;

86 }

80 }

81+UbuntuShape {

82+ id: touchdown;

83+ objectName: "touchdown";

84+ anchors { fill: artShapeHolder }

85+ visible: root.pressed;

86+ radius: "medium";

87+ borderSource: "radius_pressed.sci"

88+}

87implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);

89implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);

88}

90}

tests/plugins/Dash/cardcreator/1.tst+1−1

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

1template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}

2−components: {"art":{"aspect-ratio":1.6,"field":"art","fill-mode":"fit"},"title":{"field":"title"}}

2+components: {"art":{"aspect-ratio":1.6,"field":"art"},"title":{"field":"title"}}

3result: 1.res

tests/plugins/Dash/cardcreator/2.res+8

@@ -116,5 +116,13 @@ left: parent.left;

116

117 ]

118 }

119+UbuntuShape {

120+ id: touchdown;

121+ objectName: "touchdown";

122+ anchors { fill: backgroundLoader }

123+ visible: root.pressed;

124+ radius: "medium";

125+ borderSource: "radius_pressed.sci"

126+}

119implicitHeight: row.y + row.height + units.gu(1);

127implicitHeight: row.y + row.height + units.gu(1);

120}

128}

tests/plugins/Dash/cardcreator/2.tst+1−1

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

1template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}

2−components: {"art":{"aspect-ratio":1,"fill-mode":"crop"},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"}}

2+components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"}}

3result: 2.res

tests/plugins/Dash/cardcreator/3.res+12−10

@@ -25,7 +25,7 @@ Item {

25 objectName: "artShapeLoader";

26 active: cardData && cardData["art"] || false;

27 asynchronous: root.asynchronous;

28− visible: status == Loader.Ready;

28+ visible: status == Loader.Ready;

29 sourceComponent: UbuntuShape {

30 id: artShape;

31 objectName: "artShape";

@@ -33,20 +33,15 @@ Item {

33 visible: image.status == Image.Ready;

34 readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;

35 readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;

36− readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;

37 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

36 Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }

38− onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();

39 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

37 Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }

40 function updateWidthHeightBindings() {

38 function updateWidthHeightBindings() {

41 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

39 if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {

42 width = root.fixedArtShapeSize.width;

40 width = root.fixedArtShapeSize.width;

43 height = root.fixedArtShapeSize.height;

41 height = root.fixedArtShapeSize.height;

44− } else if (aspectSmallerThanImageAspect) {

45− width = Qt.binding(function() { return !visible ? 0 : image.width });

46− height = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.height : width / image.aspect });

47 } else {

42 } else {

48− width = Qt.binding(function() { return !visible ? 0 : image.fillMode === Image.PreserveAspectCrop ? image.width : height * image.aspect });

43+ width = Qt.binding(function() { return !visible ? 0 : image.width });

49− height = Qt.binding(function() { return !visible ? 0 : image.height });

44+ height = Qt.binding(function() { return !visible ? 0 : image.height });

50 }

45 }

51 }

46 }

52 image: Image {

47 image: Image {

@@ -54,8 +49,7 @@ Item {

54 source: cardData && cardData["art"] || "";

49 source: cardData && cardData["art"] || "";

55 cache: true;

50 cache: true;

56 asynchronous: root.asynchronous;

51 asynchronous: root.asynchronous;

57− fillMode: components && components["art"]["fill-mode"] === "fit" ? Image.PreserveAspectFit: Image.PreserveAspectCrop;

52+ fillMode: Image.PreserveAspectCrop;

58− readonly property real aspect: implicitWidth / implicitHeight;

59 width: root.width;

53 width: root.width;

60 height: width / artShape.aspect;

54 height: width / artShape.aspect;

61 }

55 }

@@ -103,5 +97,13 @@ Label {

103 font.weight: Font.Light;

97 font.weight: Font.Light;

104 horizontalAlignment: root.headerAlignment;

98 horizontalAlignment: root.headerAlignment;

105 }

99 }

100+UbuntuShape {

101+ id: touchdown;

102+ objectName: "touchdown";

103+ anchors { fill: artShapeHolder }

104+ visible: root.pressed;

105+ radius: "medium";

106+ borderSource: "radius_pressed.sci"

107+}

106implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);

108implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);

107}

109}

tests/plugins/Dash/cardcreator/3.tst+1−1

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

1template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}

2−components: {"art":{"aspect-ratio":0.75,"field":"art","fill-mode":"crop"},"subtitle":{"field":"price"},"title":{"field":"title"}}

2+components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"}}

3result: 3.res

tests/plugins/Dash/cardcreator/4.res+8

@@ -94,5 +94,13 @@ Label {

94}

95]

96}

97+UbuntuShape {

98+ id: touchdown;

99+ objectName: "touchdown";

100+ anchors { fill: root }

101+ visible: root.pressed;

102+ radius: "medium";

103+ borderSource: "radius_pressed.sci"

104+}

97implicitHeight: row.y + row.height + units.gu(1);

105implicitHeight: row.y + row.height + units.gu(1);

98}

106}

tests/plugins/Dash/cardcreator/4.tst+1−1

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

1template: {"card-layout":"horizontal","card-size":"large","category-layout":"grid","collapsed-rows":2}

2−components: {"art":{"aspect-ratio":1,"fill-mode":"crop"},"mascot":{"field":"mascot"},"subtitle":{"field":"domain"},"title":{"field":"title"}}

2+components: {"art":{"aspect-ratio":1},"mascot":{"field":"mascot"},"subtitle":{"field":"domain"},"title":{"field":"title"}}

3result: 4.res

tests/plugins/Dash/cardcreator/5.res+14−12