9554b77 · unity8 · git.iko.soy

tests/autopilot/.project → .projectrenamed+1−1

compare with xenial

unifiedsplit

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

1<?xml version="1.0" encoding="UTF-8"?>

2<projectDescription>

3− <name>Unity8 Autopilot</name>

3+ <name>Unity8</name>

4 <comment></comment>

5 <projects>

6 </projects>

tests/autopilot/.pydevproject → .pydevprojectrenamed+3−1

@@ -1,7 +1,9 @@

1<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2<?eclipse-pydev version="1.0"?><pydev_project>

3<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">

4−<path>/Unity8 Autopilot</path>

4+<path>/Unity8/tests/autopilot</path>

5+<path>/Unity8/.bazaar</path>

6+<path>/Unity8/tests/whitespace</path>

5</pydev_pathproperty>

7</pydev_pathproperty>

6<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>

8<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>

7<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

9<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

.settings/Autopilot List.launchnew file+14

@@ -0,0 +1,14 @@

1+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2+<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">

3+<stringAttribute key="bad_container_name" value="/Unity8/.pyd"/>

4+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>

5+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>

6+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

7+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

8+</listAttribute>

9+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/autopilot"/>

10+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>

11+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="list unity8"/>

12+<stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>

13+<stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="Unity8"/>

14+</launchConfiguration>

.settings/Autopilot Run.launchnew file+14

@@ -0,0 +1,14 @@

1+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

2+<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">

3+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>

4+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>

5+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">

6+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

7+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

8+</listAttribute>

9+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/autopilot"/>

10+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>

11+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="run ${string_prompt:the test suite to run:unity8}"/>

12+<stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>

13+<stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="Unity8"/>

14+</launchConfiguration>

debian/control+1−1

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

108 unity-application-impl-2,

109 unity-notifications-impl-3,

110 unity-plugin-scopes | unity-scopes-impl,

111− unity-scopes-impl-0,

111+ unity-scopes-impl-2,

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

113 ${misc:Depends},

114Breaks: unity8 (<< 7.86),

po/unity8.pot+34−14

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

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

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2014-07-16 17:27+0200\n"

11+"POT-Creation-Date: 2014-07-21 15:41+0200\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -101,7 +101,7 @@ msgstr ""

101msgid "See more"

102msgstr ""

103

104−#: qml/Components/SeeMore.qml:58

104+#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:356

105msgid "See less"

106msgstr ""

107

@@ -109,6 +109,10 @@ msgstr ""

109msgid "Recent"

110msgstr ""

111

112+#: qml/Dash/GenericScopeView.qml:356

113+msgid "See all"

114+msgstr ""

115+

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

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

113msgid "More..."

117msgid "More..."

114msgstr ""

118msgstr ""

@@ -129,11 +133,11 @@ msgstr ""

129msgid "Send"

133msgid "Send"

130msgstr ""

134msgstr ""

131

135

132−#: qml/Dash/ScopesOverview.qml:114

136+#: qml/Dash/ScopesOverview.qml:185

133msgid "Manage Dash"

137msgid "Manage Dash"

134msgstr ""

138msgstr ""

135

139

136−#: qml/Dash/ScopesOverview.qml:291

140+#: qml/Dash/ScopesOverview.qml:390

137msgid "Done"

141msgid "Done"

138msgstr ""

142msgstr ""

139

143

@@ -141,7 +145,7 @@ msgstr ""

141msgid "Favorites"

145msgid "Favorites"

142msgstr ""

146msgstr ""

143

147

144−#: qml/Dash/ScopesOverviewTab.qml:53

148+#: qml/Dash/ScopesOverviewTab.qml:54

145msgid "All"

149msgid "All"

146msgstr ""

150msgstr ""

147

151

@@ -169,11 +173,11 @@ msgstr ""

169msgid "Speaking..."

173msgid "Speaking..."

170msgstr ""

174msgstr ""

171

175

172−#: qml/Notifications/NotificationMenuItemFactory.qml:91

176+#: qml/Notifications/NotificationMenuItemFactory.qml:97

173msgid "Show password"

177msgid "Show password"

174msgstr ""

178msgstr ""

175

179

176−#: qml/Notifications/NotificationMenuItemFactory.qml:103

180+#: qml/Notifications/NotificationMenuItemFactory.qml:112

177msgid "Please enter SIM PIN"

181msgid "Please enter SIM PIN"

178msgstr ""

182msgstr ""

179

183

@@ -185,27 +189,27 @@ msgstr ""

185msgid "Conference"

189msgid "Conference"

186msgstr ""

190msgstr ""

187

191

188−#: qml/Panel/Indicators/MenuItemFactory.qml:583

192+#: qml/Panel/Indicators/MenuItemFactory.qml:577

189msgid "In queue…"

193msgid "In queue…"

190msgstr ""

194msgstr ""

191

195

192−#: qml/Panel/Indicators/MenuItemFactory.qml:587

196+#: qml/Panel/Indicators/MenuItemFactory.qml:581

193msgid "Downloading"

197msgid "Downloading"

194msgstr ""

198msgstr ""

195

199

196−#: qml/Panel/Indicators/MenuItemFactory.qml:589

200+#: qml/Panel/Indicators/MenuItemFactory.qml:583

197msgid "Paused, tap to resume"

201msgid "Paused, tap to resume"

198msgstr ""

202msgstr ""

199

203

200−#: qml/Panel/Indicators/MenuItemFactory.qml:591

204+#: qml/Panel/Indicators/MenuItemFactory.qml:585

201msgid "Canceled"

205msgid "Canceled"

202msgstr ""

206msgstr ""

203

207

204−#: qml/Panel/Indicators/MenuItemFactory.qml:593

208+#: qml/Panel/Indicators/MenuItemFactory.qml:587

205msgid "Finished"

209msgid "Finished"

206msgstr ""

210msgstr ""

207

211

208−#: qml/Panel/Indicators/MenuItemFactory.qml:595

212+#: qml/Panel/Indicators/MenuItemFactory.qml:589

209msgid "Failed, tap to retry"

213msgid "Failed, tap to retry"

210msgstr ""

214msgstr ""

211

215

@@ -213,7 +217,23 @@ msgstr ""

213msgid "Search"

217msgid "Search"

214msgstr ""

218msgstr ""

215

219

216−#: qml/Shell.qml:353

220+#: qml/Shell.qml:347

221+msgid "Are you sure you would like to turn power off?"

222+msgstr ""

223+

224+#: qml/Shell.qml:349

225+msgid "Power off"

226+msgstr ""

227+

228+#: qml/Shell.qml:360

229+msgid "Restart"

230+msgstr ""

231+

232+#: qml/Shell.qml:369

233+msgid "Cancel"

234+msgstr ""

235+

236+#: qml/Shell.qml:496

217#, qt-format

237#, qt-format

218msgid "Please enter %1"

238msgid "Please enter %1"

219msgstr ""

239msgstr ""

qml/Components/FilterGrid.qml → qml/Components/FilterGrid.qml.THISrenamed

The content is the same.

qml/Components/ListItems/Header.qml+17−26

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

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

@@ -15,54 +15,45 @@

15 */

16

17import QtQuick 2.0

18+import QtQuick.Layouts 1.1

