Merge lp:~unity-team/unity8/scopes-v4 into lp:unity8

[Albert Astals Cid]

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

 * Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~unity-team/unity-api/scopes-v4/+merge/228346

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Albert Astals Cid (aacid)]

review: Abstain

[lp:~unity-team/unity8/scopes-v4]

1095. By Albert Astals Cid on 2014-08-04

Fix scope tool

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/unity8-ci/3743/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2966/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/837/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/837/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/837/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4209/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3743/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/scopes-v4]

1096. By Albert Astals Cid on 2014-08-04

need new api-dev

1097. By Albert Astals Cid on 2014-08-04

Adapt to API changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1095
http://jenkins.qa.ubuntu.com/job/unity8-ci/3747/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2978/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/749/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/841/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/841/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/841/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4221/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3747/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/unity8-ci/3752/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3004/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/754/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4247/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3752/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/scopes-v4]

1098. By Albert Astals Cid on 2014-08-05

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/unity8-ci/3761/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3053/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/763/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/855/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/855/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/855/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4296/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3761/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/scopes-v4]

1099. By Albert Astals Cid on 2014-08-06

Dummy implement refresh()

1100. By Albert Astals Cid on 2014-08-06

Merge dashSepartmentsListTweaks

1101. By Albert Astals Cid on 2014-08-06

Merge unstable departments test

1102. By Albert Astals Cid on 2014-08-06

Fix merge/tests

1103. By Albert Astals Cid on 2014-08-06

more renaming

1104. By Albert Astals Cid on 2014-08-06

New need implementation

1105. By Albert Astals Cid on 2014-08-06

More updates

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1101
http://jenkins.qa.ubuntu.com/job/unity8-ci/3790/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3093/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/792/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/884/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/884/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/884/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4337/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3790/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-07-31 16:48:11 +0000
+++ debian/control	2014-08-06 10:17:24 +0000
@@ -24,7 +24,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.87),
+               libunity-api-dev (>= 7.88),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
 
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-07-29 11:35:10 +0000
+++ qml/Dash/Dash.qml	2014-08-06 10:17:24 +0000
@@ -38,7 +38,13 @@
     }
 
     function setCurrentScope(scopeId, animate, reset) {
-        var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)
+        var scopeIndex = -1;
+        for (var i = 0; i < scopes.count; ++i) {
+            if (scopes.getScope(i).id == scopeId) {
+                scopeIndex = i;
+                break;
+            }
+        }
 
         if (scopeIndex == -1) {
             console.warn("No match for scope with id: %1".arg(scopeId))
@@ -63,15 +69,8 @@
         }
     }
 
