bb4b2e5 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge

commitbb4b2e552a758587d93c4c042094b3ad25be81da authorAlbert Astals <albert.astals@canonical.com> dateThu 7 Aug 2014, 10:30 (12 years ago) parenta7871ba d2cf1f9

18 files changed+394−317

compare with xenial

unifiedsplit

debian/control+2−2

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

2424 libpulse-dev,

2525 libqmenumodel-dev (>= 0.2.8),

2626 libqt5xmlpatterns5-dev,

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

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

2828 libusermetricsoutput1-dev,

2929 libxcb1-dev,

3030 pkg-config,

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

112112 unity-application-impl-2,

113113 unity-notifications-impl-3,

114114 unity-plugin-scopes | unity-scopes-impl,

115− unity-scopes-impl-3,

115+ unity-scopes-impl-4,

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

117117 ${misc:Depends},

118118Breaks: unity8 (<< 7.86),

qml/Dash/Dash.qml+9−11

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

3939 }

4040

4141 function setCurrentScope(scopeId, animate, reset) {

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

42+ var scopeIndex = -1;

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

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

45+ scopeIndex = i;

46+ break;

47+ }

48+ }

4349

4450 if (scopeIndex == -1) {

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

@@ -64,15 +70,8 @@ Showable {

6470 }

6571 }

6672