18import Ubuntu.Components 0.1

19import Ubuntu.Components 0.1

19

20

20Item {

21Item {

21− /*!

22− \preliminary

23− The text that is shown as the header text.

24− \qmlproperty string text

25− */

26 property alias text: label.text

22 property alias text: label.text

27− property alias textColor: label.color

23+ property alias color: label.color

28− property alias image: image.source

24+ property alias iconName: icon.name

29

25

30 signal clicked(variant mouse)

26 signal clicked(variant mouse)

31

27

32 height: units.gu(5)

28 height: units.gu(5)

33

29

34− Item {

30+ RowLayout {

31+ spacing: units.gu(.5)

35 anchors {

32 anchors {

36 left: parent.left

33 left: parent.left

37 right: parent.right

34 right: parent.right

35+ verticalCenter: parent.verticalCenter

38− rightMargin: units.gu(0.5)

36+ margins: units.gu(1)

39− top: parent.top

40− bottom: parent.bottom

41 }

37 }

42

38

43 Label {

39 Label {

44 id: label

40 id: label

45− anchors {

41+ Layout.fillWidth: true

46− left: parent.left

47− leftMargin: units.gu(2)

48− verticalCenter: parent.verticalCenter

49− }

50

42

51− color: "grey" // TODO karni: Update Ubuntu.Compoonents.Themes.Palette.

52 font.family: "Ubuntu"

43 font.family: "Ubuntu"

53 fontSize: "medium"

44 fontSize: "medium"

54 elide: Text.ElideRight

45 elide: Text.ElideRight

46+ maximumLineCount: 1

55 textFormat: Text.PlainText

47 textFormat: Text.PlainText

56− width: parent.width - image.width - image.leftMargin - anchors.leftMargin

48+ width: Math.min(parent.width - units.gu(4), implicitWidth)

57 }

49 }

58

50

59− Image {

51+ Icon {

60− id: image

52+ id: icon

61− readonly property double leftMargin: units.gu(1)

53+ visible: name != ""

62− x: label.x + label.contentWidth + leftMargin

54+ height: units.gu(2)

63− anchors {

55+ width: height

64− verticalCenter: parent.verticalCenter

56+ color: label.color

65− }

66 }

57 }

67 }

58 }

68

59

qml/Components/ResponsiveGridView.qml+4−3

@@ -34,7 +34,7 @@ Item {

34 readonly property int cellWidth: gridView.cellWidth

35 readonly property int cellHeight: gridView.cellHeight

36 readonly property int totalContentHeight: {

37− return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight, verticalSpacing)

37+ return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)

38 }

39 property alias interactive: gridView.interactive

40 readonly property alias flicking: gridView.flicking

@@ -44,10 +44,11 @@ Item {

44 property alias displayMarginBeginning: gridView.displayMarginBeginning

45 property alias displayMarginEnd: gridView.displayMarginEnd

46 property alias highlightIndex: gridView.highlightIndex

47+ property alias cacheBuffer: gridView.cacheBuffer

47 readonly property alias currentItem: gridView.currentItem

48 readonly property alias currentItem: gridView.currentItem

48

49

49− function contentHeightForRows(rows, height, vSpacing) {

50+ function contentHeightForRows(rows, height) {

50− return rows * height + vSpacing

51+ return rows * height

51 }

52 }

52

53

53 GridView {

54 GridView {

qml/Dash/CardCarousel.qml+2−7

@@ -21,13 +21,8 @@ import "../Components"

21DashRenderer {

22 id: cardCarousel

23

24− property alias cacheBuffer: carousel.cacheBuffer

25− property alias itemComponent: carousel.itemComponent

26− property alias minimumTileWidth: carousel.minimumTileWidth

27− property alias selectedItemScaleFactor: carousel.selectedItemScaleFactor

28− property alias tileAspectRatio: carousel.tileAspectRatio

29−

30− height: carousel.implicitHeight + units.gu(6)

24+ expandedHeight: carousel.implicitHeight + units.gu(6)

25+ collapsedHeight: expandedHeight

31

26

32 Carousel {

27 Carousel {

33 id: carousel

28 id: carousel

qml/Dash/CardFilterGrid.qml → qml/Dash/CardGrid.qmlrenamed+26−26

@@ -18,43 +18,43 @@ import QtQuick 2.0

18import "../Components"

19

20DashRenderer {

21− id: genericFilterGrid

21+ id: root

22

23− expandable: filterGrid.expandable

23+ readonly property int collapsedRows: {

24− collapsedHeight: filterGrid.collapsedHeight

24+ if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;

25− uncollapsedHeight: filterGrid.uncollapsedHeight

25+ return cardTool.template["collapsed-rows"];

26− originY: filterGrid.originY

27− height: filterGrid.height

28− filtered: filterGrid.filtered

29−

30− function setFilter(filter, animate) {

31− filterGrid.setFilter(filter, animate)

32 }

26 }

33

27

28+ expandedHeight: grid.totalContentHeight

29+ collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

30+ collapsedItemCount: collapsedRows * grid.columns

31+ originY: grid.originY

32+

34 function cardPosition(index) {

33 function cardPosition(index) {

35 var pos = {};

34 var pos = {};

36− var row = Math.floor(index / filterGrid.columns);

35+ var row = Math.floor(index / grid.columns);

37− var column = index % filterGrid.columns;

36+ var column = index % grid.columns;

38 // Bit sad this is not symmetrical

37 // Bit sad this is not symmetrical

39− pos.x = column * filterGrid.cellWidth + filterGrid.margins;

38+ pos.x = column * grid.cellWidth + grid.margins;

40− pos.y = row * filterGrid.cellHeight;

39+ pos.y = row * grid.cellHeight;

41 return pos;

40 return pos;

42 }

41 }

43

42

44− FilterGrid {

43+ ResponsiveGridView {

45− id: filterGrid

44+ id: grid

46− width: genericFilterGrid.width

45+ anchors.fill: parent

47 minimumHorizontalSpacing: units.gu(1)

46 minimumHorizontalSpacing: units.gu(1)

48 delegateWidth: cardTool.cardWidth

47 delegateWidth: cardTool.cardWidth

49 delegateHeight: cardTool.cardHeight

48 delegateHeight: cardTool.cardHeight

50 verticalSpacing: units.gu(1)

49 verticalSpacing: units.gu(1)

51− model: genericFilterGrid.model

50+ model: root.model

52− collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)

51+ displayMarginBeginning: root.displayMarginBeginning

53− displayMarginBeginning: genericFilterGrid.displayMarginBeginning

52+ displayMarginEnd: root.displayMarginEnd

54− displayMarginEnd: genericFilterGrid.displayMarginEnd

53+ cacheBuffer: 0

54+ interactive: false

55 delegate: Item {

56− width: filterGrid.cellWidth

56+ width: grid.cellWidth

57− height: filterGrid.cellHeight

57+ height: grid.cellHeight

58 Loader {

59 id: loader

60 sourceComponent: cardTool.cardComponent

@@ -69,12 +69,12 @@ DashRenderer {

69 item.template = Qt.binding(function() { return cardTool.template; });

70 item.components = Qt.binding(function() { return cardTool.components; });

71 item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });

72− item.scopeStyle = genericFilterGrid.scopeStyle;

72+ item.scopeStyle = root.scopeStyle;

73 }

74 Connections {

75 target: loader.item

76− onClicked: genericFilterGrid.clicked(index, result, loader.item, model)

76+ onClicked: root.clicked(index, result, loader.item, model)

77− onPressAndHold: genericFilterGrid.pressAndHold(index)

77+ onPressAndHold: root.pressAndHold(index)

78 }

79 }

80 }

qml/Dash/CardVerticalJournal.qml+2−21

@@ -23,33 +23,14 @@ DashRenderer {

23

24 readonly property double collapseLimit: units.gu(35)

25

26− uncollapsedHeight: cardVerticalJournal.implicitHeight

26+ expandedHeight: Math.max(cardVerticalJournal.implicitHeight, minHeight)

27− collapsedHeight: Math.min(collapseLimit, cardVerticalJournal.implicitHeight)

27+ collapsedHeight: Math.max(Math.min(collapseLimit, cardVerticalJournal.implicitHeight), minHeight)

28− expandable: uncollapsedHeight > collapseLimit

29

28

30 // This minHeight is used as bootstrapper for the height. Vertical Journal

29 // This minHeight is used as bootstrapper for the height. Vertical Journal

31 // is special by the fact that it doesn't know how to calculate its implicit height unless we give it

30 // is special by the fact that it doesn't know how to calculate its implicit height unless we give it

32 // enough height that it can start creating its children so we make sure it has enough height for that

31 // enough height that it can start creating its children so we make sure it has enough height for that

33 // in case the model is non empty

32 // in case the model is non empty

34 readonly property double minHeight: root.model.count >= 1 ? cardVerticalJournal.rowSpacing + 1 : 0

33 readonly property double minHeight: root.model.count >= 1 ? cardVerticalJournal.rowSpacing + 1 : 0

35− height: filtered ? Math.max(collapsedHeight, minHeight) : uncollapsedHeight

36−

37− Behavior on height {

38− id: heightBehaviour

39− enabled: false

40− animation: UbuntuNumberAnimation {

41− onRunningChanged: {

42− if (!running) {

43− heightBehaviour.enabled = false

44− }

45− }

46− }

47− }

48−

49− function setFilter(filter, animate) {

50− heightBehaviour.enabled = animate;

51− filtered = filter;

52− }

53

34

54 ResponsiveVerticalJournal {

35 ResponsiveVerticalJournal {

55 id: cardVerticalJournal

36 id: cardVerticalJournal

qml/Dash/DashRenderer.qml+3−10

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

17import QtQuick 2.0

18

19Item {

20− // Can the item be expanded?

20+ property int collapsedHeight

21− property bool expandable: false

22

21

23− // In case it can be expanded, is it filtered

22+ property int expandedHeight

24− property bool filtered: true

25

23

26− property int collapsedHeight: height

24+ property int collapsedItemCount: 0

27−

28− property int uncollapsedHeight: height

29

25

30 property int displayMarginBeginning: 0

26 property int displayMarginBeginning: 0

31

27

@@ -52,7 +48,4 @@ Item {

52 /// Emitted when the user pressed and held on an item

48 /// Emitted when the user pressed and held on an item

53 /// @param index is the index of the held item

49 /// @param index is the index of the held item

54 signal pressAndHold(int index)

50 signal pressAndHold(int index)

55−

56− function setFilter(filter, animate) {

57− }

58}

51}

qml/Dash/GenericScopeView.qml+109−46

@@ -134,11 +134,22 @@ FocusScope {

134 highlightWhenPressed: false

135 showDivider: false

136

137− readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false

137+ readonly property bool expandable: {

138− readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filtered : true

138+ if (categoryView.model.count === 1) return false;

139+ if (cardTool.template && cardTool.template["collapsed-rows"] === 0) return false;

140+ if (item && item.expandedHeight > item.collapsedHeight) return true;

141+ return false;

142+ }

143+ property bool expanded: false

139 readonly property string category: categoryId

144 readonly property string category: categoryId

145+ readonly property string headerLink: model.headerLink

140 readonly property var item: rendererLoader.item

146 readonly property var item: rendererLoader.item

141

147

148+ function expand(expand, animate) {

149+ heightBehaviour.enabled = animate;

150+ expanded = expand;

151+ }

152+

142 CardTool {

153 CardTool {

143 id: cardTool

154 id: cardTool

144 objectName: "cardTool"

155 objectName: "cardTool"

@@ -148,6 +159,18 @@ FocusScope {

148 viewWidth: parent.width

159 viewWidth: parent.width

149 }

160 }

150

161

162+ onExpandableChanged: {

163+ // This can happen with the VJ that doesn't know how height it will be on creation

164+ // so doesn't set expandable until a bit too late for onLoaded

165+ if (expandable) {

166+ var shouldExpand = baseItem.category === categoryView.expandedCategoryId;

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

168+ }

169+ }

170+

171+ onHeightChanged: rendererLoader.updateDelegateCreationRange();

172+ onYChanged: rendererLoader.updateDelegateCreationRange();

173+

151 Loader {

174 Loader {

152 id: rendererLoader

175 id: rendererLoader

153 anchors {

176 anchors {

@@ -157,13 +180,28 @@ FocusScope {

157 topMargin: hasSectionHeader ? 0 : units.gu(2)

180 topMargin: hasSectionHeader ? 0 : units.gu(2)

158 }

181 }

159

182

183+ Behavior on height {

184+ id: heightBehaviour

185+ enabled: false

186+ animation: UbuntuNumberAnimation {

187+ onRunningChanged: {

188+ if (!running) {

189+ heightBehaviour.enabled = false

190+ }

191+ }

192+ }

193+ }

194+

195+ readonly property bool expanded: baseItem.expanded || !baseItem.expandable

196+ height: expanded ? item.expandedHeight : item.collapsedHeight

197+

160 source: {

198 source: {

161 switch (cardTool.categoryLayout) {

199 switch (cardTool.categoryLayout) {

162 case "carousel": return "CardCarousel.qml";

200 case "carousel": return "CardCarousel.qml";

163 case "vertical-journal": return "CardVerticalJournal.qml";

201 case "vertical-journal": return "CardVerticalJournal.qml";

164 case "running-apps": return "Apps/RunningApplicationsGrid.qml";

202 case "running-apps": return "Apps/RunningApplicationsGrid.qml";

165 case "grid":

203 case "grid":

166− default: return "CardFilterGrid.qml";

204+ default: return "CardGrid.qml";

167 }

205 }

168 }

206 }

169

207

@@ -182,9 +220,9 @@ FocusScope {

182 }

220 }

183 item.objectName = Qt.binding(function() { return categoryId })

221 item.objectName = Qt.binding(function() { return categoryId })

184 item.scopeStyle = scopeView.scopeStyle;

222 item.scopeStyle = scopeView.scopeStyle;

185− if (item.expandable) {

223+ if (baseItem.expandable) {

186− var shouldFilter = categoryId != categoryView.expandedCategoryId;

224+ var shouldExpand = categoryId === categoryView.expandedCategoryId;

187− item.setFilter(shouldFilter, false /*animate*/);

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

188 }

226 }

189 updateDelegateCreationRange();

227 updateDelegateCreationRange();

190 item.cardTool = cardTool;

228 item.cardTool = cardTool;

@@ -210,30 +248,28 @@ FocusScope {

210 // so it's not implemented

248 // so it's not implemented

211 scopeView.scope.activate(result)

249 scopeView.scope.activate(result)

212 } else {

250 } else {

213− previewListView.model = target.model;

251+ openPreview(index);

214− previewListView.currentIndex = -1

215− previewListView.currentIndex = index;

216− previewListView.open = true

217 }

252 }

218 }

253 }

219 onPressAndHold: {

254 onPressAndHold: {

220 if (scopeView.pressAndHoldOverride) {

255 if (scopeView.pressAndHoldOverride) {

221 scopeView.pressAndHoldOverride(index);

256 scopeView.pressAndHoldOverride(index);

222− return;

257+ } else {

258+ openPreview(index)

223 }

259 }

224−

225− previewListView.model = target.model;

226− previewListView.currentIndex = -1

227− previewListView.currentIndex = index;

228− previewListView.open = true

229 }

260 }

230− onExpandableChanged: {

261+

231− // This can happen with the VJ that doesn't know how height it will be on creation

262+ function openPreview(index) {

232− // so doesn't set expandable until a bit too late for onLoaded

263+ if (!rendererLoader.expanded && !seeAllLabel.visible && target.collapsedItemCount > 0) {

233− if (rendererLoader.item.expandable) {

264+ previewLimitModel.model = target.model;

234− var shouldFilter = baseItem.category != categoryView.expandedCategoryId;

265+ previewLimitModel.limit = target.collapsedItemCount;

235− rendererLoader.item.setFilter(shouldFilter, false /*animate*/);

266+ previewListView.model = previewLimitModel;

267+ } else {

268+ previewListView.model = target.model;

236 }

269 }

270+ previewListView.currentIndex = -1;

271+ previewListView.currentIndex = index;

272+ previewListView.open = true;

237 }

273 }

238 }

274 }

239 Connections {

275 Connections {

@@ -243,17 +279,17 @@ FocusScope {

243 }

279 }

244 function collapseAllButExpandedCategory() {

280 function collapseAllButExpandedCategory() {

245 var item = rendererLoader.item;

281 var item = rendererLoader.item;

246− if (item.expandable) {

282+ if (baseItem.expandable) {

247− var shouldFilter = categoryId != categoryView.expandedCategoryId;

283+ var shouldExpand = categoryId === categoryView.expandedCategoryId;

248− if (shouldFilter != item.filter) {

284+ if (shouldExpand != baseItem.expanded) {

249 // If the filter animation will be seen start it, otherwise, just flip the switch

285 // If the filter animation will be seen start it, otherwise, just flip the switch

250− var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;

286+ var shrinkingVisible = !shouldExpand && y + item.collapsedHeight + seeAll.height < categoryView.height;

251− var growingVisible = !shouldFilter && y + height < categoryView.height;

287+ var growingVisible = shouldExpand && y + height < categoryView.height;

252− if (!previewListView.open || !shouldFilter) {

288+ if (!previewListView.open || shouldExpand) {

253 var animate = shrinkingVisible || growingVisible;

289 var animate = shrinkingVisible || growingVisible;

254− item.setFilter(shouldFilter, animate)

290+ baseItem.expand(shouldExpand, animate)

255− if (!shouldFilter && !previewListView.open) {

291+ if (shouldExpand && !previewListView.open) {

256− categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);

292+ categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);

257 }

293 }

258 }

294 }

259 }

295 }

@@ -290,10 +326,43 @@ FocusScope {

290 item.displayMarginEnd = -baseItem.height;

326 item.displayMarginEnd = -baseItem.height;

291 } else {

327 } else {

292 item.displayMarginBeginning = -Math.max(-baseItem.y, 0);

328 item.displayMarginBeginning = -Math.max(-baseItem.y, 0);

293− item.displayMarginEnd = -Math.max(baseItem.height - categoryView.height + baseItem.y, 0)

329+ item.displayMarginEnd = -Math.max(baseItem.height - seeAll.height

330+ - categoryView.height + baseItem.y, 0)

294 }

331 }

295 }

332 }

296 }

333 }

334+ }

335+

336+ AbstractButton {

337+ id: seeAll

338+ objectName: "seeAll"

339+ anchors {

340+ top: rendererLoader.bottom

341+ left: parent.left

342+ right: parent.right

343+ }

344+ height: seeAllLabel.visible ? seeAllLabel.font.pixelSize + units.gu(6) : 0

345+

346+ onClicked: {

347+ if (categoryView.expandedCategoryId != baseItem.category) {

348+ categoryView.expandedCategoryId = baseItem.category;

349+ } else {

350+ categoryView.expandedCategoryId = "";

351+ }

352+ }

353+

354+ Label {

355+ id: seeAllLabel

356+ text: baseItem.expanded ? i18n.tr("See less") : i18n.tr("See all")

357+ anchors {

358+ centerIn: parent

359+ verticalCenterOffset: units.gu(-0.5)

360+ }

361+ fontSize: "small"

362+ font.weight: Font.Bold

363+ color: scopeStyle ? scopeStyle.foreground : "grey"

364+ visible: baseItem.expandable && !baseItem.headerLink

365+ }

297

366

298 Image {

367 Image {

299 visible: index != 0

368 visible: index != 0

@@ -320,28 +389,18 @@ FocusScope {

320 z: -1

389 z: -1

321 }

390 }

322 }

391 }

323−

324− onHeightChanged: rendererLoader.updateDelegateCreationRange();

325− onYChanged: rendererLoader.updateDelegateCreationRange();

326 }

392 }

327

393

328 sectionProperty: "name"

394 sectionProperty: "name"

329 sectionDelegate: ListItems.Header {

395 sectionDelegate: ListItems.Header {

330 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")

396 objectName: "dashSectionHeader" + (delegate ? delegate.category : "")

331− property var delegate: categoryView.item(delegateIndex)

397+ readonly property var delegate: categoryView.item(delegateIndex)

332 width: categoryView.width

398 width: categoryView.width

333 text: section

399 text: section

334− textColor: scopeStyle ? scopeStyle.foreground : "grey"

400+ color: scopeStyle ? scopeStyle.foreground : "grey"

335− image: {

336− if (delegate && delegate.expandable)

401+ iconName: delegate && delegate.headerLink ? "go-next" : ""

337− return delegate.filtered ? "graphics/header_handlearrow.png" : "graphics/header_handlearrow2.png"

338− return "";

339− }

340 onClicked: {

402 onClicked: {

341− if (categoryView.expandedCategoryId != delegate.category)

403+ if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);

342− categoryView.expandedCategoryId = delegate.category;

343− else

344− categoryView.expandedCategoryId = "";

345 }

404 }

346 }

405 }

347

406

@@ -376,6 +435,10 @@ FocusScope {

376 }

435 }

377 }

436 }