-    SortFilterProxyModel {
-        id: filteredScopes
-        model: Scopes {
-            id: scopes
-        }
-        dynamicSortFilter: true
-
-        filterRole: Scopes.RoleVisible
-        filterRegExp: RegExp("^true$")
+    Scopes {
+        id: scopes
     }
 
     DashContent {
@@ -79,7 +78,6 @@
         objectName: "dashContent"
         width: parent.width
         height: parent.height
-        model: filteredScopes
         scopes: scopes
         visible: x != -width
         onGotoScope: {
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-07-24 23:31:44 +0000
+++ qml/Dash/DashContent.qml	2014-08-06 10:17:24 +0000
@@ -23,8 +23,7 @@
 Item {
     id: dashContent
 
-    property var model: null
-    property var scopes: null
+    property alias scopes: dashContentList.model
     readonly property alias currentIndex: dashContentList.currentIndex
 
     signal scopeLoaded(string scopeId)
@@ -89,10 +88,9 @@
             id: dashContentList
             objectName: "dashContentList"
 
-            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving
+            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.departmentsShown
 
             anchors.fill: parent
-            model: dashContent.model
             orientation: ListView.Horizontal
             boundsBehavior: Flickable.DragAndOvershootBounds
             flickDeceleration: units.gu(625)
@@ -130,6 +128,7 @@
                     objectName: scope.id + " loader"
 
                     readonly property bool moving: item ? item.moving : false
+                    readonly property bool departmentsShown: item ? item.departmentsShown : false
                     readonly property var categoryView: item ? item.categoryView : null
                     readonly property var theScope: scope
 
 
=== renamed file 'qml/Dash/DashDepartments.qml' => 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashDepartments.qml	2014-07-08 11:08:19 +0000
+++ qml/Dash/DashNavigation.qml	2014-08-06 10:17:24 +0000
@@ -15,17 +15,17 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 AbstractButton {
     id: root
-    objectName: "dashDepartments"
+    objectName: "dashNavigation"
 
     property var scope: null
 
     property bool showList: false
 
-    readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
+    readonly property var currentNavigation: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null
 
     property alias windowWidth: blackRect.width
     property alias windowHeight: blackRect.height
@@ -34,20 +34,21 @@
     // Are we drilling down the tree or up?
     property bool isGoingBack: false
 
-    visible: root.currentDepartment != null
+    visible: root.currentNavigation != null
 
     height: visible ? units.gu(5) : 0
 
     onClicked: {
+        departmentListView.updateMaxHeight();
         root.showList = !root.showList;
     }
 
     Rectangle {
         id: blackRect
         color: "black"
-        opacity: departmentListView.currentItem && departmentListView.currentItem.visible ? 0.3 : 0
+        opacity: navigationListView.currentItem && navigationListView.currentItem.visible ? 0.3 : 0
         Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
-        anchors.top: departmentListView.top
+        anchors.top: navigationListView.top
         anchors.right: parent.right
         visible: opacity != 0
     }
@@ -78,7 +79,7 @@
         anchors.fill: parent
         anchors.margins: units.gu(2)
         verticalAlignment: Text.AlignVCenter
-        text: root.currentDepartment ? root.currentDepartment.label : ""
+        text: root.currentNavigation ? root.currentNavigation.label : ""
         color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
     }
 
@@ -92,18 +93,18 @@
         color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
     }
 
-    //  departmentListView is outside root
+    //  navigationListView is outside root
     ListView {
-        id: departmentListView
-        objectName: "departmentListView"
+        id: navigationListView
+        objectName: "navigationListView"
         orientation: ListView.Horizontal
         interactive: false
         clip: root.width != windowWidth
         model: ListModel {
-            id: departmentModel
+            id: navigationModel
             // We have two roles
-            // departmentId: the department id of the department the list represents
-            // nullifyDepartment: overrides departmentId to be null
+            // navigationId: the navigation id of the navigation the list represents
+            // nullifyNavigation: overrides navigationId to be null
             //                    This is used to "clear" the delegate when going "right" on the tree
         }
         anchors {
@@ -111,7 +112,12 @@
             right: parent.right
             top: root.bottom
         }
-        readonly property int maxHeight: (windowHeight - mapToItem(null, root.x, root.y).y) - units.gu(8)
+        property int maxHeight: -1
+        Component.onCompleted: updateMaxHeight();
+        function updateMaxHeight()
+        {
+            maxHeight = (windowHeight - mapToItem(null, 0, 0).y) - units.gu(8);
+        }
         property int prevHeight: maxHeight
         height: currentItem ? currentItem.height : maxHeight
         onHeightChanged: {
@@ -120,83 +126,84 @@
             }
         }
         highlightMoveDuration: UbuntuAnimation.FastDuration
-        delegate: DashDepartmentsList {
-            objectName: "department" + index
+        delegate: DashNavigationList {
+            objectName: "navigation" + index
             visible: height != 0
-            width: departmentListView.width
+            width: navigationListView.width
             scopeStyle: root.scopeStyle
             property real desiredHeight: {
                 if (root.showList) {
-                    if (department && department.loaded && x == departmentListView.contentX)
+                    if (navigation && navigation.loaded && x == navigationListView.contentX)
                     {
-                        return Math.min(implicitHeight, departmentListView.maxHeight);
+                        navigationListView.updateMaxHeight();
+                        return Math.min(implicitHeight, navigationListView.maxHeight);
                     } else {
-                        return departmentListView.prevHeight;
+                        return navigationListView.prevHeight;
                     }
                 } else {
                     return 0;
                 }
             }
             height: desiredHeight
-            department: (nullifyDepartment || !scope) ? null : scope.getDepartment(departmentId)
-            currentDepartment: root.currentDepartment
-            onEnterDepartment: {
-                scope.loadDepartment(newDepartmentId);
+            navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
+            currentNavigation: root.currentNavigation
+            onEnterNavigation: {
+                scope.setNavigationState(newNavigationId, false);
                 // We only need to add a new item to the model
                 // if we have children, otherwise just load it
                 if (hasChildren) {
                     isGoingBack = false;
-                    departmentModel.append({"departmentId": newDepartmentId, "nullifyDepartment": false});
-                    departmentListView.currentIndex++;
+                    navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
+                    navigationListView.currentIndex++;
                 } else {
                     showList = false;
                 }
             }
             onGoBackToParentClicked: {
-                scope.loadDepartment(department.parentDepartmentId);
+                scope.setNavigationState(navigation.parentNavigationId, false);
                 isGoingBack = true;
-                departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);
-                departmentListView.currentIndex--;
+                navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
+                navigationListView.currentIndex--;
             }
-            onAllDepartmentClicked: {
+            onAllNavigationClicked: {
                 showList = false;
-                if (root.currentDepartment.parentDepartmentId == department.departmentId) {
+                if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
                     // For leaves we have to go to the parent too
-                    scope.loadDepartment(root.currentDepartment.parentDepartmentId);
+                    scope.setNavigationState(root.currentNavigation.parentNavigationId, false);
                 }
             }
         }
         onContentXChanged: {
-            if (contentX == width * departmentListView.currentIndex) {
+            if (contentX == width * navigationListView.currentIndex) {
                 if (isGoingBack) {
-                    departmentModel.remove(departmentListView.currentIndex + 1);
+                    navigationModel.remove(navigationListView.currentIndex + 1);
                 } else {
-                    departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", true);
+                    navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", true);
                 }
             }
         }
     }
 
     InverseMouseArea {
-        anchors.fill: departmentListView
+        anchors.fill: navigationListView
         enabled: root.showList
         onClicked: root.showList = false
     }
 
     onScopeChanged: {
-        departmentModel.clear();
-        if (scope && scope.hasDepartments) {
-            departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
+        navigationModel.clear();
+        if (scope && scope.hasNavigation) {
+            navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
         }
     }
 
     Connections {
         target: scope
-        onHasDepartmentsChanged: {
-            if (scope.hasDepartments) {
-                departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
+        onHasNavigationChanged: {
+            if (scope.hasNavigation) {
+                navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
             } else {
-                departmentModel.clear();
+                navigationModel.clear();
             }
         }
     }
 
=== renamed file 'qml/Dash/DashDepartmentsList.qml' => 'qml/Dash/DashNavigationList.qml'
--- qml/Dash/DashDepartmentsList.qml	2014-07-08 11:08:19 +0000
+++ qml/Dash/DashNavigationList.qml	2014-08-06 10:17:24 +0000
@@ -15,16 +15,16 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: root
-    property var department: null
-    property var currentDepartment: null
+    property var navigation: null
+    property var currentNavigation: null
     property var scopeStyle: null
-    signal enterDepartment(var newDepartmentId, bool hasChildren)
+    signal enterNavigation(var newNavigationId, bool hasChildren)
     signal goBackToParentClicked()
-    signal allDepartmentClicked()
+    signal allNavigationClicked()
 
     readonly property int itemHeight: units.gu(5)
     readonly property color foregroundColor: root.scopeStyle ? root.scopeStyle.foreground : "grey"
@@ -38,7 +38,7 @@
     ActivityIndicator {
         id: loadingIndicator
         anchors.centerIn: parent
-        running: !(department && department.loaded)
+        running: !(navigation && navigation.loaded)
     }
     clip: true
 
@@ -54,6 +54,7 @@
 
         anchors.fill: parent
 
+        flickableDirection: Flickable.VerticalFlick
         contentHeight: column.height
         contentWidth: width
 
@@ -68,7 +69,7 @@
                 id: backButton
                 objectName: "backButton"
                 width: parent.width
-                visible: department && !department.isRoot || false
+                visible: navigation && !navigation.isRoot || false
                 height: itemHeight
 
                 onClicked: root.goBackToParentClicked();
@@ -92,7 +93,7 @@
                         left: backImage.right
                         leftMargin: units.gu(0.5)
                     }
-                    text: department ? department.parentLabel : ""
+                    text: navigation ? navigation.parentLabel : ""
                     color: root.foregroundColor
                 }
 
@@ -114,7 +115,7 @@
                 id: allButton
                 objectName: "allButton"
                 width: parent.width
-                visible: department && (!department.isRoot || (root.currentDepartment && !root.currentDepartment.isRoot && root.currentDepartment.parentDepartmentId == department.departmentId)) || false
+                visible: navigation && (!navigation.isRoot || (root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
                 height: itemHeight
 
                 Label {
@@ -123,7 +124,7 @@
                         left: parent.left
                         leftMargin: units.gu(2)
                     }
-                    text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""
+                    text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
                     font.bold: true
                     color: root.foregroundColor
                 }
@@ -141,18 +142,18 @@
                     height: units.dp(1)
                 }
 
-                onClicked: root.allDepartmentClicked();
+                onClicked: root.allNavigationClicked();
             }
 
             Repeater {
-                model: department && department.loaded ? department : null
+                model: navigation && navigation.loaded ? navigation : null
                 clip: true
                 delegate: AbstractButton {
                     objectName: root.objectName + "child" + index
                     height: root.itemHeight
                     width: root.width
 
-                    onClicked: root.enterDepartment(departmentId, hasChildren)
+                    onClicked: root.enterNavigation(navigationId, hasChildren)
 
                     Label {
                         anchors {
@@ -188,7 +189,7 @@
                         color: root.foregroundColor
                         opacity: 0.1
                         height: units.dp(1)
-                        visible: index != department.count - 1
+                        visible: index != navigation.count - 1
                     }
                 }
             }
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-29 11:35:10 +0000
+++ qml/Dash/GenericScopeView.qml	2014-08-06 10:17:24 +0000
@@ -25,6 +25,7 @@
 FocusScope {
     id: scopeView
 
+    readonly property alias departmentsShown: dashNavigation.showList
     property var scope: null
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent: false
@@ -39,16 +40,6 @@
 
     signal backClicked()
 
-    onScopeChanged: {
-        if (scope) {
-            scope.activateApplication.connect(activateApp);
-        }
-    }
-
-    function activateApp(appId) {
-        Qt.openUrlExternally(appId);
-    }
-
     function positionAtBeginning() {
         categoryView.positionAtBeginning()
     }
@@ -119,6 +110,7 @@
         model: scopeView.categories
         forceNoClip: previewListView.open
         pixelAligned: true
+        interactive: !dashNavigation.showList
 
         property string expandedCategoryId: ""
 
@@ -390,7 +382,8 @@
             searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false
             scopeStyle: scopeView.scopeStyle
 
-            bottomItem: DashDepartments {
+            bottomItem: DashNavigation {
+                id: dashNavigation
                 scope: scopeView.scope
                 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
                 anchors.right: parent.right
 
=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2014-07-03 09:08:22 +0000
+++ qml/ScopeTool.qml	2014-08-06 10:17:24 +0000
@@ -45,16 +45,6 @@
         signal searchClicked
     }
 
-    SortFilterProxyModel {
-        id: filteredScopes
-        model: Scopes {
-            id: scopes
-        }
-        dynamicSortFilter: true
-
-        filterRole: Scopes.RoleVisible
-        filterRegExp: RegExp("^true$")
-    }
 
     Rectangle {
         anchors.fill: dashContent
@@ -72,8 +62,8 @@
     DashContent {
         id: dashContent
 
-        model: filteredScopes
         property var scope: scopes.getScope(currentIndex)
+        scopes: Scopes { }
 
         anchors {
             top: parent.top
 
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2014-08-05 12:06:16 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2014-08-06 10:17:24 +0000
@@ -7,7 +7,7 @@
 pkg_search_module(DEE dee-1.0 REQUIRED)
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
 pkg_search_module(DEEQT libdee-qt5 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -23,14 +23,14 @@
   fake_scope.cpp
   fake_scopes.cpp
   fake_categories.cpp
-  fake_department.cpp
+  fake_navigation.cpp
   fake_resultsmodel.cpp
   fake_previewmodel.cpp
   fake_previewstack.cpp
   fake_previewwidgetmodel.cpp
   fake_unity_plugin.cpp
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h
-  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/DepartmentInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/NavigationInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewStackInterface.h
   ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewWidgetModelInterface.h
 
=== modified file 'tests/mocks/Unity/Unity.qmltypes'
--- tests/mocks/Unity/Unity.qmltypes	2014-07-10 10:59:08 +0000
+++ tests/mocks/Unity/Unity.qmltypes	2014-08-06 10:17:24 +0000
@@ -24,6 +24,12 @@
             Parameter { name: "categoryId"; type: "string" }
             Parameter { name: "json"; type: "string" }
         }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "role"; type: "int" }
+        }
     }
     Component {
         name: "PreviewModel"
@@ -81,13 +87,14 @@
             Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
         }
         Method {
-            name: "getDepartment"
-            type: "unity::shell::scopes::DepartmentInterface*"
-            Parameter { name: "id"; type: "string" }
+            name: "getNavigation"
+            type: "unity::shell::scopes::NavigationInterface*"
+            Parameter { name: "navigationId"; type: "string" }
         }
         Method {
-            name: "loadDepartment"
-            Parameter { name: "id"; type: "string" }
+            name: "getAltNavigation"
+            type: "unity::shell::scopes::NavigationInterface*"
+            Parameter { name: "altNavigationId"; type: "string" }
         }
         Method {
             name: "performQuery"
@@ -137,6 +144,7 @@
                 "RoleRawRendererTemplate": 3,
                 "RoleRenderer": 4,
                 "RoleComponents": 5,
+                "RoleHeaderLink": 6,
                 "RoleResults": 7,
                 "RoleCount": 8
             }
@@ -157,27 +165,31 @@
         }
     }
     Component {
-        name: "unity::shell::scopes::DepartmentInterface"
+        name: "unity::shell::scopes::NavigationInterface"
         prototype: "QAbstractListModel"
-        exports: ["Unity/Department 0.2"]
+        exports: ["Unity/Navigation 0.2"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "Roles"
             values: {
-                "RoleDepartmentId": 0,
-                "RoleLabel": 1,
-                "RoleHasChildren": 2,
-                "RoleIsActive": 3
+                "RoleNavigationId": 0,
+                "RoleQuery": 1,
+                "RoleLabel": 2,
+                "RoleHasChildren": 3,
+                "RoleIsActive": 4
             }
         }
-        Property { name: "departmentId"; type: "string"; isReadonly: true }
+        Property { name: "navigationId"; type: "string"; isReadonly: true }
+        Property { name: "query"; type: "string"; isReadonly: true }
         Property { name: "label"; type: "string"; isReadonly: true }
         Property { name: "allLabel"; type: "string"; isReadonly: true }
-        Property { name: "parentDepartmentId"; type: "string"; isReadonly: true }
+        Property { name: "parentNavigationId"; type: "string"; isReadonly: true }
+        Property { name: "parentQuery"; type: "string"; isReadonly: true }
         Property { name: "parentLabel"; type: "string"; isReadonly: true }
         Property { name: "loaded"; type: "bool"; isReadonly: true }
         Property { name: "isRoot"; type: "bool"; isReadonly: true }
+        Property { name: "hidden"; type: "bool"; isReadonly: true }
         Property { name: "count"; type: "int"; isReadonly: true }
     }
     Component {
@@ -247,7 +259,8 @@
                 "RoleEmblem": 8,
                 "RoleSummary": 9,
                 "RoleAttributes": 10,
-                "RoleBackground": 11
+                "RoleBackground": 11,
+                "RoleOverlayColor": 12
             }
         }
         Property { name: "categoryId"; type: "string" }
@@ -259,13 +272,22 @@
         exports: ["Unity/Scope 0.2"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Status"
+            values: {
+                "Okay": 0,
+                "NoInternet": 1,
+                "NoLocationData": 2,
+                "Unknown": 3
+            }
+        }
         Property { name: "id"; type: "string"; isReadonly: true }
         Property { name: "name"; type: "string"; isReadonly: true }
         Property { name: "iconHint"; type: "string"; isReadonly: true }
         Property { name: "description"; type: "string"; isReadonly: true }
         Property { name: "searchHint"; type: "string"; isReadonly: true }
         Property { name: "searchInProgress"; type: "bool"; isReadonly: true }
-        Property { name: "visible"; type: "bool"; isReadonly: true }
+        Property { name: "favorite"; type: "bool" }
         Property { name: "shortcut"; type: "string"; isReadonly: true }
         Property {
             name: "categories"
@@ -273,13 +295,27 @@
             isReadonly: true
             isPointer: true
         }
+        Property {
+            name: "settings"
+            type: "unity::shell::scopes::SettingsModelInterface"
+            isReadonly: true
+            isPointer: true
+        }
         Property { name: "searchQuery"; type: "string" }
         Property { name: "noResultsHint"; type: "string" }
         Property { name: "formFactor"; type: "string" }
         Property { name: "isActive"; type: "bool" }
-        Property { name: "currentDepartmentId"; type: "string"; isReadonly: true }
-        Property { name: "hasDepartments"; type: "bool"; isReadonly: true }
+        Property { name: "currentNavigationId"; type: "string"; isReadonly: true }
+        Property { name: "hasNavigation"; type: "bool"; isReadonly: true }
+        Property { name: "currentAltNavigationId"; type: "string"; isReadonly: true }
+        Property { name: "hasAltNavigation"; type: "bool"; isReadonly: true }
         Property { name: "customizations"; type: "QVariantMap"; isReadonly: true }
+        Property {
+            name: "status"
+            type: "unity::shell::scopes::ScopeInterface::Status"
+            isReadonly: true
+        }
+        Signal { name: "detailsChanged" }
         Signal { name: "showDash" }
         Signal { name: "hideDash" }
         Signal {
@@ -317,13 +353,18 @@
             Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
         }
         Method {
-            name: "getDepartment"
-            type: "unity::shell::scopes::DepartmentInterface*"
-            Parameter { name: "departmentId"; type: "string" }
-        }
-        Method {
-            name: "loadDepartment"
-            Parameter { name: "departmentId"; type: "string" }
+            name: "getNavigation"
+            type: "unity::shell::scopes::NavigationInterface*"
+            Parameter { name: "navigationId"; type: "string" }
+        }
+        Method {
+            name: "getAltNavigation"
+            type: "unity::shell::scopes::NavigationInterface*"
+            Parameter { name: "altNavigationId"; type: "string" }
+        }
+        Method {
+            name: "performQuery"
+            Parameter { name: "cannedQuery"; type: "string" }
         }
     }
     Component {
@@ -334,11 +375,17 @@
             values: {
                 "RoleScope": 0,
                 "RoleId": 1,
-                "RoleVisible": 2,
-                "RoleTitle": 3
+                "RoleTitle": 2
             }
         }
         Property { name: "loaded"; type: "bool"; isReadonly: true }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property {
+            name: "overviewScope"
+            type: "unity::shell::scopes::ScopeInterface"
+            isReadonly: true
+            isPointer: true
+        }
         Method {
             name: "getScope"
             type: "unity::shell::scopes::ScopeInterface*"
 
=== renamed file 'tests/mocks/Unity/fake_department.cpp' => 'tests/mocks/Unity/fake_navigation.cpp'
--- tests/mocks/Unity/fake_department.cpp	2014-06-18 13:48:32 +0000
+++ tests/mocks/Unity/fake_navigation.cpp	2014-08-06 10:17:24 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fake_department.h"
+#include "fake_navigation.h"
 
 #include "fake_scope.h"
 
+#include <QDebug>
 #include <QTimer>
 
-Department::Department(const QString& departmentId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)
- : m_departmentId(departmentId)
+Navigation::Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)
+ : m_navigationId(navigationId)
  , m_label(label)
  , m_allLabel(allLabel)
  , m_parentId(parentId)
@@ -30,96 +31,87 @@
  , m_scope(scope)
 {
     QTimer::singleShot(1500, this, SLOT(slotLoaded()));
-    connect(scope, SIGNAL(currentDepartmentIdChanged()), this, SLOT(slotCurrentDepartmentChanged()));
+    connect(scope, SIGNAL(currentNavigationIdChanged()), this, SLOT(slotCurrentNavigationChanged()));
 }
 
-QString Department::departmentId() const
+QString Navigation::navigationId() const
 {
-    return m_departmentId;
+    return m_navigationId;
 }
 
-QString Department::label() const
+QString Navigation::label() const
 {
     return m_label;
 }
 
-QString Department::allLabel() const
+QString Navigation::allLabel() const
 {
     return m_allLabel;
 }
 
-QString Department::parentDepartmentId() const
+QString Navigation::parentNavigationId() const
 {
     return m_parentId;
 }
 
-QString Department::parentLabel() const
+QString Navigation::parentLabel() const
 {
     return m_parentLabel;
 }
 
-void Department::slotLoaded()
+void Navigation::slotLoaded()
 {
     m_loaded = true;
     Q_EMIT loadedChanged();
 }
 
-bool Department::loaded() const
+bool Navigation::loaded() const
 {
     return m_loaded;
 }
 
-int Department::count() const
+int Navigation::count() const
 {
     return rowCount();
 }
 
-bool Department::isRoot() const
-{
-    return m_departmentId == "root";
-}
-
-int Department::rowCount(const QModelIndex & /*parent*/) const
-{
-    if (!m_loaded || m_departmentId.startsWith("child") || m_departmentId == "middle3")
+bool Navigation::isRoot() const
+{
+    return m_navigationId == "root" || m_navigationId == "altroot";
+}
+
+bool Navigation::hidden() const
+{
+    return m_navigationId == "altroot";
+}
+
+int Navigation::rowCount(const QModelIndex & /*parent*/) const
+{
+    if (!m_loaded || m_navigationId.startsWith("child") || m_navigationId == "middle3")
         return 0;
     else
         return 8;
 }
 
-QHash<int, QByteArray> Department::roleNames() const
-{
-    QHash<int, QByteArray> res;
-    res[RoleDepartmentId] = "departmentId";
-    res[RoleLabel] = "label";
-    res[RoleHasChildren] = "hasChildren";
-    res[RoleIsActive] = "isActive";
-    return res;
-}
-
-QVariant Department::data(const QModelIndex &index, int role) const
+QVariant Navigation::data(const QModelIndex &index, int role) const
 {
     switch (role) {
-        case RoleDepartmentId:
-            if (m_departmentId == "root")
+        case RoleNavigationId:
+            if (m_navigationId == "root")
                 return QString("middle%1").arg(index.row());
-            else if (m_departmentId.startsWith("middle"))
-                return QString("child%1%2").arg(m_departmentId).arg(index.row());
-            break;
+            else if (m_navigationId.startsWith("middle"))
+                return QString("child%1%2").arg(m_navigationId).arg(index.row());
         case RoleLabel:
-            return QString("%1Child%2").arg(m_departmentId).arg(index.row());
-            break;
+            return QString("%1Child%2").arg(m_navigationId).arg(index.row());
         case RoleHasChildren:
-            return m_departmentId == "root" && index.row() != 3;
-            break;
+            return m_navigationId == "root" && index.row() != 3;
         case RoleIsActive:
-            return m_scope->currentDepartmentId() == data(index, RoleDepartmentId);
-            break;
+            return m_scope->currentNavigationId() == data(index, RoleNavigationId);
     }
     return QVariant();
 }
 
-void Department::slotCurrentDepartmentChanged()
+void Navigation::slotCurrentNavigationChanged()
 {
     // This is wasteful, should only emit it if really something changed in this
     // deparment, but this is a mock, so no need to optimize
 
=== renamed file 'tests/mocks/Unity/fake_department.h' => 'tests/mocks/Unity/fake_navigation.h'
--- tests/mocks/Unity/fake_department.h	2014-05-29 10:25:21 +0000
+++ tests/mocks/Unity/fake_navigation.h	2014-08-06 10:17:24 +0000
@@ -14,48 +14,48 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FAKE_DEPARTMENT_H
-#define FAKE_DEPARTMENT_H
+#ifndef FAKE_NAVIGATION_H
+#define FAKE_NAVIGATION_H
 
-#include <unity/shell/scopes/DepartmentInterface.h>
+#include <unity/shell/scopes/NavigationInterface.h>
 
 class Scope;
 
-class Department : public unity::shell::scopes::DepartmentInterface
+class Navigation : public unity::shell::scopes::NavigationInterface
 {
     Q_OBJECT
 
 public:
-    Department(const QString& departmentId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);
+    Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);
 
-    QString departmentId() const override;
+    QString navigationId() const override;
     QString label() const override;
     QString allLabel() const override;
-    QString parentDepartmentId() const override;
+    QString parentNavigationId() const override;
     QString parentLabel() const override;
     bool loaded() const override;
+    bool isRoot() const override;
+    bool hidden() const override;
     int count() const override;
-    bool isRoot() const override;
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    QHash<int, QByteArray> roleNames() const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
 public Q_SLOTS:
-    void slotCurrentDepartmentChanged();
+    void slotCurrentNavigationChanged();
 
 private Q_SLOTS:
     void slotLoaded();
 
 private:
-    QString m_departmentId;
+    QString m_navigationId;
     QString m_label;
     QString m_allLabel;
     QString m_parentId;
     QString m_parentLabel;
     bool m_loaded;
-    QString m_currentDepartment;
+    QString m_currentNavigation;
     Scope *m_scope;
 };
 
-#endif // FAKE_DEPARTMENT_H
+#endif // FAKE_NAVIGATION_H
 
=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-07-24 20:40:57 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-08-06 10:17:24 +0000
@@ -14,24 +14,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QDebug>
 #include <QUrl>
 
 #include "fake_scope.h"
-#include "fake_department.h"
+#include "fake_navigation.h"
 #include "fake_resultsmodel.h"
 
 Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)
 {
 }
 
-Scope::Scope(QString const& id, QString const& name, bool visible, QObject* parent, int categories)
+Scope::Scope(QString const& id, QString const& name, bool favorite, QObject* parent, int categories)
     : unity::shell::scopes::ScopeInterface(parent)
     , m_id(id)
     , m_name(name)
-    , m_visible(visible)
     , m_searching(false)
+    , m_favorite(favorite)
     , m_isActive(false)
-    , m_currentDeparment("root")
+    , m_currentNavigationId("root")
+    , m_currentAltNavigationId("altroot")
     , m_previewRendererName("preview-generic")
     , m_categories(new Categories(categories, this))
 {
@@ -77,6 +79,11 @@
     return m_searching;
 }
 
+bool Scope::favorite() const
+{
+    return m_favorite;
+}
+
 unity::shell::scopes::CategoriesInterface* Scope::categories() const
 {
     return m_categories;
@@ -97,11 +104,6 @@
     return m_formFactor;
 }
 
-bool Scope::visible() const
-{
-    return m_visible;
-}
-
 bool Scope::isActive() const
 {
     return m_isActive;
@@ -131,6 +133,13 @@
     }
 }
 
+void Scope::setFavorite(const bool favorite)
+{
+    if (favorite != m_favorite) {
+        m_favorite = favorite;
+        Q_EMIT favoriteChanged();
+    }
+}
 void Scope::setSearchInProgress(const bool inProg)
 {
     if (inProg != m_searching) {
@@ -170,14 +179,29 @@
     qFatal("Scope::closeScope is not implemented");
 }
 
-QString Scope::currentDepartmentId() const
-{
-    return m_currentDeparment;
-}
-
-bool Scope::hasDepartments() const
-{
-    return true;
+QString Scope::currentNavigationId() const
+{
+    return m_currentNavigationId;
+}
+
+bool Scope::hasNavigation() const
+{
+    return true;
+}
+
+QString Scope::currentAltNavigationId() const
+{
+    return m_currentAltNavigationId;
+}
+
+bool Scope::hasAltNavigation() const
+{
+    return true;
+}
+
+Scope::Status Scope::status() const
+{
+    return Status::Okay;
 }
 
 QVariantMap Scope::customizations() const
@@ -196,7 +220,12 @@
     return m;
 }
 
-unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)
+void Scope::refresh()
+{
+    qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";
+}
+
+unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)
 {
     if (id.isEmpty())
         return nullptr;
@@ -210,11 +239,30 @@
         parentId = id.mid(5, 7);
         parentLabel = parentId;
     }
-    return new Department(id, id, "all"+id, parentId, parentLabel, this);
-}
-
-void Scope::loadDepartment(const QString& id)
-{
-    m_currentDeparment = id;
-    Q_EMIT currentDepartmentIdChanged();
+    return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
+}
+
+unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& id)
+{
+    if (id.isEmpty())
+        return nullptr;
+
+    QString parentId;
+    QString parentLabel;
+    if (id.startsWith("altmiddle")) {
+        parentId = "altroot";
+        parentLabel = "altroot";
+    }
+    return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
+}
+
+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)
+{
+    if (isAltNavigation) {
+        m_currentAltNavigationId = navigationId;
+        Q_EMIT currentAltNavigationIdChanged();
+    } else {
+        m_currentNavigationId = navigationId;
+        Q_EMIT currentNavigationIdChanged();
+    }
 }
 