67− SortFilterProxyModel {

68− id: filteredScopes

69− model: Scopes {

70− id: scopes

71− }

72− dynamicSortFilter: true

73−

74− filterRole: Scopes.RoleVisible

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

73+ Scopes {

74+ id: scopes

7675 }

7776

7877 QtObject {

@@ -157,7 +156,6 @@ Showable {

157156 objectName: "dashContent"

158157 width: dash.width

159158 height: dash.height

160− model: filteredScopes

161159 scopes: scopes

162160 visible: !scopesOverview.showingNonFavoriteScope && x != -width

163161 onGotoScope: {

qml/Dash/DashContent.qml+3−5

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

2323Item {

2424 id: dashContent

2525

26− property var model: null

27− property var scopes: null

26+ property alias scopes: dashContentList.model

2827 readonly property alias currentIndex: dashContentList.currentIndex

2928 readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""

3029 readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null

@@ -93,10 +92,9 @@ Item {

9392 id: dashContentList

9493 objectName: "dashContentList"

9594

96− interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.departmentsShown

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

9796

9897 anchors.fill: parent

99− model: dashContent.model

10098 orientation: ListView.Horizontal

10199 boundsBehavior: Flickable.DragAndOvershootBounds

102100 flickDeceleration: units.gu(625)

@@ -134,7 +132,7 @@ Item {

134132 objectName: scope.id + " loader"

135133

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

137− readonly property bool departmentsShown: item ? item.departmentsShown : false

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

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

139137 readonly property var theScope: scope

140138

qml/Dash/DashDepartments.qml → qml/Dash/DashNavigation.qmlrenamed+44−44

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

1515 */

1616

1717import QtQuick 2.2

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

1919

2020AbstractButton {

2121 id: root

22− objectName: "dashDepartments"

22+ objectName: "dashNavigation"

2323

2424 property var scope: null

2525

2626 property bool showList: false

2727

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

2929

3030 property alias windowWidth: blackRect.width

3131 property alias windowHeight: blackRect.height

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

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

3535 property bool isGoingBack: false

3636

37− visible: root.currentDepartment != null

37+ visible: root.currentNavigation != null

3838

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

4040

4141 onClicked: {

42− departmentListView.updateMaxHeight();

42+ navigationListView.updateMaxHeight();

4343 root.showList = !root.showList;

4444 }

4545

4646 Rectangle {

4747 id: blackRect

4848 color: "black"

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

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

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

51− anchors.top: departmentListView.top

51+ anchors.top: navigationListView.top

5252 anchors.right: parent.right

5353 visible: opacity != 0

5454 }

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

7979 anchors.fill: parent

8080 anchors.margins: units.gu(2)

8181 verticalAlignment: Text.AlignVCenter

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

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

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

8484 }

8585

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

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

9494 }

9595

96− // departmentListView is outside root

96+ // navigationListView is outside root

9797 ListView {

98− id: departmentListView

99− objectName: "departmentListView"

98+ id: navigationListView

99+ objectName: "navigationListView"

100100 orientation: ListView.Horizontal

101101 interactive: false

102102 clip: root.width != windowWidth

103103 model: ListModel {

104− id: departmentModel

104+ id: navigationModel

105105 // We have two roles

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

107− // nullifyDepartment: overrides departmentId to be null

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

107+ // nullifyNavigation: overrides navigationId to be null

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

109109 }

110110 anchors {

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

126126 }

127127 }

128128 highlightMoveDuration: UbuntuAnimation.FastDuration

129− delegate: DashDepartmentsList {

130− objectName: "department" + index

129+ delegate: DashNavigationList {

130+ objectName: "navigation" + index

131131 visible: height != 0

132− width: departmentListView.width

132+ width: navigationListView.width

133133 scopeStyle: root.scopeStyle

134134 property real desiredHeight: {

135135 if (root.showList) {

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

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

137137 {

138− departmentListView.updateMaxHeight();

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

138+ navigationListView.updateMaxHeight();

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

140140 } else {

141− return departmentListView.prevHeight;

141+ return navigationListView.prevHeight;

142142 }

143143 } else {

144144 return 0;

145145 }

146146 }

147147 height: desiredHeight

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

149− currentDepartment: root.currentDepartment

150− onEnterDepartment: {

151− scope.loadDepartment(newDepartmentId);

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

149+ currentNavigation: root.currentNavigation

150+ onEnterNavigation: {

151+ scope.setNavigationState(newNavigationId, false);

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

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

154154 if (hasChildren) {

155155 isGoingBack = false;

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

157− departmentListView.currentIndex++;

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

157+ navigationListView.currentIndex++;

158158 } else {

159159 showList = false;

160160 }

161161 }

162162 onGoBackToParentClicked: {

163− scope.loadDepartment(department.parentDepartmentId);

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

164164 isGoingBack = true;

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

166− departmentListView.currentIndex--;

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

166+ navigationListView.currentIndex--;

167167 }

168− onAllDepartmentClicked: {

168+ onAllNavigationClicked: {

169169 showList = false;

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

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

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

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

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

173173 }

174174 }

175175 }

176176 onContentXChanged: {

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

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

178178 if (isGoingBack) {

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

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

180180 } else {

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

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

182182 }

183183 }

184184 }

185185 }

186186

187187 InverseMouseArea {

188− anchors.fill: departmentListView

188+ anchors.fill: navigationListView

189189 enabled: root.showList

190190 onClicked: root.showList = false

191191 }

192192

193193 onScopeChanged: {

194− departmentModel.clear();

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

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

194+ navigationModel.clear();

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

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

197197 }

198198 }

199199

200200 Connections {

201201 target: scope

202− onHasDepartmentsChanged: {

203− if (scope.hasDepartments) {

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

202+ onHasNavigationChanged: {

203+ if (scope.hasNavigation) {

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

205205 } else {

206− departmentModel.clear();

206+ navigationModel.clear();

207207 }

208208 }

209209 }

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

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

1515 */

1616

1717import QtQuick 2.2

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

1919

2020Item {

2121 id: root

22− property var department: null

23− property var currentDepartment: null

22+ property var navigation: null

23+ property var currentNavigation: null

2424 property var scopeStyle: null

25− signal enterDepartment(var newDepartmentId, bool hasChildren)

25+ signal enterNavigation(var newNavigationId, bool hasChildren)

2626 signal goBackToParentClicked()

27− signal allDepartmentClicked()

27+ signal allNavigationClicked()

2828

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

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

@@ -38,7 +38,7 @@ Item {

3838 ActivityIndicator {

3939 id: loadingIndicator

4040 anchors.centerIn: parent

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

41+ running: !(navigation && navigation.loaded)

4242 }

4343 clip: true

4444

@@ -69,7 +69,7 @@ Item {

6969 id: backButton

7070 objectName: "backButton"

7171 width: parent.width

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

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

7373 height: itemHeight

7474

7575 onClicked: root.goBackToParentClicked();

@@ -93,7 +93,7 @@ Item {

9393 left: backImage.right

9494 leftMargin: units.gu(0.5)

9595 }

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

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

9797 color: root.foregroundColor

9898 }

9999

@@ -115,7 +115,7 @@ Item {

115115 id: allButton

116116 objectName: "allButton"

117117 width: parent.width

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

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

119119 height: itemHeight

120120

121121 Label {

@@ -124,7 +124,7 @@ Item {

124124 left: parent.left

125125 leftMargin: units.gu(2)

126126 }

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

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

128128 font.bold: true

129129 color: root.foregroundColor

130130 }

@@ -142,18 +142,18 @@ Item {

142142 height: units.dp(1)

143143 }

144144

145− onClicked: root.allDepartmentClicked();

145+ onClicked: root.allNavigationClicked();

146146 }

147147

148148 Repeater {

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

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

150150 clip: true

151151 delegate: AbstractButton {

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

153153 height: root.itemHeight

154154 width: root.width

155155

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

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

157157

158158 Label {

159159 anchors {

@@ -189,7 +189,7 @@ Item {

189189 color: root.foregroundColor

190190 opacity: 0.1

191191 height: units.dp(1)

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

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

193193 }

194194 }

195195 }

qml/Dash/GenericScopeView.qml+3−13

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

2525FocusScope {

2626 id: scopeView

2727

28− readonly property bool departmentsShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem.showList : false

28+ readonly property bool navigationShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem.showList : false

2929 property var scope: null

3030 property SortFilterProxyModel categories: categoryFilter

3131 property bool isCurrent: false

@@ -44,16 +44,6 @@ FocusScope {

4444

4545 signal backClicked()

4646

47− onScopeChanged: {

48− if (scope) {

49− scope.activateApplication.connect(activateApp);

50− }

51− }

52−

53− function activateApp(appId) {

54− Qt.openUrlExternally(appId);

55− }

56−

5747 function positionAtBeginning() {

5848 categoryView.positionAtBeginning()

5949 }

@@ -154,7 +144,7 @@ FocusScope {

154144 model: scopeView.categories

155145 forceNoClip: previewListView.open

156146 pixelAligned: true

157− interactive: !departmentsShown

147+ interactive: !navigationShown

158148

159149 property string expandedCategoryId: ""

160150

@@ -427,7 +417,7 @@ FocusScope {

427417 searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false

428418 scopeStyle: scopeView.scopeStyle

429419

430− bottomItem: DashDepartments {

420+ bottomItem: DashNavigation {

431421 scope: scopeView.scope

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

433423 anchors.right: parent.right

qml/ScopeTool.qml+1−11

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

4545 signal searchClicked

4646 }

4747

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− }

5848

5949 Rectangle {

6050 anchors.fill: dashContent

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

7262 DashContent {

7363 id: dashContent

7464

75− model: filteredScopes

7665 property var scope: scopes.getScope(currentIndex)

66+ scopes: Scopes { }

7767

7868 anchors {

7969 top: parent.top

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

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

77pkg_search_module(DEE dee-1.0 REQUIRED)

88pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

99pkg_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)

1111

1212include_directories(

1313 ${CMAKE_CURRENT_BINARY_DIR}

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

2424 fake_scopes.cpp

2525 fake_scopesoverview.cpp

2626 fake_categories.cpp

27− fake_department.cpp

27+ fake_navigation.cpp

2828 fake_resultsmodel.cpp

2929 fake_previewmodel.cpp

3030 fake_previewstack.cpp

3131 fake_previewwidgetmodel.cpp

3232 fake_unity_plugin.cpp

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

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

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

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

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

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

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

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

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

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

2626 }

27+ Method {

28+ name: "data"

29+ type: "QVariant"

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

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

32+ }

2733 }

2834 Component {

2935 name: "PreviewModel"

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

6268 prototype: "unity::shell::scopes::ScopeInterface"

6369 exports: ["Unity/MockScope 0.2"]

6470 exportMetaObjectRevisions: [0]

71+ Signal {

72+ name: "performQuery"

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

74+ }

6575 Method {

6676 name: "setSearchInProgress"

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

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

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

8292 }

8393 Method {

84− name: "getDepartment"

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

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

94+ name: "getNavigation"

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

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

8797 }

8898 Method {

89− name: "loadDepartment"

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

99+ name: "getAltNavigation"

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

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

91102 }

92103 Method {

93− name: "performQuery"

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

104+ name: "setNavigationState"

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

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

95107 }

108+ Method { name: "refresh" }

96109 }

97110 Component {

98111 name: "Scopes"

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

137150 "RoleRawRendererTemplate": 3,

138151 "RoleRenderer": 4,

139152 "RoleComponents": 5,

153+ "RoleHeaderLink": 6,

140154 "RoleResults": 7,

141155 "RoleCount": 8

142156 }

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

157171 }

158172 }

159173 Component {

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

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

161175 prototype: "QAbstractListModel"

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

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

163177 isCreatable: false

164178 exportMetaObjectRevisions: [0]

165179 Enum {

166180 name: "Roles"

167181 values: {

168− "RoleDepartmentId": 0,

182+ "RoleNavigationId": 0,

169183 "RoleLabel": 1,

170184 "RoleHasChildren": 2,

171185 "RoleIsActive": 3

172186 }

173187 }

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

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

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

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

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

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

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

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

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

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

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

182197 }

183198 Component {

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

247262 "RoleEmblem": 8,

248263 "RoleSummary": 9,

249264 "RoleAttributes": 10,

250− "RoleBackground": 11

265+ "RoleBackground": 11,

266+ "RoleOverlayColor": 12

251267 }

252268 }

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

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

259275 exports: ["Unity/Scope 0.2"]

260276 isCreatable: false

261277 exportMetaObjectRevisions: [0]

278+ Enum {

279+ name: "Status"

280+ values: {

281+ "Okay": 0,

282+ "NoInternet": 1,

283+ "NoLocationData": 2,

284+ "Unknown": 3

285+ }

286+ }

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

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

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

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

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

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

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

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

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

270295 Property {

271296 name: "categories"

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

273298 isReadonly: true

274299 isPointer: true

275300 }

301+ Property {

302+ name: "settings"

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

304+ isReadonly: true

305+ isPointer: true

306+ }

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

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

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

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

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

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

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

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

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

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

282315 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" }

283322 Signal { name: "showDash" }

284323 Signal { name: "hideDash" }

285324 Signal {

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

298337 name: "openScope"

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

300339 }

301− Signal {

302− name: "activateApplication"

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

304− }

305340 Method {

306341 name: "activate"

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

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

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

318353 }

319354 Method {

320− name: "getDepartment"

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

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

355+ name: "getNavigation"

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

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

358+ }

359+ Method {

360+ name: "getAltNavigation"

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

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

323363 }

324364 Method {

325− name: "loadDepartment"

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

365+ name: "setNavigationState"

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

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

327368 }

369+ Method {

370+ name: "performQuery"

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

372+ }

373+ Method { name: "refresh" }

328374 }

329375 Component {

330376 name: "unity::shell::scopes::ScopesInterface"

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

334380 values: {

335381 "RoleScope": 0,

336382 "RoleId": 1,

337− "RoleVisible": 2,

338− "RoleTitle": 3

383+ "RoleTitle": 2

339384 }

340385 }

341386 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+ }

342394 Method {

343395 name: "getScope"

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

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

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

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

1515 */

1616

17−#include "fake_department.h"

17+#include "fake_navigation.h"

1818

1919#include "fake_scope.h"

2020

21+#include <QDebug>

2122#include <QTimer>

2223

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

24− : m_departmentId(departmentId)

24+Navigation::Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)

25+ : m_navigationId(navigationId)

2526 , m_label(label)

2627 , m_allLabel(allLabel)

2728 , m_parentId(parentId)

@@ -30,96 +31,87 @@ Department::Department(const QString& departmentId, const QString& label, const

3031 , m_scope(scope)

3132{

3233 QTimer::singleShot(1500, this, SLOT(slotLoaded()));

33− connect(scope, SIGNAL(currentDepartmentIdChanged()), this, SLOT(slotCurrentDepartmentChanged()));

34+ connect(scope, SIGNAL(currentNavigationIdChanged()), this, SLOT(slotCurrentNavigationChanged()));

3435}

3536

36−QString Department::departmentId() const

37+QString Navigation::navigationId() const

3738{

38− return m_departmentId;

39+ return m_navigationId;

3940}

4041

41−QString Department::label() const

42+QString Navigation::label() const

4243{

4344 return m_label;

4445}

4546

46−QString Department::allLabel() const

47+QString Navigation::allLabel() const

4748{

4849 return m_allLabel;

4950}

5051

51−QString Department::parentDepartmentId() const

52+QString Navigation::parentNavigationId() const

5253{

5354 return m_parentId;

5455}

5556

56−QString Department::parentLabel() const

57+QString Navigation::parentLabel() const

5758{

5859 return m_parentLabel;

5960}

6061

61−void Department::slotLoaded()

62+void Navigation::slotLoaded()

6263{

6364 m_loaded = true;

6465 Q_EMIT loadedChanged();

6566}

6667

67−bool Department::loaded() const

68+bool Navigation::loaded() const

6869{

6970 return m_loaded;

7071}

7172

72−int Department::count() const

73+int Navigation::count() const

7374{

7475 return rowCount();

7576}

7677

77−bool Department::isRoot() const

78+bool Navigation::isRoot() const

7879{

79− return m_departmentId == "root";

80+ return m_navigationId == "root" || m_navigationId == "altroot";

8081}

8182

82−int Department::rowCount(const QModelIndex & /*parent*/) const

83+bool Navigation::hidden() const

8384{

84− if (!m_loaded || m_departmentId.startsWith("child") || m_departmentId == "middle3")

85− return 0;

86− else

87− return 8;

85+ return m_navigationId == "altroot";

8886}

8987

90−QHash<int, QByteArray> Department::roleNames() const

88+int Navigation::rowCount(const QModelIndex & /*parent*/) const

9189{

92− QHash<int, QByteArray> res;

93− res[RoleDepartmentId] = "departmentId";

94− res[RoleLabel] = "label";

95− res[RoleHasChildren] = "hasChildren";

96− res[RoleIsActive] = "isActive";

97− return res;

90+ if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId == "middle3")

91+ return 0;

92+ else

93+ return 8;

9894}

9995

100−QVariant Department::data(const QModelIndex &index, int role) const

96+QVariant Navigation::data(const QModelIndex &index, int role) const

10197{

10298 switch (role) {

103− case RoleDepartmentId:

104− if (m_departmentId == "root")

99+ case RoleNavigationId:

100+ if (m_navigationId == "root")

105101 return QString("middle%1").arg(index.row());

106− else if (m_departmentId.startsWith("middle"))

107− return QString("child%1%2").arg(m_departmentId).arg(index.row());

108− break;

102+ else if (m_navigationId.startsWith("middle"))

103+ return QString("child%1%2").arg(m_navigationId).arg(index.row());

109104 case RoleLabel:

110− return QString("%1Child%2").arg(m_departmentId).arg(index.row());

111− break;

105+ return QString("%1Child%2").arg(m_navigationId).arg(index.row());

112106 case RoleHasChildren:

113− return m_departmentId == "root" && index.row() != 3;

114− break;

107+ return m_navigationId == "root" && index.row() != 3;

115108 case RoleIsActive:

116− return m_scope->currentDepartmentId() == data(index, RoleDepartmentId);

117− break;

109+ return m_scope->currentNavigationId() == data(index, RoleNavigationId);

118110 }

119111 return QVariant();

120112}

121113

122−void Department::slotCurrentDepartmentChanged()

114+void Navigation::slotCurrentNavigationChanged()

123115{

124116 // This is wasteful, should only emit it if really something changed in this

125117 // 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 @@

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

1515 */

1616

17−#ifndef FAKE_DEPARTMENT_H

18−#define FAKE_DEPARTMENT_H

17+#ifndef FAKE_NAVIGATION_H

18+#define FAKE_NAVIGATION_H

1919

20−#include <unity/shell/scopes/DepartmentInterface.h>

20+#include <unity/shell/scopes/NavigationInterface.h>

2121

2222class Scope;

2323

24−class Department : public unity::shell::scopes::DepartmentInterface

24+class Navigation : public unity::shell::scopes::NavigationInterface

2525{

2626 Q_OBJECT

2727

2828public:

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);

3030

31− QString departmentId() const override;

31+ QString navigationId() const override;

3232 QString label() const override;

3333 QString allLabel() const override;

34− QString parentDepartmentId() const override;

34+ QString parentNavigationId() const override;

3535 QString parentLabel() const override;

3636 bool loaded() const override;

37− int count() const override;

3837 bool isRoot() const override;

38+ bool hidden() const override;

39+ int count() const override;

3940

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

41− QHash<int, QByteArray> roleNames() const;

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

4343

4444public Q_SLOTS:

45− void slotCurrentDepartmentChanged();

45+ void slotCurrentNavigationChanged();

4646

4747private Q_SLOTS:

4848 void slotLoaded();

4949

5050private:

51− QString m_departmentId;

51+ QString m_navigationId;

5252 QString m_label;

5353 QString m_allLabel;

5454 QString m_parentId;

5555 QString m_parentLabel;

5656 bool m_loaded;

57− QString m_currentDepartment;

57+ QString m_currentNavigation;

5858 Scope *m_scope;

5959};

6060

61−#endif // FAKE_DEPARTMENT_H

61+#endif // FAKE_NAVIGATION_H

tests/mocks/Unity/fake_scope.cpp+64−17

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

1919

2020#include "fake_scope.h"

2121

22−#include "fake_department.h"

22+include "fake_navigation.h"

2323#include "fake_resultsmodel.h"

2424#include "fake_scopes.h"

2525

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

2727{

2828}

2929

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

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

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

3232 , m_id(id)

3333 , m_name(name)

34− , m_visible(visible)

3534 , m_searching(false)

35+ , m_favorite(favorite)

3636 , m_isActive(false)

37− , m_currentDeparment("root")

37+ , m_currentNavigationId("root")

38+ , m_currentAltNavigationId("altroot")

3839 , m_previewRendererName("preview-generic")

3940 , m_categories(new Categories(categories, this))

4041 , m_openScope(nullptr)

@@ -81,6 +82,11 @@ bool Scope::searchInProgress() const

8182 return m_searching;

8283}

8384

85+bool Scope::favorite() const

86+{

87+ return m_favorite;

88+}

89+

8490unity::shell::scopes::CategoriesInterface* Scope::categories() const

8591{

8692 return m_categories;

@@ -101,11 +107,6 @@ QString Scope::formFactor() const

101107 return m_formFactor;

102108}

103109

104−bool Scope::visible() const

105−{

106− return m_visible;

107−}

108−

109110bool Scope::isActive() const

110111{

111112 return m_isActive;

@@ -135,6 +136,13 @@ void Scope::setActive(const bool active)

135136 }

136137}

137138

139+void Scope::setFavorite(const bool favorite)

140+{

141+ if (favorite != m_favorite) {

142+ m_favorite = favorite;

143+ Q_EMIT favoriteChanged();

144+ }

145+}

138146void Scope::setSearchInProgress(const bool inProg)

139147{

140148 if (inProg != m_searching) {

@@ -183,16 +191,31 @@ void Scope::closeScope(unity::shell::scopes::ScopeInterface* scope)

183191 m_openScope = nullptr;

184192}

185193

186−QString Scope::currentDepartmentId() const

194+QString Scope::currentNavigationId() const

195+{

196+ return m_currentNavigationId;

197+}

198+

199+bool Scope::hasNavigation() const

200+{

201+ return true;

202+}

203+

204+QString Scope::currentAltNavigationId() const

187205{

188− return m_currentDeparment;

206+ return m_currentAltNavigationId;

189207}

190208

191−bool Scope::hasDepartments() const

209+bool Scope::hasAltNavigation() const

192210{

193211 return true;

194212}

195213

214+Scope::Status Scope::status() const

215+{

216+ return Status::Okay;

217+}

218+

196219QVariantMap Scope::customizations() const

197220{

198221 QVariantMap m, h;

@@ -209,7 +232,12 @@ QVariantMap Scope::customizations() const

209232 return m;

210233}

211234

212−unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)

235+void Scope::refresh()

236+{

237+ qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";

238+}

239+

240+unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)

213241{

214242 if (id.isEmpty())

215243 return nullptr;

@@ -223,11 +251,30 @@ unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& i

223251 parentId = id.mid(5, 7);

224252 parentLabel = parentId;

225253 }

226− return new Department(id, id, "all"+id, parentId, parentLabel, this);

254+ return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

255+}

256+

257+unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& id)

258+{

259+ if (id.isEmpty())

260+ return nullptr;

261+

262+ QString parentId;

263+ QString parentLabel;

264+ if (id.startsWith("altmiddle")) {

265+ parentId = "altroot";

266+ parentLabel = "altroot";

267+ }

268+ return new Navigation(id, id, "all"+id, parentId, parentLabel, this);

227269}

228270

229−void Scope::loadDepartment(const QString& id)

271+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)

230272{

231− m_currentDeparment = id;

232− Q_EMIT currentDepartmentIdChanged();

273+ if (isAltNavigation) {

274+ m_currentAltNavigationId = navigationId;

275+ Q_EMIT currentAltNavigationIdChanged();

276+ } else {

277+ m_currentNavigationId = navigationId;

278+ Q_EMIT currentNavigationIdChanged();

279+ }

233280}

tests/mocks/Unity/fake_scope.h+17−9

@@ -31,8 +31,8 @@ class Scope : public unity::shell::scopes::ScopeInterface

3131 Q_OBJECT

3232

3333public:

34− Scope(Scopes* parent = 0);

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

34+ Scope(QObject* parent = 0);

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

3636

3737 /* getters */

3838 QString id() const override;

@@ -40,9 +40,9 @@ public:

4040 QString iconHint() const override;

4141 QString description() const override;

4242 QString searchHint() const override;

43− bool visible() const override;

4443 QString shortcut() const override;

4544 bool searchInProgress() const override;

45+ bool favorite() const override;

4646 unity::shell::scopes::CategoriesInterface* categories() const override;

4747 QString searchQuery() const override;

4848 QString noResultsHint() const override;

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

5555 void setNoResultsHint(const QString& hint) override;

5656 void setFormFactor(const QString& form_factor) override;

5757 void setActive(const bool) override;

58+ void setFavorite(const bool) override;

5859 Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits

5960

6061 Q_INVOKABLE void activate(QVariant const& result) override;

@@ -62,14 +63,20 @@ public:

6263 Q_INVOKABLE void cancelActivation() override;

6364 Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;

6465

65− QString currentDepartmentId() const override;

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;

66+ QString currentNavigationId() const override;

67+ bool hasNavigation() const override;

68+ QString currentAltNavigationId() const override;

69+ bool hasAltNavigation() const override;

70+ Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

71+ Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;

72+ Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;

6973 Q_SIGNAL void performQuery(const QString& query) override;

7074

75+ Status status() const override;

7176 QVariantMap customizations() const override;

7277

78+ Q_INVOKABLE void refresh() override;

79+

7380protected:

7481

7582 QString m_id;

@@ -79,10 +86,11 @@ protected:

7986 QString m_searchQuery;

8087 QString m_noResultsHint;

8188 QString m_formFactor;

82− bool m_visible;

8389 bool m_searching;

90+ bool m_favorite;

8491 bool m_isActive;

85− QString m_currentDeparment;

92+ QString m_currentNavigationId;

93+ QString m_currentAltNavigationId;

8694

8795 QString m_previewRendererName;

8896

tests/mocks/Unity/fake_scopes.cpp+10−2

@@ -34,6 +34,11 @@ Scopes::Scopes(QObject *parent)

3434 timer.setSingleShot(true);

3535 timer.setInterval(100);

3636 QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateScopes()));

37+

38+ QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

39+ QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

40+ QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));

41+

3742 load();

3843}