378

437

438+ LimitProxyModel {

439+ id: previewLimitModel

440+ }

441+

379 PreviewListView {

442 PreviewListView {

380 id: previewListView

443 id: previewListView

381 objectName: "previewListView"

444 objectName: "previewListView"

qml/Dash/ScopesOverviewAll.qml+8−11

@@ -20,31 +20,28 @@ import Ubuntu.Components 0.1

20Flickable {

21 id: root

22

23− property alias model: cardFilterGrid.model

23+ property alias model: cardGrid.model

24− property alias cardTool: cardFilterGrid.cardTool

24+ property alias cardTool: cardGrid.cardTool

25

26 property real extraHeight: 0

27

28 signal clicked(int index, var result, var item, var itemModel)

29 signal pressAndHold(int index)

30

31− contentHeight: cardFilterGrid.height + extraHeight

31+ contentHeight: cardGrid.expandedHeight + extraHeight

32− contentWidth: cardFilterGrid.width

32+ contentWidth: cardGrid.width

33

34 function scopeCardPosition(scopeId) {

35 var index = model.scopeIndex(scopeId);

36− var pos = cardFilterGrid.cardPosition(index);

36+ var pos = cardGrid.cardPosition(index);

37 pos.y = pos.y - root.contentY;

38 return pos;

39 }

40

41− CardFilterGrid {

41+ CardGrid {

42− id: cardFilterGrid

42+ id: cardGrid

43 width: parent.width

44−

44+ height: parent.height

45− Component.onCompleted: {

46− setFilter(false, false);

47− }

48

45

49 onClicked: {

46 onClicked: {

50 root.clicked(index, result, item, itemModel);

47 root.clicked(index, result, item, itemModel);

tests/autopilot/unity8/shell/emulators/dash.py+6−3

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

41

42 def get_applications_grid(self):

43 get_grid = self.get_scope('clickscope').wait_select_single(

44− 'CardFilterGrid', objectName='local')

44+ 'CardGrid', objectName='local')

45 return get_grid

46

47 def get_application_icon(self, text):

@@ -205,9 +205,12 @@ class DashApps(GenericScopeView):

205 category_element = self._get_category_element(category)

206 application_cards = category_element.select_many('AbstractButton')

207

208− # sort by y, x

208+ # sort by y, x, filter those out of view

209+ categoryBottom = category_element.globalRect.y \

210+ + category_element.height

209 application_cards = sorted(

211 application_cards = sorted(

210− application_cards,

212+ (card for card in application_cards

213+ if card.globalRect.y < categoryBottom),

211 key=lambda card: (card.globalRect.y, card.globalRect.x))

214 key=lambda card: (card.globalRect.y, card.globalRect.x))

212

215

213 result = []

216 result = []

tests/autopilot/unity8/shell/tests/test_emulators.py+5−5

@@ -191,9 +191,9 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):

191 def _get_number_of_application_slots(self, category):

192 category_element = self.applications_scope._get_category_element(

193 category)

194− grid = category_element.select_single('CardFilterGrid')

194+ cardgrid = category_element.select_single('CardGrid')

195− filtergrid = grid.select_single('FilterGrid')

195+ if (category_element.expanded):

196− if (grid.filtered):

196+ return cardgrid.select_single('QQuickGridView').count

197− return filtergrid.collapsedRowCount * filtergrid.columns

198 else:

197 else:

199− return filtergrid.uncollapsedRowCount * filtergrid.columns

198+ return cardgrid.collapsedRows \

199+ * cardgrid.select_single('ResponsiveGridView').columns

tests/mocks/Ubuntu/Telephony/CMakeLists.txt+1−9

@@ -11,12 +11,4 @@ add_library(FakeUbuntuTelephonyQml MODULE ${FakeUbuntuTelephonyQml_SOURCES})

11

12qt5_use_modules(FakeUbuntuTelephonyQml Core Quick)

13

14−# copy files into build directory for shadow builds

15−add_custom_target(UbuntuTelephonyQmlDirFile ALL

16− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}

17− DEPENDS qmldir

18−)

19−

20−install(TARGETS FakeUbuntuTelephonyQml

14+add_unity8_mock(Ubuntu.Telephony 0.1 Ubuntu/Telephony TARGETS FakeUbuntuTelephonyQml)

21− DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/Telephony

22− )

tests/mocks/Unity/fake_categories.cpp+13−1

@@ -145,9 +145,12 @@ Categories::data(const QModelIndex& index, int role) const

145 } else {

146 map["category-layout"] = "carousel";

147 map["card-size"] = "medium";

148− map["collapsed-rows"] = 2;

149 map["overlay"] = true;

148 map["overlay"] = true;

150 }

149 }

150+ if (index.row() == 19) {

151+ map["category-layout"] = "grid";

152+ map["collapsed-rows"] = 0;

153+ }

151 map["card-size"] = "small";

154 map["card-size"] = "small";

152 return map;

155 return map;

153 }

156 }