=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-07-11 16:39:33 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-08-06 10:17:24 +0000
@@ -30,7 +30,7 @@
 
 public:
     Scope(QObject* parent = 0);
-    Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0, int categories = 20);
+    Scope(QString const& id, QString const& name, bool favorite, QObject* parent = 0, int categories = 20);
 
     /* getters */
     QString id() const override;
@@ -38,9 +38,9 @@
     QString iconHint() const override;
     QString description() const override;
     QString searchHint() const override;
-    bool visible() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    bool favorite() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     QString searchQuery() const override;
     QString noResultsHint() const override;
@@ -53,6 +53,7 @@
     void setNoResultsHint(const QString& hint) override;
     void setFormFactor(const QString& form_factor) override;
     void setActive(const bool) override;
+    void setFavorite(const bool) override;
     Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits
 
     Q_INVOKABLE void activate(QVariant const& result) override;
@@ -60,14 +61,20 @@
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
 
-    QString currentDepartmentId() const override;
-    bool hasDepartments() const override;
-    Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;
-    Q_INVOKABLE void loadDepartment(const QString& id) override;
+    QString currentNavigationId() const  override;
+    bool hasNavigation() const  override;
+    QString currentAltNavigationId() const  override;
+    bool hasAltNavigation() const  override;
+    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;
+    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;
+    Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;
     Q_SIGNAL void performQuery(const QString& query) override;
 
