git.iko.soy/unity8
on xenial help sign in
more department -> navigation renaming
60661e3Albert Astals
qml/Dash/DashNavigation.qml+37−37
compare with xenial
unifiedsplit
@@ -19,13 +19,13 @@ import Ubuntu.Components 1.1
19
19
20AbstractButton {
20AbstractButton {
21 id: root
21 id: root
22− objectName: "dashDepartments"
22+ objectName: "dashNavigation"
23
23
24 property var scope: null
24 property var scope: null
25
25
26 property bool showList: false
26 property bool showList: false
27
27
28− readonly property var currentDepartment: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null
28+ readonly property var currentNavigation: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null
29
29
30 property alias windowWidth: blackRect.width
30 property alias windowWidth: blackRect.width
31 property alias windowHeight: blackRect.height
31 property alias windowHeight: blackRect.height
@@ -34,7 +34,7 @@ AbstractButton {
34 // Are we drilling down the tree or up?
34 // Are we drilling down the tree or up?
35 property bool isGoingBack: false
35 property bool isGoingBack: false
36
36
37− visible: root.currentDepartment != null
37+ visible: root.currentNavigation != null
38
38
39 height: visible ? units.gu(5) : 0
39 height: visible ? units.gu(5) : 0
40
40
@@ -45,9 +45,9 @@ AbstractButton {
45 Rectangle {
45 Rectangle {
46 id: blackRect
46 id: blackRect
47 color: "black"
47 color: "black"
48− opacity: departmentListView.currentItem && departmentListView.currentItem.visible ? 0.3 : 0
48+ opacity: navigationListView.currentItem && navigationListView.currentItem.visible ? 0.3 : 0
49 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
49 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
50− anchors.top: departmentListView.top
50+ anchors.top: navigationListView.top
51 anchors.right: parent.right
51 anchors.right: parent.right
52 visible: opacity != 0
52 visible: opacity != 0
53 }
53 }
@@ -78,7 +78,7 @@ AbstractButton {
78 anchors.fill: parent
78 anchors.fill: parent
79 anchors.margins: units.gu(2)
79 anchors.margins: units.gu(2)
80 verticalAlignment: Text.AlignVCenter
80 verticalAlignment: Text.AlignVCenter
81− text: root.currentDepartment ? root.currentDepartment.label : ""
81+ text: root.currentNavigation ? root.currentNavigation.label : ""
82 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
82 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
83 }
83 }
84
84
@@ -92,18 +92,18 @@ AbstractButton {
92 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
92 color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
93 }
93 }
94
94
95− // departmentListView is outside root
95+ // navigationListView is outside root
96 ListView {
96 ListView {
97− id: departmentListView
97+ id: navigationListView
98− objectName: "departmentListView"
98+ objectName: "navigationListView"
99 orientation: ListView.Horizontal
99 orientation: ListView.Horizontal
100 interactive: false
100 interactive: false
101 clip: root.width != windowWidth
101 clip: root.width != windowWidth
102 model: ListModel {
102 model: ListModel {
103− id: departmentModel
103+ id: navigationModel
104 // We have two roles
104 // We have two roles
105− // navigationId: the department id of the department the list represents
105+ // navigationId: the navigation id of the navigation the list represents
106− // nullifyDepartment: overrides navigationId to be null
106+ // nullifyNavigation: overrides navigationId to be null
107 // This is used to "clear" the delegate when going "right" on the tree
107 // This is used to "clear" the delegate when going "right" on the tree
108 }
108 }
109 anchors {
109 anchors {
@@ -121,72 +121,72 @@ AbstractButton {
121 }
121 }
122 highlightMoveDuration: UbuntuAnimation.FastDuration
122 highlightMoveDuration: UbuntuAnimation.FastDuration
123 delegate: DashNavigationList {
123 delegate: DashNavigationList {
124− objectName: "department" + index
124+ objectName: "navigation" + index
125 visible: height != 0
125 visible: height != 0
126− width: departmentListView.width
126+ width: navigationListView.width
127 scopeStyle: root.scopeStyle
127 scopeStyle: root.scopeStyle
128 property real desiredHeight: {
128 property real desiredHeight: {
129 if (root.showList) {
129 if (root.showList) {
130− if (department && department.loaded && x == departmentListView.contentX)
130+ if (navigation && navigation.loaded && x == navigationListView.contentX)
131 {
131 {
132− return Math.min(implicitHeight, departmentListView.maxHeight);
132+ return Math.min(implicitHeight, navigationListView.maxHeight);
133 } else {
133 } else {
134− return departmentListView.prevHeight;
134+ return navigationListView.prevHeight;
135 }
135 }
136 } else {
136 } else {
137 return 0;
137 return 0;
138 }
138 }
139 }
139 }
140 height: desiredHeight
140 height: desiredHeight
141− department: (nullifyDepartment || !scope) ? null : scope.getNavigation(navigationId)
141+ navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
142− currentDepartment: root.currentDepartment
142+ currentNavigation: root.currentNavigation
143− onEnterDepartment: {
143+ onEnterNavigation: {
144− scope.performQuery(departmentQuery);
144+ scope.performQuery(navigationQuery);
145 // We only need to add a new item to the model
145 // We only need to add a new item to the model
146 // if we have children, otherwise just load it
146 // if we have children, otherwise just load it
147 if (hasChildren) {
147 if (hasChildren) {
148 isGoingBack = false;
148 isGoingBack = false;
149− departmentModel.append({"navigationId": newNavigationId, "nullifyDepartment": false});
149+ navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
150− departmentListView.currentIndex++;
150+ navigationListView.currentIndex++;
151 } else {
151 } else {
152 showList = false;
152 showList = false;
153 }
153 }
154 }
154 }
155 onGoBackToParentClicked: {
155 onGoBackToParentClicked: {
156− scope.performQuery(department.parentQuery);
156+ scope.performQuery(navigation.parentQuery);
157 isGoingBack = true;
157 isGoingBack = true;
158− departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);
158+ navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
159− departmentListView.currentIndex--;
159+ navigationListView.currentIndex--;
160 }
160 }
161− onAllDepartmentClicked: {
161+ onAllNavigationClicked: {
162 showList = false;
162 showList = false;
163− if (root.currentDepartment.parentNavigationId == department.navigationId) {
163+ if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
164 // For leaves we have to go to the parent too
164 // For leaves we have to go to the parent too
165− scope.performQuery(root.currentDepartment.parentQuery);
165+ scope.performQuery(root.currentNavigation.parentQuery);
166 }
166 }
167 }
167 }
168 }
168 }
169 onContentXChanged: {
169 onContentXChanged: {
170− if (contentX == width * departmentListView.currentIndex) {
170+ if (contentX == width * navigationListView.currentIndex) {
171 if (isGoingBack) {
171 if (isGoingBack) {
172− departmentModel.remove(departmentListView.currentIndex + 1);
172+ navigationModel.remove(navigationListView.currentIndex + 1);
173 } else {
173 } else {
174− departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", true);
174+ navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", true);
175 }
175 }
176 }
176 }
177 }
177 }
178 }
178 }
179
179
180 InverseMouseArea {
180 InverseMouseArea {
181− anchors.fill: departmentListView
181+ anchors.fill: navigationListView
182 enabled: root.showList
182 enabled: root.showList
183 onClicked: root.showList = false
183 onClicked: root.showList = false
184 }
184 }
185
185
186 onScopeChanged: {
186 onScopeChanged: {
187− departmentModel.clear();
187+ navigationModel.clear();
188 if (scope && scope.hasNavigation) {
188 if (scope && scope.hasNavigation) {
189− departmentModel.append({"navigationId": scope.currentNavigationId, "nullifyDepartment": false});
189+ navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
190 }
190 }
191 }
191 }
192
192
@@ -194,9 +194,9 @@ AbstractButton {
194 target: scope
194 target: scope
195 onHasNavigationChanged: {
195 onHasNavigationChanged: {
196 if (scope.hasNavigation) {
196 if (scope.hasNavigation) {
197− departmentModel.append({"navigationId": scope.currentNavigationId, "nullifyDepartment": false});
197+ navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
198 } else {
198 } else {
199− departmentModel.clear();
199+ navigationModel.clear();
200 }
200 }
201 }
201 }
202 }
202 }
qml/Dash/DashNavigationList.qml+13−13
@@ -19,12 +19,12 @@ import Ubuntu.Components 1.1
19
19
20Item {
20Item {
21 id: root
21 id: root
22− property var department: null
22+ property var navigation: null
23− property var currentDepartment: null
23+ property var currentNavigation: null
24 property var scopeStyle: null
24 property var scopeStyle: null
25− signal enterDepartment(var newNavigationId, var departmentQuery, bool hasChildren)
25+ signal enterNavigation(var newNavigationId, var navigationQuery, bool hasChildren)
26 signal goBackToParentClicked()
26 signal goBackToParentClicked()
27− signal allDepartmentClicked()
27+ signal allNavigationClicked()
28
28
29 readonly property int itemHeight: units.gu(5)
29 readonly property int itemHeight: units.gu(5)
30 readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"
30 readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"
@@ -38,7 +38,7 @@ Item {
38 ActivityIndicator {
38 ActivityIndicator {
39 id: loadingIndicator
39 id: loadingIndicator
40 anchors.centerIn: parent
40 anchors.centerIn: parent
41− running: !(department && department.loaded)
41+ running: !(navigation && navigation.loaded)
42 }
42 }
43 clip: true
43 clip: true
44
44
@@ -68,7 +68,7 @@ Item {
68 id: backButton
68 id: backButton
69 objectName: "backButton"
69 objectName: "backButton"
70 width: parent.width
70 width: parent.width
71− visible: department && !department.isRoot || false
71+ visible: navigation && !navigation.isRoot || false
72 height: itemHeight
72 height: itemHeight
73
73
74 onClicked: root.goBackToParentClicked();
74 onClicked: root.goBackToParentClicked();
@@ -92,7 +92,7 @@ Item {
92 left: backImage.right
92 left: backImage.right
93 leftMargin: units.gu(0.5)
93 leftMargin: units.gu(0.5)
94 }
94 }
95− text: department ? department.parentLabel : ""
95+ text: navigation ? navigation.parentLabel : ""
96 color: root.foregroundColor
96 color: root.foregroundColor
97 }
97 }
98
98
@@ -114,7 +114,7 @@ Item {
114 id: allButton
114 id: allButton
115 objectName: "allButton"
115 objectName: "allButton"
116 width: parent.width
116 width: parent.width
117− visible: department && (!department.isRoot || (root.currentDepartment && !root.currentDepartment.isRoot && root.currentDepartment.parentNavigationId == department.navigationId)) || false
117+ visible: navigation && (!navigation.isRoot || (root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
118 height: itemHeight
118 height: itemHeight
119
119
120 Label {
120 Label {
@@ -123,7 +123,7 @@ Item {
123 left: parent.left
123 left: parent.left
124 leftMargin: units.gu(2)
124 leftMargin: units.gu(2)
125 }
125 }
126− text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""
126+ text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
127 font.bold: true
127 font.bold: true
128 color: root.foregroundColor
128 color: root.foregroundColor
129 }
129 }
@@ -141,18 +141,18 @@ Item {
141 height: units.dp(1)
141 height: units.dp(1)
142 }
142 }
143
143
144− onClicked: root.allDepartmentClicked();
144+ onClicked: root.allNavigationClicked();
145 }
145 }
146
146
147 Repeater {
147 Repeater {
148− model: department && department.loaded ? department : null
148+ model: navigation && navigation.loaded ? navigation : null
149 clip: true
149 clip: true
150 delegate: AbstractButton {
150 delegate: AbstractButton {
151 objectName: root.objectName + "child" + index
151 objectName: root.objectName + "child" + index
152 height: root.itemHeight
152 height: root.itemHeight
153 width: root.width
153 width: root.width
154
154
155− onClicked: root.enterDepartment(navigationId, query, hasChildren)
155+ onClicked: root.enterNavigation(navigationId, query, hasChildren)
156
156
157 Label {
157 Label {
158 anchors {
158 anchors {
@@ -188,7 +188,7 @@ Item {
188 color: root.foregroundColor
188 color: root.foregroundColor
189 opacity: 0.1
189 opacity: 0.1
190 height: units.dp(1)
190 height: units.dp(1)
191− visible: index != department.count - 1
191+ visible: index != navigation.count - 1
192 }
192 }
193 }
193 }
194 }
194 }
tests/qmltests/Dash/tst_DashContent.qml+93−93
@@ -265,119 +265,119 @@ Item {
265 verify(carouselLV.tileWidth / carouselLV.tileHeight == cardTool.components["art"]["aspect-ratio"]);
265 verify(carouselLV.tileWidth / carouselLV.tileHeight == cardTool.components["art"]["aspect-ratio"]);
266 }
266 }
267
267
268− function test_departments() {
268+ function test_navigations() {
269 var dashContentList = findChild(dashContent, "dashContentList");
269 var dashContentList = findChild(dashContent, "dashContentList");
270− tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashDepartments") != null; }, true);
270+ tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
271− var dashDepartments = findChild(dashContentList.currentItem, "dashDepartments");
271+ var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
272− tryCompare(dashDepartments, "visible", true);
272+ tryCompare(dashNavigation, "visible", true);
273− compare(dashDepartments.showList, false);
273+ compare(dashNavigation.showList, false);
274− waitForRendering(dashDepartments);
274+ waitForRendering(dashNavigation);
275− mouseClick(dashDepartments, 0, 0);
275+ mouseClick(dashNavigation, 0, 0);
276− compare(dashDepartments.showList, true);
276+ compare(dashNavigation.showList, true);
277−
277+
278− var departmentListView = findChild(dashDepartments, "departmentListView");
278+ var navigationListView = findChild(dashNavigation, "navigationListView");
279− compare(departmentListView.count, 1);
279+ compare(navigationListView.count, 1);
280− tryCompare(departmentListView.currentItem.department, "loaded", true);
280+ tryCompare(navigationListView.currentItem.navigation, "loaded", true);
281−
281+
282− waitForRendering(departmentListView);
282+ waitForRendering(navigationListView);
283− waitForRendering(departmentListView.currentItem);
283+ waitForRendering(navigationListView.currentItem);
284−
284+
285− var allButton = findChild(dashDepartments, "allButton");
285+ var allButton = findChild(dashNavigation, "allButton");
286 compare(allButton.visible, false);
286 compare(allButton.visible, false);
287
287
288− var department = findChild(dashDepartments, "department0child3");
288+ var navigation = findChild(dashNavigation, "navigation0child3");
289− mouseClick(department, 0, 0);
289+ mouseClick(navigation, 0, 0);
290− compare(dashDepartments.showList, false);
290+ compare(dashNavigation.showList, false);
291− tryCompare(dashDepartments.currentDepartment, "navigationId", "middle3");
291+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");
292− tryCompare(departmentListView.currentItem.department, "navigationId", "root");
292+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
293
293
294− mouseClick(dashDepartments, 0, 0);
294+ mouseClick(dashNavigation, 0, 0);
295− compare(dashDepartments.showList, true);
295+ compare(dashNavigation.showList, true);
296− waitForRendering(departmentListView);
296+ waitForRendering(navigationListView);
297− waitForRendering(departmentListView.currentItem);
297+ waitForRendering(navigationListView.currentItem);
298 compare(allButton.visible, true);
298 compare(allButton.visible, true);
299
299
300 mouseClick(allButton, 0, 0);
300 mouseClick(allButton, 0, 0);
301− compare(dashDepartments.showList, false);
301+ compare(dashNavigation.showList, false);
302− tryCompare(dashDepartments.currentDepartment, "navigationId", "root");
302+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
303− tryCompare(departmentListView.currentItem.department, "navigationId", "root");
303+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
304−
304+
305− mouseClick(dashDepartments, 0, 0);
305+ mouseClick(dashNavigation, 0, 0);
306− compare(dashDepartments.showList, true);
306+ compare(dashNavigation.showList, true);
307− waitForRendering(departmentListView);
307+ waitForRendering(navigationListView);
308− waitForRendering(departmentListView.currentItem);
308+ waitForRendering(navigationListView.currentItem);
309 compare(allButton.visible, false);
309 compare(allButton.visible, false);
310
310
311− department = findChild(dashDepartments, "department0child2");
311+ navigation = findChild(dashNavigation, "navigation0child2");
312− mouseClick(department, 0, 0);
312+ mouseClick(navigation, 0, 0);
313− compare(dashDepartments.showList, true);
313+ compare(dashNavigation.showList, true);
314− tryCompare(dashDepartments.currentDepartment, "navigationId", "middle2");
314+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
315− tryCompare(departmentListView.currentItem.department, "navigationId", "middle2");
315+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
316
316
317− var departmentList1 = findChild(dashDepartments, "department1");
317+ var navigationList1 = findChild(dashNavigation, "navigation1");
318− allButton = findChild(departmentList1, "allButton");
318+ allButton = findChild(navigationList1, "allButton");
319− var backButton = findChild(findChild(departmentList1, "department1"), "backButton");
319+ var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");
320 compare(allButton.visible, true);
320 compare(allButton.visible, true);
321 compare(backButton.visible, true);
321 compare(backButton.visible, true);
322
322
323− tryCompare(departmentListView, "contentX", departmentList1.x);
323+ tryCompare(navigationListView, "contentX", navigationList1.x);
324− waitForRendering(departmentListView);
324+ waitForRendering(navigationListView);
325 mouseClick(allButton, 0, 0);
325 mouseClick(allButton, 0, 0);
326− compare(dashDepartments.showList, false);
326+ compare(dashNavigation.showList, false);
327− tryCompare(dashDepartments.currentDepartment, "navigationId", "middle2");
327+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
328− tryCompare(departmentListView.currentItem.department, "navigationId", "middle2");
328+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
329−
329+
330− mouseClick(dashDepartments, 0, 0);
330+ mouseClick(dashNavigation, 0, 0);
331− compare(dashDepartments.showList, true);
331+ compare(dashNavigation.showList, true);
332− waitForRendering(departmentListView);
332+ waitForRendering(navigationListView);
333− waitForRendering(departmentListView.currentItem);
333+ waitForRendering(navigationListView.currentItem);
334 compare(allButton.visible, true);
334 compare(allButton.visible, true);
335 compare(backButton.visible, true);
335 compare(backButton.visible, true);
336
336
337− tryCompare(departmentList1.department, "loaded", true);
337+ tryCompare(navigationList1.navigation, "loaded", true);
338− department = findChild(dashDepartments, "department1child2");
338+ navigation = findChild(dashNavigation, "navigation1child2");
339− mouseClick(department, 0, 0);
339+ mouseClick(navigation, 0, 0);
340− compare(dashDepartments.showList, false);
340+ compare(dashNavigation.showList, false);
341− tryCompare(dashDepartments.currentDepartment, "navigationId", "childmiddle22");
341+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");
342− tryCompare(departmentListView.currentItem.department, "navigationId", "middle2");
342+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
343−
343+
344− mouseClick(dashDepartments, 0, 0);
344+ mouseClick(dashNavigation, 0, 0);
345− compare(dashDepartments.showList, true);
345+ compare(dashNavigation.showList, true);
346− waitForRendering(departmentListView);
346+ waitForRendering(navigationListView);
347− waitForRendering(departmentListView.currentItem);
347+ waitForRendering(navigationListView.currentItem);
348−
348+
349− tryCompare(departmentList1.department, "loaded", true);
349+ tryCompare(navigationList1.navigation, "loaded", true);
350− department = findChild(dashDepartments, "department1child3");
350+ navigation = findChild(dashNavigation, "navigation1child3");
351− mouseClick(department, 0, 0);
351+ mouseClick(navigation, 0, 0);
352− compare(dashDepartments.showList, false);
352+ compare(dashNavigation.showList, false);
353− tryCompare(dashDepartments.currentDepartment, "navigationId", "childmiddle23");
353+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");
354− tryCompare(departmentListView.currentItem.department, "navigationId", "middle2");
354+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
355−
355+
356− mouseClick(dashDepartments, 0, 0);
356+ mouseClick(dashNavigation, 0, 0);
357− compare(dashDepartments.showList, true);
357+ compare(dashNavigation.showList, true);
358− waitForRendering(departmentListView);
358+ waitForRendering(navigationListView);
359− waitForRendering(departmentListView.currentItem);
359+ waitForRendering(navigationListView.currentItem);
360 mouseClick(backButton, 0, 0);
360 mouseClick(backButton, 0, 0);
361
361
362− tryCompare(dashDepartments.currentDepartment, "navigationId", "root");
362+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
363− tryCompare(departmentListView.currentItem.department, "navigationId", "root");
363+ tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
364− compare(dashDepartments.showList, true);
364+ compare(dashNavigation.showList, true);
365− mouseClick(dashDepartments, 0, 0);
365+ mouseClick(dashNavigation, 0, 0);
366− compare(dashDepartments.showList, false);
366+ compare(dashNavigation.showList, false);
367−
367+
368− mouseClick(dashDepartments, 0, 0);
368+ mouseClick(dashNavigation, 0, 0);
369− compare(dashDepartments.showList, true);
369+ compare(dashNavigation.showList, true);
370− tryCompare(departmentListView.currentItem.department, "loaded", true);
370+ tryCompare(navigationListView.currentItem.navigation, "loaded", true);
371− department = findChild(dashDepartments, "department0child2");
371+ navigation = findChild(dashNavigation, "navigation0child2");
372− mouseClick(department, 0, 0);
372+ mouseClick(navigation, 0, 0);
373− compare(dashDepartments.showList, true);
373+ compare(dashNavigation.showList, true);
374− departmentList1 = findChild(dashDepartments, "department1");
374+ navigationList1 = findChild(dashNavigation, "navigation1");
375− compare(departmentList1.department.loaded, false);
375+ compare(navigationList1.navigation.loaded, false);
376− tryCompare(dashDepartments.currentDepartment, "navigationId", "middle2");
376+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
377− allButton = findChild(departmentList1, "allButton");
377+ allButton = findChild(navigationList1, "allButton");
378− tryCompare(dashDepartments.currentDepartment, "navigationId", "middle2");
378+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
379 mouseClick(allButton, 0, 0);
379 mouseClick(allButton, 0, 0);
380− tryCompare(dashDepartments.currentDepartment, "navigationId", "middle2");
380+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
381 }
381 }
382 }
382 }
383}
383}