@@ -166,6 +169,9 @@ Categories::data(const QModelIndex& index, int role) const

166 return map;

169 return map;

167 }

170 }

168 case RoleHeaderLink:

171 case RoleHeaderLink:

172+ if (index.row() == 1 || index.row() == 4) {

173+ return QString("scope://query/1");

174+ }

169 return QString();

175 return QString();

170 case RoleResults:

176 case RoleResults:

171 return QVariant::fromValue(resultsModel);

177 return QVariant::fromValue(resultsModel);

@@ -177,3 +183,9 @@ Categories::data(const QModelIndex& index, int role) const

177 }

183 }

178 }

184 }

179}

185}

186+

187+QVariant

188+Categories::data(int row, int role) const

189+{

190+ return data(index(row, 0), role);

191+}

tests/mocks/Unity/fake_categories.h+2

@@ -37,6 +37,8 @@ public:

37 Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;

38 Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;

39

40+ Q_INVOKABLE QVariant data(int row, int role) const;

41+

40private Q_SLOTS:

42private Q_SLOTS:

41 void countChanged();

43 void countChanged();

42

44

tests/mocks/Unity/fake_scope.cpp+2−7

@@ -27,7 +27,7 @@ Scope::Scope(Scopes* parent) : Scope(QString(), QString(), false, parent)