+    Status status() const override;
     QVariantMap customizations() const override;
 
+    Q_INVOKABLE void refresh() override;
+
 protected:
 
     QString m_id;
@@ -77,10 +84,11 @@
     QString m_searchQuery;
     QString m_noResultsHint;
     QString m_formFactor;
-    bool m_visible;
     bool m_searching;
+    bool m_favorite;
     bool m_isActive;
-    QString m_currentDeparment;
+    QString m_currentNavigationId;
+    QString m_currentAltNavigationId;
 
     QString m_previewRendererName;
 
 
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2014-07-25 13:25:45 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2014-08-06 10:17:24 +0000
@@ -32,6 +32,11 @@
     timer.setSingleShot(true);
     timer.setInterval(100);
     QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateScopes()));
+
+    QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
+    QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
+    QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
+
     load();
 }
 
@@ -92,8 +97,6 @@
         return QVariant::fromValue(scope);
     } else if (role == Scopes::RoleId) {
         return QVariant::fromValue(scope->id());
-    } else if (role == Scopes::RoleVisible) {
-        return QVariant::fromValue(scope->visible());
     } else if (role == Scopes::RoleTitle) {
         return QVariant::fromValue(scope->name());
     } else {
@@ -125,6 +128,11 @@
     return m_loaded;
 }
 