3944

@@ -103,8 +108,6 @@ QVariant Scopes::data(const QModelIndex& index, int role) const

103108 return QVariant::fromValue(scope);

104109 } else if (role == Scopes::RoleId) {

105110 return QVariant::fromValue(scope->id());

106− } else if (role == Scopes::RoleVisible) {

107− return QVariant::fromValue(scope->visible());

108111 } else if (role == Scopes::RoleTitle) {

109112 return QVariant::fromValue(scope->name());

110113 } else {

@@ -150,6 +153,11 @@ bool Scopes::loaded() const

150153 return m_loaded;

151154}

152155

156+int Scopes::count() const

157+{

158+ return rowCount();

159+}

160+

153161unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const

154162{

155163 return m_scopesOverview;

tests/mocks/Unity/fake_scopes.h+1

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

5050 QModelIndex parent ( const QModelIndex & index ) const;

5151

5252 bool loaded() const override;

53+ int count() const override;

5354 unity::shell::scopes::ScopeInterface* overviewScope() const override;

5455

5556 // This is used as part of implementation of the other C++ code, not API

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

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

2222// local

2323#include "fake_scopes.h"

2424#include "fake_categories.h"

25−#include "fake_department.h"

25+#include "fake_navigation.h"

2626#include "fake_previewmodel.h"

2727#include "fake_previewwidgetmodel.h"

2828#include "fake_resultsmodel.h"

@@ -43,7 +43,7 @@ void FakeUnityPlugin::registerTypes(const char *uri)

4343 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");

4444 qmlRegisterType<Scope>(uri, 0, 2, "MockScope");

4545 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.");

4747 qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");

4848 qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");

4949 qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");

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

@@ -62,10 +62,10 @@ Item {

6262

6363 function get_scope_data() {

6464 return [

65− { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },

66− { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },

67− { tag: "clickscope", visualIndex: 1, shouldBeVisible: true },

68− { tag: "MockScope5", visualIndex: 2, shouldBeVisible: true },

65+ { tag: "MockScope1", visualIndex: 0 },

66+ { tag: "MockScope2", visualIndex: 1 },

67+ { tag: "clickscope", visualIndex: 2 },

68+ { tag: "MockScope5", visualIndex: 3 },

6969 ]

7070 }

7171

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

7474 }

7575

7676 function test_show_scope_on_load(data) {

77− if (data.shouldBeVisible == false) {

78− console.log("Not testing " + data.tag + ": not visible");

79− return;

80− }

8177 var dashContentList = findChild(dash, "dashContentList");

8278

8379 dash.showScopeOnLoaded = data.tag

tests/qmltests/Dash/tst_DashContent.qml+93−96

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

4343 id: dashContent

4444 anchors.fill: parent

4545

46− model: SortFilterProxyModel {

47− model: scopesModel

48− }

4946 scopes : scopesModel

5047 }

5148

@@ -269,119 +266,119 @@ Item {

269266 verify(carouselLV.tileWidth / carouselLV.tileHeight == cardTool.components["art"]["aspect-ratio"]);

270267 }

271268

272− function test_departments() {

269+ function test_navigations() {

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

274− tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashDepartments") != null; }, true);

275− var dashDepartments = findChild(dashContentList.currentItem, "dashDepartments");

276− tryCompare(dashDepartments, "visible", true);

277− compare(dashDepartments.showList, false);

278− waitForRendering(dashDepartments);

279− mouseClick(dashDepartments, 0, 0);

280− compare(dashDepartments.showList, true);

281−

282− var departmentListView = findChild(dashDepartments, "departmentListView");

283− compare(departmentListView.count, 1);

284− tryCompare(departmentListView.currentItem.department, "loaded", true);

285−

286− waitForRendering(departmentListView);

287− waitForRendering(departmentListView.currentItem);

288−

289− var allButton = findChild(dashDepartments, "allButton");

271+ tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);

272+ var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");

273+ tryCompare(dashNavigation, "visible", true);

274+ compare(dashNavigation.showList, false);

275+ waitForRendering(dashNavigation);

276+ mouseClick(dashNavigation, 0, 0);

277+ compare(dashNavigation.showList, true);

278+

279+ var navigationListView = findChild(dashNavigation, "navigationListView");

280+ compare(navigationListView.count, 1);

281+ tryCompare(navigationListView.currentItem.navigation, "loaded", true);

282+

283+ waitForRendering(navigationListView);

284+ waitForRendering(navigationListView.currentItem);

285+

286+ var allButton = findChild(dashNavigation, "allButton");

290287 compare(allButton.visible, false);

291288

292− var department = findChild(dashDepartments, "department0child3");

293− mouseClick(department, 0, 0);

294− compare(dashDepartments.showList, false);

295− tryCompare(dashDepartments.currentDepartment, "departmentId", "middle3");

296− tryCompare(departmentListView.currentItem.department, "departmentId", "root");

289+ var navigation = findChild(dashNavigation, "navigation0child3");

290+ mouseClick(navigation, 0, 0);

291+ compare(dashNavigation.showList, false);

292+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");

293+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

297294

298− mouseClick(dashDepartments, 0, 0);

299− compare(dashDepartments.showList, true);

300− waitForRendering(departmentListView);

301− waitForRendering(departmentListView.currentItem);

295+ mouseClick(dashNavigation, 0, 0);

296+ compare(dashNavigation.showList, true);

297+ waitForRendering(navigationListView);

298+ waitForRendering(navigationListView.currentItem);

302299 compare(allButton.visible, true);

303300

304301 mouseClick(allButton, 0, 0);

305− compare(dashDepartments.showList, false);

306− tryCompare(dashDepartments.currentDepartment, "departmentId", "root");

307− tryCompare(departmentListView.currentItem.department, "departmentId", "root");

308−

309− mouseClick(dashDepartments, 0, 0);

310− compare(dashDepartments.showList, true);

311− waitForRendering(departmentListView);

312− waitForRendering(departmentListView.currentItem);

302+ compare(dashNavigation.showList, false);

303+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");

304+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

305+

306+ mouseClick(dashNavigation, 0, 0);

307+ compare(dashNavigation.showList, true);

308+ waitForRendering(navigationListView);

309+ waitForRendering(navigationListView.currentItem);

313310 compare(allButton.visible, false);

314311

315− department = findChild(dashDepartments, "department0child2");

316− mouseClick(department, 0, 0);

317− compare(dashDepartments.showList, true);

318− tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");

319− tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");

312+ navigation = findChild(dashNavigation, "navigation0child2");

313+ mouseClick(navigation, 0, 0);

314+ compare(dashNavigation.showList, true);

315+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

316+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

320317

321− var departmentList1 = findChild(dashDepartments, "department1");

322− allButton = findChild(departmentList1, "allButton");

323− var backButton = findChild(findChild(departmentList1, "department1"), "backButton");

318+ var navigationList1 = findChild(dashNavigation, "navigation1");

319+ allButton = findChild(navigationList1, "allButton");

320+ var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");

324321 compare(allButton.visible, true);

325322 compare(backButton.visible, true);

326323

327− tryCompare(departmentListView, "contentX", departmentList1.x);

328− waitForRendering(departmentListView);

324+ tryCompare(navigationListView, "contentX", navigationList1.x);

325+ waitForRendering(navigationListView);

329326 mouseClick(allButton, 0, 0);

330− compare(dashDepartments.showList, false);

331− tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");

332− tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");

333−

334− mouseClick(dashDepartments, 0, 0);

335− compare(dashDepartments.showList, true);

336− waitForRendering(departmentListView);

337− waitForRendering(departmentListView.currentItem);

327+ compare(dashNavigation.showList, false);

328+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

329+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

330+

331+ mouseClick(dashNavigation, 0, 0);

332+ compare(dashNavigation.showList, true);

333+ waitForRendering(navigationListView);

334+ waitForRendering(navigationListView.currentItem);

338335 compare(allButton.visible, true);

339336 compare(backButton.visible, true);

340337

341− tryCompare(departmentList1.department, "loaded", true);

342− department = findChild(dashDepartments, "department1child2");

343− mouseClick(department, 0, 0);

344− compare(dashDepartments.showList, false);

345− tryCompare(dashDepartments.currentDepartment, "departmentId", "childmiddle22");

346− tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");

347−

348− mouseClick(dashDepartments, 0, 0);

349− compare(dashDepartments.showList, true);

350− waitForRendering(departmentListView);

351− waitForRendering(departmentListView.currentItem);

352−

353− tryCompare(departmentList1.department, "loaded", true);

354− department = findChild(dashDepartments, "department1child3");

355− mouseClick(department, 0, 0);

356− compare(dashDepartments.showList, false);

357− tryCompare(dashDepartments.currentDepartment, "departmentId", "childmiddle23");

358− tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");

359−

360− mouseClick(dashDepartments, 0, 0);

361− compare(dashDepartments.showList, true);

362− waitForRendering(departmentListView);

363− waitForRendering(departmentListView.currentItem);

338+ tryCompare(navigationList1.navigation, "loaded", true);

339+ navigation = findChild(dashNavigation, "navigation1child2");

340+ mouseClick(navigation, 0, 0);

341+ compare(dashNavigation.showList, false);

342+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");

343+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

344+

345+ mouseClick(dashNavigation, 0, 0);

346+ compare(dashNavigation.showList, true);

347+ waitForRendering(navigationListView);

348+ waitForRendering(navigationListView.currentItem);

349+

350+ tryCompare(navigationList1.navigation, "loaded", true);

351+ navigation = findChild(dashNavigation, "navigation1child3");

352+ mouseClick(navigation, 0, 0);

353+ compare(dashNavigation.showList, false);

354+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");

355+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

356+

357+ mouseClick(dashNavigation, 0, 0);

358+ compare(dashNavigation.showList, true);

359+ waitForRendering(navigationListView);

360+ waitForRendering(navigationListView.currentItem);

364361 mouseClick(backButton, 0, 0);

365362

366− tryCompare(dashDepartments.currentDepartment, "departmentId", "root");

367− tryCompare(departmentListView.currentItem.department, "departmentId", "root");

368− compare(dashDepartments.showList, true);

369− mouseClick(dashDepartments, 0, 0);

370− compare(dashDepartments.showList, false);

371−

372− mouseClick(dashDepartments, 0, 0);

373− compare(dashDepartments.showList, true);

374− tryCompare(departmentListView.currentItem.department, "loaded", true);

375− department = findChild(dashDepartments, "department0child2");

376− mouseClick(department, 0, 0);

377− compare(dashDepartments.showList, true);

378− departmentList1 = findChild(dashDepartments, "department1");

379− compare(departmentList1.department.loaded, false);

380− tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");

381− allButton = findChild(departmentList1, "allButton");

382− tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");

363+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");

364+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

365+ compare(dashNavigation.showList, true);

366+ mouseClick(dashNavigation, 0, 0);

367+ compare(dashNavigation.showList, false);

368+

369+ mouseClick(dashNavigation, 0, 0);

370+ compare(dashNavigation.showList, true);

371+ tryCompare(navigationListView.currentItem.navigation, "loaded", true);

372+ navigation = findChild(dashNavigation, "navigation0child2");

373+ mouseClick(navigation, 0, 0);

374+ compare(dashNavigation.showList, true);

375+ navigationList1 = findChild(dashNavigation, "navigation1");

376+ compare(navigationList1.navigation.loaded, false);

377+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

378+ allButton = findChild(navigationList1, "allButton");

379+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

383380 mouseClick(allButton, 0, 0);

384− tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");

381+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

385382 }

386383 }

387384}