27{

28}

29

30−Scope::Scope(QString const& id, QString const& name, bool visible, Scopes* parent)

30+Scope::Scope(QString const& id, QString const& name, bool visible, Scopes* parent, int categories)

31 : unity::shell::scopes::ScopeInterface(parent)

32 , m_id(id)

33 , m_name(name)

@@ -36,7 +36,7 @@ Scope::Scope(QString const& id, QString const& name, bool visible, Scopes* paren

36 , m_isActive(false)

37 , m_currentDeparment("root")

38 , m_previewRendererName("preview-generic")

39− , m_categories(new Categories(20, this))

39+ , m_categories(new Categories(categories, this))

40 , m_openScope(nullptr)

41{

42}

@@ -229,8 +229,3 @@ void Scope::loadDepartment(const QString& id)

229 m_currentDeparment = id;

230 Q_EMIT currentDepartmentIdChanged();

231}

232−

233−void Scope::performQuery(const QString& query)

234−{

235− Q_UNUSED(query);

236−}

tests/mocks/Unity/fake_scope.h+2−2

@@ -32,7 +32,7 @@ class Scope : public unity::shell::scopes::ScopeInterface

32

33public:

34 Scope(Scopes* parent = 0);

35− Scope(QString const& id, QString const& name, bool visible, Scopes* parent = 0);