+int Scopes::count() const
+{
+    return rowCount();
+}
+
 unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const
 {
     return nullptr;
 
=== modified file 'tests/mocks/Unity/fake_scopes.h'
--- tests/mocks/Unity/fake_scopes.h	2014-07-25 13:25:45 +0000
+++ tests/mocks/Unity/fake_scopes.h	2014-08-06 10:17:24 +0000
@@ -50,6 +50,7 @@
     QModelIndex parent ( const QModelIndex & index ) const;
 
     bool loaded() const override;
+    int count() const override;
     unity::shell::scopes::ScopeInterface* overviewScope() const override;
 
 private Q_SLOTS:
 
=== modified file 'tests/mocks/Unity/fake_unity_plugin.cpp'
--- tests/mocks/Unity/fake_unity_plugin.cpp	2014-07-08 11:26:44 +0000
+++ tests/mocks/Unity/fake_unity_plugin.cpp	2014-08-06 10:17:24 +0000
@@ -22,7 +22,7 @@
 // local
 #include "fake_scopes.h"
 #include "fake_categories.h"
-#include "fake_department.h"
+#include "fake_navigation.h"
 #include "fake_previewmodel.h"
 #include "fake_previewwidgetmodel.h"
 #include "fake_resultsmodel.h"
@@ -43,7 +43,7 @@
     qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");
     qmlRegisterType<Scope>(uri, 0, 2, "MockScope");
     qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Scope object in QML.");
-    qmlRegisterUncreatableType<unity::shell::scopes::DepartmentInterface>(uri, 0, 2, "Department", "Can't create Department object in QML.");
+    qmlRegisterUncreatableType<unity::shell::scopes::NavigationInterface>(uri, 0, 2, "Navigation", "Can't create Navigation object in QML.");
     qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
     qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");
 
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-07-21 13:28:35 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2014-08-06 10:17:24 +0000
@@ -43,9 +43,6 @@
         id: dashContent
         anchors.fill: parent
 
-        model: SortFilterProxyModel {
-            model: scopesModel
-        }
         scopes : scopesModel
     }
 