35+ Scope(QString const& id, QString const& name, bool visible, Scopes* parent = 0, int categories = 20);

36

37 /* getters */

38 QString id() const override;

@@ -66,7 +66,7 @@ public:

66 bool hasDepartments() const override;

67 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;

68 Q_INVOKABLE void loadDepartment(const QString& id) override;

69− Q_INVOKABLE void performQuery(const QString& query) override;

69+ Q_SIGNAL void performQuery(const QString& query) override;

70

71 QVariantMap customizations() const override;

72

tests/mocks/Unity/fake_scopes.cpp+1−1

@@ -48,7 +48,7 @@ void Scopes::updateScopes()

48 addScope(new Scope("MockScope2", "Music", false, this));

49 addScope(new Scope("clickscope", "Apps", true, this));

50 addScope(new Scope("MockScope5", "Videos", true, this));

51− addScope(new Scope("MockScope3", "MS3", true, this));

51+ addScope(new Scope("SingleCategoryScope", "Single", true, this, 1));

52 addScope(new Scope("MockScope4", "MS4", true, this));

53 addScope(new Scope("MockScope6", "MS6", true, this));

54 addScope(new Scope("MockScope7", "MS7", false, this));

tests/mocks/Unity/fake_scopesoverview.cpp+4

@@ -115,6 +115,8 @@ ScopesOverviewCategories::data(const QModelIndex& index, int role) const

115 return QVariant::fromValue(resultsModel);

116 case RoleCount:

117 return resultsModel->rowCount();

118+ case RoleHeaderLink:

119+ return QString();

118 default:

120 default:

119 qFatal("Using un-implemented Categories role");

121 qFatal("Using un-implemented Categories role");

120 return QVariant();

122 return QVariant();

@@ -196,6 +198,8 @@ ScopesOverviewSearchCategories::data(const QModelIndex& index, int role) const

196 return QVariant::fromValue(resultsModel);

198 return QVariant::fromValue(resultsModel);

197 case RoleCount:

199 case RoleCount:

198 return resultsModel->rowCount();

200 return resultsModel->rowCount();

201+ case RoleHeaderLink:

202+ return QString();

199 default:

203 default:

200 qFatal("Using un-implemented Categories role");

204 qFatal("Using un-implemented Categories role");

201 return QVariant();

205 return QVariant();

tests/qmltests/CMakeLists.txt−1

@@ -24,7 +24,6 @@ add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_

24add_qml_test(Components Carousel)

25add_qml_test(Components DraggingArea)

26add_qml_test(Components EdgeDemoOverlay)

27−add_qml_test(Components FilterGrid)

28add_qml_test(Components LazyImage)

27add_qml_test(Components LazyImage)

29add_qml_test(Components Rating)

28add_qml_test(Components Rating)

30add_qml_test(Components ResponsiveFlowView)

29add_qml_test(Components ResponsiveFlowView)

tests/qmltests/Components/tst_FilterGrid.qmldeleted−190

@@ -1,190 +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 QtTest 1.0

19−import "../../../qml/Components"

20−import Ubuntu.Components.ListItems 0.1 as ListItem

21−import Ubuntu.Components 0.1

22−import Unity.Test 0.1 as UT

23−import Utils 0.1

24−

25−/*

26− You should see 6 green squares (from "A" to "F") and a button "View all (12)".

27− Once you press that button other 6 green squares (from "G" to "L") should show up.

28−*/

29−Rectangle {

30− width: gridRect.width + controls.width

31− height: units.gu(50)

32− color: "white"

33−

34− Column {

35− id: controls

36− width: units.gu(30)

37− height: parent.height

38− anchors.top: parent.top

39− anchors.right: parent.right

40− ListItem.ValueSelector {

41− id: collapsedRowCountSelector

42− text: "collapsedRowCount"

43− values: [1,2,3,4]

44− selectedIndex: 1

45− }

46− Row {

47− spacing: units.gu(1)

48− Label { anchors.verticalCenter: parent.verticalCenter

49− text: "Filter" }

50− CheckBox {

51− id: filterCheckBox

52− checked: true

53− onCheckedChanged: filterGrid.setFilter(checked, false /*animate*/)

54− }

55− }

56− }

57−

58− ListModel {

59− id: fakeModel

60− ListElement { name: "A" }

61− ListElement { name: "B" }

62− ListElement { name: "C" }

63− ListElement { name: "D" }

64− ListElement { name: "E" }

65− ListElement { name: "F" }

66− ListElement { name: "G" }

67− ListElement { name: "H" }

68− ListElement { name: "I" }

69− ListElement { name: "J" }

70− ListElement { name: "K" }

71− ListElement { name: "L" }

72− }

73−

74− ListModel {

75− id: fakeModelTwoItems

76− ListElement { name: "A" }

77− ListElement { name: "B" }

78− }

79−

80− ListModel {

81− id: fakeModelFourItems

82− ListElement { name: "A" }

83− ListElement { name: "B" }

84− ListElement { name: "C" }

85− ListElement { name: "D" }

86− }

87−

88− Rectangle {

89− id: gridRect

90− width: units.gu(30)

91− height: parent.height

92− color: "grey"

93− anchors.top: parent.top

94− anchors.left: parent.left

95−

96− FilterGrid {

97− id: filterGrid

98− anchors.fill: parent

99− model: fakeModel

100− maximumNumberOfColumns: 3

101− collapsedRowCount:

102− collapsedRowCountSelector.values[collapsedRowCountSelector.selectedIndex]

103− minimumHorizontalSpacing: units.gu(1)

104− delegateWidth: units.gu(6)

105− delegateHeight: units.gu(6)

106− verticalSpacing: units.gu(1)

107−

108− delegate: Rectangle {

109− // So that it can be identified by countVisibleDelegates()

110− property bool isGridDelegate: true

111−

112− color: "green"

113− width: units.gu(6)

114− height: units.gu(6)

115− Text {

116− anchors.centerIn: parent

117− text: name

118− }

119− }

120− }

121− }

122−

123− UT.UnityTestCase {

124− name: "FilterGrid"

125− when: windowShown

126−

127− function init() {

128− filterGrid.model = fakeModel

129− }

130−

131− function cleanup() {

132− filterCheckBox.checked = true

133− collapsedRowCountSelector.selectedIndex = 1

134− }

135−

136− function test_turningFilterOffShowsAllElements() {

137− tryCompareFunction(countVisibleDelegates, 6)

138−

139− filterCheckBox.checked = false

140−

141− tryCompareFunction(countVisibleDelegates, 12)

142− }

143−

144− function test_collapsedRowCount() {

145− for (var i = 0; i < 4; ++i) {

146− collapsedRowCountSelector.selectedIndex = i

147− // We have 3 elements per row.

148− // row count == index + 1

149− tryCompareFunction(countVisibleDelegates, 3*(i+1))

150− }

151− }

152−

153− function test_modelSizeAffectsCollapsedRowCount_data() {

154− return [

155− { tag: "2 items, collapsedRows 1", model: fakeModelTwoItems, collapsedRowCountIndex: 0,

156− rowsWhenCollapsed: 1, visibleDelegates: 2 },

157− { tag: "2 items, collapsedRows 2", model: fakeModelTwoItems, collapsedRowCountIndex: 1,

158− rowsWhenCollapsed: 1, visibleDelegates: 2 },

159− { tag: "4 items, collapsedRows 1", model: fakeModelFourItems, collapsedRowCountIndex: 0,

160− rowsWhenCollapsed: 1, visibleDelegates: 3 },

161− { tag: "4 items, collapsedRows 2", model: fakeModelFourItems, collapsedRowCountIndex: 1,

162− rowsWhenCollapsed: 2, visibleDelegates: 4 },

163− ]

164− }

165−

166− function test_modelSizeAffectsCollapsedRowCount(data) {

167− filterGrid.model = data.model

168− collapsedRowCountSelector.selectedIndex = data.collapsedRowCountIndex

169−

170− tryCompare(filterGrid, "rowsWhenCollapsed", data.rowsWhenCollapsed)

171− tryCompareFunction(countVisibleDelegates, data.visibleDelegates)

172− }

173−

174− function countVisibleDelegates() {

175− return __countVisibleDelegates(filterGrid.visibleChildren, 0)

176− }

177−

178− function __countVisibleDelegates(objList, total) {

179− for (var i = 0; i < objList.length; ++i) {

180− var child = objList[i];

181− if (child.isGridDelegate !== undefined) {

182− ++total;

183− } else {

184− total = __countVisibleDelegates(child.visibleChildren, total)

185− }

186− }

187− return total

188− }

189− }

190−}