@@ -268,117 +265,119 @@
             verify(carouselLV.tileWidth / carouselLV.tileHeight == cardTool.components["art"]["aspect-ratio"]);
         }
 
-        function test_departments() {
-            var dashDepartments = findChild(dashContent, "dashDepartments");
-            compare(dashDepartments.visible, true);
-            compare(dashDepartments.showList, false);
-            waitForRendering(dashDepartments);
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-
-            var departmentListView = findChild(dashDepartments, "departmentListView");
-            compare(departmentListView.count, 1);
-            tryCompare(departmentListView.currentItem.department, "loaded", true);
-
-            waitForRendering(departmentListView);
-            waitForRendering(departmentListView.currentItem);
-
-            var allButton = findChild(dashDepartments, "allButton");
-            compare(allButton.visible, false);
-
-            var department = findChild(dashDepartments, "department0child3");
-            mouseClick(department, 0, 0);
-            compare(dashDepartments.showList, false);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle3");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "root");
-
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-            waitForRendering(departmentListView);
-            waitForRendering(departmentListView.currentItem);
-            compare(allButton.visible, true);
-
-            mouseClick(allButton, 0, 0);
-            compare(dashDepartments.showList, false);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "root");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "root");
-
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-            waitForRendering(departmentListView);
-            waitForRendering(departmentListView.currentItem);
-            compare(allButton.visible, false);
-
-            department = findChild(dashDepartments, "department0child2");
-            mouseClick(department, 0, 0);
-            compare(dashDepartments.showList, true);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");
-
-            var departmentList1 = findChild(dashDepartments, "department1");
-            allButton = findChild(departmentList1, "allButton");
-            var backButton = findChild(findChild(departmentList1, "department1"), "backButton");
-            compare(allButton.visible, true);
-            compare(backButton.visible, true);
-
-            tryCompare(departmentListView, "contentX", departmentList1.x);
-            waitForRendering(departmentListView);
-            mouseClick(allButton, 0, 0);
-            compare(dashDepartments.showList, false);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");
-
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-            waitForRendering(departmentListView);
-            waitForRendering(departmentListView.currentItem);
-            compare(allButton.visible, true);
-            compare(backButton.visible, true);
-
-            tryCompare(departmentList1.department, "loaded", true);
-            department = findChild(dashDepartments, "department1child2");
-            mouseClick(department, 0, 0);
-            compare(dashDepartments.showList, false);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "childmiddle22");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");
-
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-            waitForRendering(departmentListView);
-            waitForRendering(departmentListView.currentItem);
-
-            tryCompare(departmentList1.department, "loaded", true);
-            department = findChild(dashDepartments, "department1child3");
-            mouseClick(department, 0, 0);
-            compare(dashDepartments.showList, false);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "childmiddle23");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "middle2");
-
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-            waitForRendering(departmentListView);
-            waitForRendering(departmentListView.currentItem);
+        function test_navigations() {
+            var dashContentList = findChild(dashContent, "dashContentList");
+            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
+            var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
+            tryCompare(dashNavigation, "visible", true);
+            compare(dashNavigation.showList, false);
+            waitForRendering(dashNavigation);
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+
+            var navigationListView = findChild(dashNavigation, "navigationListView");
+            compare(navigationListView.count, 1);
+            tryCompare(navigationListView.currentItem.navigation, "loaded", true);
+
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            var allButton = findChild(dashNavigation, "allButton");
+            compare(allButton.visible, false);
+
+            var navigation = findChild(dashNavigation, "navigation0child3");
+            mouseClick(navigation, 0, 0);
+            compare(dashNavigation.showList, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
+
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+            compare(allButton.visible, true);
+
+            mouseClick(allButton, 0, 0);
+            compare(dashNavigation.showList, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
+
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+            compare(allButton.visible, false);
+
+            navigation = findChild(dashNavigation, "navigation0child2");
+            mouseClick(navigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
+
+            var navigationList1 = findChild(dashNavigation, "navigation1");
+            allButton = findChild(navigationList1, "allButton");
+            var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");
+            compare(allButton.visible, true);
+            compare(backButton.visible, true);
+
+            tryCompare(navigationListView, "contentX", navigationList1.x);
+            waitForRendering(navigationListView);
+            mouseClick(allButton, 0, 0);
+            compare(dashNavigation.showList, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
+
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+            compare(allButton.visible, true);
+            compare(backButton.visible, true);
+
+            tryCompare(navigationList1.navigation, "loaded", true);
+            navigation = findChild(dashNavigation, "navigation1child2");
+            mouseClick(navigation, 0, 0);
+            compare(dashNavigation.showList, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
+
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
+
+            tryCompare(navigationList1.navigation, "loaded", true);
+            navigation = findChild(dashNavigation, "navigation1child3");
+            mouseClick(navigation, 0, 0);
+            compare(dashNavigation.showList, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
+
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            waitForRendering(navigationListView);
+            waitForRendering(navigationListView.currentItem);
             mouseClick(backButton, 0, 0);
 
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "root");
-            tryCompare(departmentListView.currentItem.department, "departmentId", "root");
-            compare(dashDepartments.showList, true);
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
+            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
+            compare(dashNavigation.showList, true);
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, false);
 
-            mouseClick(dashDepartments, 0, 0);
-            compare(dashDepartments.showList, true);
-            tryCompare(departmentListView.currentItem.department, "loaded", true);
-            department = findChild(dashDepartments, "department0child2");
-            mouseClick(department, 0, 0);
-            compare(dashDepartments.showList, true);
-            departmentList1 = findChild(dashDepartments, "department1");
-            compare(departmentList1.department.loaded, false);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
-            allButton = findChild(departmentList1, "allButton");
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
+            mouseClick(dashNavigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            tryCompare(navigationListView.currentItem.navigation, "loaded", true);
+            navigation = findChild(dashNavigation, "navigation0child2");
+            mouseClick(navigation, 0, 0);
+            compare(dashNavigation.showList, true);
+            navigationList1 = findChild(dashNavigation, "navigation1");
+            compare(navigationList1.navigation.loaded, false);
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
+            allButton = findChild(navigationList1, "allButton");
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
             mouseClick(allButton, 0, 0);
-            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
+            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
         }
     }
 }