tests/qmltests/Dash/tst_Dash.qml+1−1

@@ -234,7 +234,7 @@ Item {

234 var dashCategory2 = findChild(dashContentList.currentItem, "dashCategory2");

235 var card2 = findChild(dashCategory2, "delegate2");

236 waitForRendering(card2);

237− mouseClick(card2, 0, 0);

237+ mouseClick(card2, card2.width / 2, card2.height / 2);

238

239 // Wait for temp scope to be there

240 var dashTempScopeItem = findChild(dash, "dashTempScopeItem");

tests/qmltests/Dash/tst_DashContent.qml+8−4

@@ -117,10 +117,11 @@ Item {

117

118 function test_show_header_on_list_movement() {

119 var dashContentList = findChild(dashContent, "dashContentList");

120− verify(dashContentList != undefined);

120+ verify(dashContentList !== null);

121− var categoryListView = findChild(dashContentList, "categoryListView");

121+ var scope = findChild(dashContent, "MockScope1 loader");

122− verify(categoryListView != undefined);

122+ waitForRendering(scope);

123

124+ var categoryListView = findChild(scope, "categoryListView");

124 waitForRendering(categoryListView);

125 waitForRendering(categoryListView);

125

126

126 categoryListView.contentY = units.gu(15);

127 categoryListView.contentY = units.gu(15);

@@ -135,8 +136,11 @@ Item {

135 function test_set_current_scope_reset() {

136 function test_set_current_scope_reset() {

136 var dashContentList = findChild(dashContent, "dashContentList");

137 var dashContentList = findChild(dashContent, "dashContentList");

137 verify(dashContentList != undefined);

138 verify(dashContentList != undefined);

139+ var scope = findChild(dashContent, "MockScope1 loader");

140+ waitForRendering(scope);

141+

138 var categoryListView = findChild(dashContentList, "categoryListView");

142 var categoryListView = findChild(dashContentList, "categoryListView");

139− verify(categoryListView != undefined);

143+ waitForRendering(categoryListView);

140

144

141 categoryListView.contentY = units.gu(10);

145 categoryListView.contentY = units.gu(10);

142

146

tests/qmltests/Dash/tst_GenericScopeView.qml+112−45

@@ -39,6 +39,10 @@ Item {

39 id: scopes

40 }

41

42+ SignalSpy {

43+ id: spy

44+ }

45+

42 property Item applicationManager: Item {

46 property Item applicationManager: Item {

43 signal sideStageFocusedApplicationChanged()

47 signal sideStageFocusedApplicationChanged()

44 signal mainStageFocusedApplicationChanged()

48 signal mainStageFocusedApplicationChanged()

@@ -59,7 +63,14 @@ Item {

59 genericScopeView.scope = scopes.getScope(1)

63 genericScopeView.scope = scopes.getScope(1)

60 shell.width = units.gu(120)

64 shell.width = units.gu(120)

61 genericScopeView.categoryView.positionAtBeginning();

65 genericScopeView.categoryView.positionAtBeginning();

62− tryCompare(genericScopeView.categoryView, "contentY", 0)

66+ waitForRendering(genericScopeView.categoryView);

67+ }

68+

69+ function cleanup() {

70+ genericScopeView.scope = null;

71+ spy.clear();

72+ spy.target = null;

73+ spy.signalName = "";

63 }

74 }

64

75

65 function test_isActive() {

76 function test_isActive() {

@@ -104,90 +115,146 @@ Item {

104 tryCompare(genericScopeView.scope, "searchQuery", "test")

115 tryCompare(genericScopeView.scope, "searchQuery", "test")

105 }

116 }

106

117

107− function test_filter_expand_collapse() {

118+ function test_expand_collapse() {

108− // wait for the item to be there

109− waitForRendering(genericScopeView);

110 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);

119 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);

111

120

112− var header = findChild(genericScopeView, "dashSectionHeader0")

113 var category = findChild(genericScopeView, "dashCategory0")

121 var category = findChild(genericScopeView, "dashCategory0")

122+ var seeAll = findChild(category, "seeAll")

114

123

115− waitForRendering(header);

124+ waitForRendering(seeAll);

116 verify(category.expandable);

125 verify(category.expandable);

117− verify(category.filtered);

126+ verify(!category.expanded);

118

127

119 var initialHeight = category.height;

128 var initialHeight = category.height;

120− var middleHeight;

121− mouseClick(header, header.width / 2, header.height / 2);

129+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);

130+ verify(category.expanded);

122− tryCompareFunction(function() { middleHeight = category.height; return category.height > initialHeight; }, true);

131+ tryCompareFunction(function() { return category.height > initialHeight; }, true);

123− tryCompare(category, "filtered", false);

124− tryCompareFunction(function() { return category.height > middleHeight; }, true);

125

132

126− mouseClick(header, header.width / 2, header.height / 2);

133+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);

127− verify(category.expandable);

134+ verify(!category.expanded);

128− tryCompare(category, "filtered", true);

129 }

135 }

130

136

131− function test_filter_expand_expand_collapse() {

137+ function test_expand_expand_collapse() {

132 // wait for the item to be there

138 // wait for the item to be there

133 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);

139 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);

134

140

135 var categoryListView = findChild(genericScopeView, "categoryListView");

141 var categoryListView = findChild(genericScopeView, "categoryListView");

136 categoryListView.contentY = categoryListView.height;

142 categoryListView.contentY = categoryListView.height;

137

143

138− var header2 = findChild(genericScopeView, "dashSectionHeader2")

139 var category2 = findChild(genericScopeView, "dashCategory2")

144 var category2 = findChild(genericScopeView, "dashCategory2")

140− var category2FilterGrid = category2.children[1].children[2];

145+ var seeAll2 = findChild(category2, "seeAll")

141− verify(UT.Util.isInstanceOf(category2FilterGrid, "CardFilterGrid"));

142

146

143− waitForRendering(header2);

147+ waitForRendering(seeAll2);

144 verify(category2.expandable);

148 verify(category2.expandable);

145− verify(category2.filtered);

149+ verify(!category2.expanded);

146

150

147− mouseClick(header2, header2.width / 2, header2.height / 2);

151+ mouseClick(seeAll2, seeAll2.width / 2, seeAll2.height / 2);

148− tryCompare(category2, "filtered", false);

152+ tryCompare(category2, "expanded", true);

149− tryCompare(category2FilterGrid, "filtered", false);

150

153

151 categoryListView.positionAtBeginning();

154 categoryListView.positionAtBeginning();

152

155

153− var header0 = findChild(genericScopeView, "dashSectionHeader0")

154 var category0 = findChild(genericScopeView, "dashCategory0")

156 var category0 = findChild(genericScopeView, "dashCategory0")

157+ var seeAll0 = findChild(category0, "seeAll")

155− mouseClick(header0, header0.width / 2, header0.height / 2);

158+ mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);

156− tryCompare(category0, "filtered", false);

159+ tryCompare(category0, "expanded", true);

157− tryCompare(category2, "filtered", true);

160+ tryCompare(category2, "expanded", false);

158− tryCompare(category2FilterGrid, "filtered", true);

161+ mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);

162+ tryCompare(category0, "expanded", false);

163+ tryCompare(category2, "expanded", false);

164+ }

165+

166+ function test_headerLink() {

167+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader1") != null; }, true);

168+ var header = findChild(genericScopeView, "dashSectionHeader1");

169+

170+ spy.target = genericScopeView.scope;

171+ spy.signalName = "performQuery";

172+

159− mouseClick(header0, header0.width / 2, header0.height / 2);

173+ mouseClick(header, header.width / 2, header.height / 2);

160− tryCompare(category0, "filtered", true);

174+

161− tryCompare(category2, "filtered", true);

175+ spy.wait();

176+ compare(spy.signalArguments[0][0], genericScopeView.scope.categories.data(1, Categories.RoleHeaderLink));

177+ }

178+

179+ function test_headerLink_disable_expansion() {

180+ var categoryListView = findChild(genericScopeView, "categoryListView");

181+ waitForRendering(categoryListView);

182+

183+ categoryListView.contentY = categoryListView.height * 2;

184+

185+ // wait for the item to be there

186+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader4") != null; }, true);

187+

188+ var categoryView = findChild(genericScopeView, "dashCategory4");

189+ verify(categoryView, "Can't find the category view.");

190+

191+ var seeAll = findChild(categoryView, "seeAll");

192+ verify(seeAll, "Can't find the seeAll element");

193+

194+ compare(seeAll.height, 0, "SeeAll should be 0-height.");

195+

196+ openPreview(4, 0);

197+

198+ compare(testCase.previewListView.count, 12, "There should only be 12 items in preview.");

162 }

199 }

163

200

164 function test_narrow_delegate_ranges_expand() {

201 function test_narrow_delegate_ranges_expand() {

165− tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);

202+ tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") !== null; }, true);

166 var category = findChild(genericScopeView, "dashCategory0")

203 var category = findChild(genericScopeView, "dashCategory0")

167− tryCompare(category, "filtered", true);

204+ tryCompare(category, "expanded", false);

168

205

169 shell.width = units.gu(20)

206 shell.width = units.gu(20)

170 var categoryListView = findChild(genericScopeView, "categoryListView");

207 var categoryListView = findChild(genericScopeView, "categoryListView");

171 categoryListView.contentY = units.gu(20);

208 categoryListView.contentY = units.gu(20);

172− var header0 = findChild(genericScopeView, "dashSectionHeader0")

209+ var seeAll = findChild(category, "seeAll")

173− mouseClick(header0, header0.width / 2, header0.height / 2);

210+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);

174− tryCompare(category, "filtered", false);

211+ tryCompare(category, "expanded", true);

175 tryCompareFunction(function() { return category.item.height == genericScopeView.height - category.item.displayMarginBeginning - category.item.displayMarginEnd; }, true);

212 tryCompareFunction(function() { return category.item.height == genericScopeView.height - category.item.displayMarginBeginning - category.item.displayMarginEnd; }, true);

176− mouseClick(header0, header0.width / 2, header0.height / 2);

213+ mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);

177− tryCompare(category, "filtered", true);

214+ tryCompare(category, "expanded", false);

215+ }

216+

217+ function test_forced_category_expansion() {

218+ tryCompareFunction(function() {

219+ mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

220+ genericScopeView.width/2, genericScopeView.y)

221+ return findChild(genericScopeView, "dashCategory19") !== null;

222+ }, true);

223+ var category = findChild(genericScopeView, "dashCategory19")

224+ compare(category.expandable, false, "Category with collapsed-rows: 0 should not be expandable");

225+

226+ var grid = findChild(category, "19");

227+ verify(grid, "Could not find the category renderer.");

228+

229+ compare(grid.height, grid.expandedHeight, "Category with collapsed-rows: 0 should always be expanded.");

230+ }

231+

232+ function test_single_category_expansion() {

233+ genericScopeView.scope = scopes.getScope(4);

234+

235+ tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);

236+ var category = findChild(genericScopeView, "dashCategory0")

237+ compare(category.expandable, false, "Only category should not be expandable.");

238+

239+ var grid = findChild(category, "0");

240+ verify(grid, "Could not find the category renderer.");

241+

242+ compare(grid.height, grid.expandedHeight, "Only category should always be expanded");

178 }

243 }

179

244

180− function openPreview() {

245+ function openPreview(category, delegate) {

246+ if (category === undefined) category = 0;

247+ if (delegate === undefined) delegate = 0;

181 tryCompareFunction(function() {

248 tryCompareFunction(function() {

182− var filterGrid = findChild(genericScopeView, "0");

249+ var cardGrid = findChild(genericScopeView, category);

183− if (filterGrid != null) {

250+ if (cardGrid != null) {

184− var tile = findChild(filterGrid, "delegate0");

251+ var tile = findChild(cardGrid, "delegate"+delegate);

185 return tile != null;

252 return tile != null;

186 }

253 }

187 return false;

254 return false;

188 },

255 },

189 true);

256 true);

190− var tile = findChild(findChild(genericScopeView, "0"), "delegate0");

257+ var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);

191 mouseClick(tile, tile.width / 2, tile.height / 2);

258 mouseClick(tile, tile.width / 2, tile.height / 2);

192 tryCompare(testCase.previewListView, "open", true);

259 tryCompare(testCase.previewListView, "open", true);

193 tryCompare(testCase.previewListView, "x", 0);

260 tryCompare(testCase.previewListView, "x", 0);

@@ -257,7 +324,7 @@ Item {

257 closePreview();

324 closePreview();

258 }

325 }

259

326

260− function test_haeder_logo() {

327+ function test_header_logo() {

261 genericScopeView.scope = scopes.getScope(3);

328 genericScopeView.scope = scopes.getScope(3);

262

329

263 var image = findChild(genericScopeView, "titleImage");

330 var image = findChild(genericScopeView, "titleImage");