Merge lp:~nick-dedekind/unity8/lp1352977 into lp:unity8

[Nick Dedekind]

Added application prompt surfaces to allow prompting application which have not yet created a surface.

Added application prompt surfaces to allow prompting application which have not yet created a surface.

[lp:~nick-dedekind/unity8/lp1352977]

1134. By PS Jenkins bot on 2014-08-07

Resync trunk

1135. By Nick Dedekind on 2014-08-07

added prompt surfaces

1136. By Nick Dedekind on 2014-08-08

Fixed promptSurface over app splash

1137. By Nick Dedekind on 2014-08-08

better mock logging

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-08-07 14:25:38 +0000
+++ debian/control	2014-08-07 14:25:38 +0000
@@ -24,7 +24,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.88),
+               libunity-api-dev (>= 7.87),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
@@ -83,7 +83,7 @@
          qmenumodel-qml (>= 0.2.8),
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
-         qtdeclarative5-qtmir-plugin (>= 0.4),
+         qtdeclarative5-qtmir-plugin (>= 0.4.1),
          qtdeclarative5-ubuntu-settings-components (>= 0.3),
          qtdeclarative5-ubuntu-telephony0.1,
          unity-launcher-impl-3,
@@ -112,7 +112,7 @@
          unity-application-impl-2,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
-         unity-scopes-impl-4,
+         unity-scopes-impl-2,
          unity8-fake-env | unity-application-impl,
          ${misc:Depends},
 Breaks: unity8 (<< 7.86),
 
=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-08-07 14:25:38 +0000
+++ qml/Dash/Dash.qml	2014-07-29 11:35:10 +0000
@@ -38,13 +38,7 @@
     }
 
     function setCurrentScope(scopeId, animate, reset) {
-        var scopeIndex = -1;
-        for (var i = 0; i < scopes.count; ++i) {
-            if (scopes.getScope(i).id == scopeId) {
-                scopeIndex = i;
-                break;
-            }
-        }
+        var scopeIndex = filteredScopes.findFirst(Scopes.RoleId, scopeId)
 
         if (scopeIndex == -1) {
             console.warn("No match for scope with id: %1".arg(scopeId))
@@ -69,8 +63,15 @@
         }
     }
 
-    Scopes {
-        id: scopes
+    SortFilterProxyModel {
+        id: filteredScopes
+        model: Scopes {
+            id: scopes
+        }
+        dynamicSortFilter: true
+
+        filterRole: Scopes.RoleVisible
+        filterRegExp: RegExp("^true$")
     }
 
     DashContent {
@@ -78,6 +79,7 @@
         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-08-07 14:25:38 +0000
+++ qml/Dash/DashContent.qml	2014-07-24 23:31:44 +0000
@@ -23,7 +23,8 @@
 Item {
     id: dashContent
 
-    property alias scopes: dashContentList.model
+    property var model: null
+    property var scopes: null
     readonly property alias currentIndex: dashContentList.currentIndex
 
     signal scopeLoaded(string scopeId)
@@ -88,9 +89,10 @@
             id: dashContentList
             objectName: "dashContentList"
 
-            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown
+            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving
 
             anchors.fill: parent
+            model: dashContent.model
             orientation: ListView.Horizontal
             boundsBehavior: Flickable.DragAndOvershootBounds
             flickDeceleration: units.gu(625)
@@ -128,7 +130,6 @@
                     objectName: scope.id + " loader"
 
                     readonly property bool moving: item ? item.moving : false
-                    readonly property bool navigationShown: item ? item.navigationShown : false
                     readonly property var categoryView: item ? item.categoryView : null
                     readonly property var theScope: scope
 
 
=== renamed file 'qml/Dash/DashNavigation.qml' => 'qml/Dash/DashDepartments.qml'
--- qml/Dash/DashNavigation.qml	2014-08-07 14:25:38 +0000
+++ qml/Dash/DashDepartments.qml	2014-07-08 11:08:19 +0000
@@ -15,17 +15,17 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 0.1
 
 AbstractButton {
     id: root
-    objectName: "dashNavigation"
+    objectName: "dashDepartments"
 
     property var scope: null
 
     property bool showList: false
 
-    readonly property var currentNavigation: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null
+    readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
 
     property alias windowWidth: blackRect.width
     property alias windowHeight: blackRect.height
@@ -34,21 +34,20 @@
     // Are we drilling down the tree or up?
     property bool isGoingBack: false
 
-    visible: root.currentNavigation != null
+    visible: root.currentDepartment != null
 
     height: visible ? units.gu(5) : 0
 
     onClicked: {
-        navigationListView.updateMaxHeight();
         root.showList = !root.showList;
     }
 
     Rectangle {
         id: blackRect
         color: "black"
-        opacity: navigationListView.currentItem && navigationListView.currentItem.visible ? 0.3 : 0
+        opacity: departmentListView.currentItem && departmentListView.currentItem.visible ? 0.3 : 0
         Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
-        anchors.top: navigationListView.top
+        anchors.top: departmentListView.top
         anchors.right: parent.right
         visible: opacity != 0
     }
@@ -79,7 +78,7 @@
         anchors.fill: parent
         anchors.margins: units.gu(2)
         verticalAlignment: Text.AlignVCenter
-        text: root.currentNavigation ? root.currentNavigation.label : ""
+        text: root.currentDepartment ? root.currentDepartment.label : ""
         color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
     }
 
@@ -93,18 +92,18 @@
         color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
     }
 
-    //  navigationListView is outside root
+    //  departmentListView is outside root
     ListView {
-        id: navigationListView
-        objectName: "navigationListView"
+        id: departmentListView
+        objectName: "departmentListView"
         orientation: ListView.Horizontal
         interactive: false
         clip: root.width != windowWidth
         model: ListModel {
-            id: navigationModel
+            id: departmentModel
             // We have two roles
-            // navigationId: the navigation id of the navigation the list represents
-            // nullifyNavigation: overrides navigationId to be null
+            // departmentId: the department id of the department the list represents
+            // nullifyDepartment: overrides departmentId to be null
             //                    This is used to "clear" the delegate when going "right" on the tree
         }
         anchors {
@@ -112,12 +111,7 @@
             right: parent.right
             top: root.bottom
         }
-        property int maxHeight: -1
-        Component.onCompleted: updateMaxHeight();
-        function updateMaxHeight()
-        {
-            maxHeight = (windowHeight - mapToItem(null, 0, 0).y) - units.gu(8);
-        }
+        readonly property int maxHeight: (windowHeight - mapToItem(null, root.x, root.y).y) - units.gu(8)
         property int prevHeight: maxHeight
         height: currentItem ? currentItem.height : maxHeight
         onHeightChanged: {
@@ -126,84 +120,83 @@
             }
         }
         highlightMoveDuration: UbuntuAnimation.FastDuration
-        delegate: DashNavigationList {
-            objectName: "navigation" + index
+        delegate: DashDepartmentsList {
+            objectName: "department" + index
             visible: height != 0
-            width: navigationListView.width
+            width: departmentListView.width
             scopeStyle: root.scopeStyle
             property real desiredHeight: {
                 if (root.showList) {
-                    if (navigation && navigation.loaded && x == navigationListView.contentX)
+                    if (department && department.loaded && x == departmentListView.contentX)
                     {
-                        navigationListView.updateMaxHeight();
-                        return Math.min(implicitHeight, navigationListView.maxHeight);
+                        return Math.min(implicitHeight, departmentListView.maxHeight);
                     } else {
-                        return navigationListView.prevHeight;
+                        return departmentListView.prevHeight;
                     }
                 } else {
                     return 0;
                 }
             }
             height: desiredHeight
-            navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
-            currentNavigation: root.currentNavigation
-            onEnterNavigation: {
-                scope.setNavigationState(newNavigationId, false);
+            department: (nullifyDepartment || !scope) ? null : scope.getDepartment(departmentId)
+            currentDepartment: root.currentDepartment
+            onEnterDepartment: {
+                scope.loadDepartment(newDepartmentId);
                 // We only need to add a new item to the model
                 // if we have children, otherwise just load it
                 if (hasChildren) {
                     isGoingBack = false;
-                    navigationModel.append({"navigationId": newNavigationId, "nullifyNavigation": false});
-                    navigationListView.currentIndex++;
+                    departmentModel.append({"departmentId": newDepartmentId, "nullifyDepartment": false});
+                    departmentListView.currentIndex++;
                 } else {
                     showList = false;
                 }
             }
             onGoBackToParentClicked: {
-                scope.setNavigationState(navigation.parentNavigationId, false);
+                scope.loadDepartment(department.parentDepartmentId);
                 isGoingBack = true;
-                navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
-                navigationListView.currentIndex--;
+                departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);
+                departmentListView.currentIndex--;
             }
-            onAllNavigationClicked: {
+            onAllDepartmentClicked: {
                 showList = false;
-                if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
+                if (root.currentDepartment.parentDepartmentId == department.departmentId) {
                     // For leaves we have to go to the parent too
-                    scope.setNavigationState(root.currentNavigation.parentNavigationId, false);
+                    scope.loadDepartment(root.currentDepartment.parentDepartmentId);
                 }
             }
         }
         onContentXChanged: {
-            if (contentX == width * navigationListView.currentIndex) {
+            if (contentX == width * departmentListView.currentIndex) {
                 if (isGoingBack) {
-                    navigationModel.remove(navigationListView.currentIndex + 1);
+                    departmentModel.remove(departmentListView.currentIndex + 1);
                 } else {
-                    navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", true);
+                    departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", true);
                 }
             }
         }
     }
 
     InverseMouseArea {
-        anchors.fill: navigationListView
+        anchors.fill: departmentListView
         enabled: root.showList
         onClicked: root.showList = false
     }
 
     onScopeChanged: {
-        navigationModel.clear();
-        if (scope && scope.hasNavigation) {
-            navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
+        departmentModel.clear();
+        if (scope && scope.hasDepartments) {
+            departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
         }
     }
 
     Connections {
         target: scope
-        onHasNavigationChanged: {
-            if (scope.hasNavigation) {
-                navigationModel.append({"navigationId": scope.currentNavigationId, "nullifyNavigation": false});
+        onHasDepartmentsChanged: {
+            if (scope.hasDepartments) {
+                departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
             } else {
-                navigationModel.clear();
+                departmentModel.clear();
             }
         }
     }
 
=== renamed file 'qml/Dash/DashNavigationList.qml' => 'qml/Dash/DashDepartmentsList.qml'
--- qml/Dash/DashNavigationList.qml	2014-08-07 14:25:38 +0000
+++ qml/Dash/DashDepartmentsList.qml	2014-07-08 11:08:19 +0000
@@ -15,16 +15,16 @@
  */
 
 import QtQuick 2.2
-import Ubuntu.Components 1.1
+import Ubuntu.Components 0.1
 
 Item {
     id: root
-    property var navigation: null
-    property var currentNavigation: null
+    property var department: null
+    property var currentDepartment: null
     property var scopeStyle: null
-    signal enterNavigation(var newNavigationId, bool hasChildren)
+    signal enterDepartment(var newDepartmentId, bool hasChildren)
     signal goBackToParentClicked()
-    signal allNavigationClicked()
+    signal allDepartmentClicked()
 
     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: !(navigation && navigation.loaded)
+        running: !(department && department.loaded)
     }
     clip: true
 
@@ -54,7 +54,6 @@
 
         anchors.fill: parent
 
-        flickableDirection: Flickable.VerticalFlick
         contentHeight: column.height
         contentWidth: width
 
@@ -69,7 +68,7 @@
                 id: backButton
                 objectName: "backButton"
                 width: parent.width
-                visible: navigation && !navigation.isRoot || false
+                visible: department && !department.isRoot || false
                 height: itemHeight
 
                 onClicked: root.goBackToParentClicked();
@@ -93,7 +92,7 @@
                         left: backImage.right
                         leftMargin: units.gu(0.5)
                     }
-                    text: navigation ? navigation.parentLabel : ""
+                    text: department ? department.parentLabel : ""
                     color: root.foregroundColor
                 }
 
@@ -115,7 +114,7 @@
                 id: allButton
                 objectName: "allButton"
                 width: parent.width
-                visible: navigation && (!navigation.isRoot || (root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
+                visible: department && (!department.isRoot || (root.currentDepartment && !root.currentDepartment.isRoot && root.currentDepartment.parentDepartmentId == department.departmentId)) || false
                 height: itemHeight
 
                 Label {
@@ -124,7 +123,7 @@
                         left: parent.left
                         leftMargin: units.gu(2)
                     }
-                    text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
+                    text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""
                     font.bold: true
                     color: root.foregroundColor
                 }
@@ -142,18 +141,18 @@
                     height: units.dp(1)
                 }
 
-                onClicked: root.allNavigationClicked();
+                onClicked: root.allDepartmentClicked();
             }
 
             Repeater {
-                model: navigation && navigation.loaded ? navigation : null
+                model: department && department.loaded ? department : null
                 clip: true
                 delegate: AbstractButton {
                     objectName: root.objectName + "child" + index
                     height: root.itemHeight
                     width: root.width
 
-                    onClicked: root.enterNavigation(navigationId, hasChildren)
+                    onClicked: root.enterDepartment(departmentId, hasChildren)
 
                     Label {
                         anchors {
@@ -189,7 +188,7 @@
                         color: root.foregroundColor
                         opacity: 0.1
                         height: units.dp(1)
-                        visible: index != navigation.count - 1
+                        visible: index != department.count - 1
                     }
                 }
             }
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-08-07 14:25:38 +0000
+++ qml/Dash/GenericScopeView.qml	2014-07-29 11:35:10 +0000
@@ -25,7 +25,6 @@
 FocusScope {
     id: scopeView
 
-    readonly property alias navigationShown: dashNavigation.showList
     property var scope: null
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent: false
@@ -40,6 +39,16 @@
 
     signal backClicked()
 
+    onScopeChanged: {
+        if (scope) {
+            scope.activateApplication.connect(activateApp);
+        }
+    }
+
+    function activateApp(appId) {
+        Qt.openUrlExternally(appId);
+    }
+
     function positionAtBeginning() {
         categoryView.positionAtBeginning()
     }
@@ -110,7 +119,6 @@
         model: scopeView.categories
         forceNoClip: previewListView.open
         pixelAligned: true
-        interactive: !dashNavigation.showList
 
         property string expandedCategoryId: ""
 
@@ -382,8 +390,7 @@
             searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false
             scopeStyle: scopeView.scopeStyle
 
-            bottomItem: DashNavigation {
-                id: dashNavigation
+            bottomItem: DashDepartments {
                 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-08-07 14:25:38 +0000
+++ qml/ScopeTool.qml	2014-07-03 09:08:22 +0000
@@ -45,6 +45,16 @@
         signal searchClicked
     }
 
+    SortFilterProxyModel {
+        id: filteredScopes
+        model: Scopes {
+            id: scopes
+        }
+        dynamicSortFilter: true
+
+        filterRole: Scopes.RoleVisible
+        filterRegExp: RegExp("^true$")
+    }
 
     Rectangle {
         anchors.fill: dashContent
@@ -62,8 +72,8 @@
     DashContent {
         id: dashContent
 
+        model: filteredScopes
         property var scope: scopes.getScope(currentIndex)
-        scopes: Scopes { }
 
         anchors {
             top: parent.top
 
=== added file 'qml/Stages/AppSurfaceContainer.qml'
--- qml/Stages/AppSurfaceContainer.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/AppSurfaceContainer.qml	2014-08-07 14:25:38 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.0
+import "Animations"
+
+SurfaceContainer {
+    id: container
+    property var promptSurfaces
+
+    Repeater {
+        model: container.promptSurfaces
+
+        delegate: SurfaceContainer {
+            anchors {
+                fill: container
+                topMargin: container.surface.anchors.topMargin
+                rightMargin: container.surface.anchors.rightMargin
+                bottomMargin: container.surface.anchors.bottomMargin
+                leftMargin: container.surface.anchors.leftMargin
+            }
+
+            z: 3 + index
+            surface: modelData
+
+            Component.onCompleted: {
+                animateIn();
+            }
+        }
+    }
+}
 
=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2014-07-29 11:35:10 +0000
+++ qml/Stages/SpreadDelegate.qml	2014-08-07 14:25:38 +0000
@@ -35,11 +35,13 @@
     signal clicked()
     signal closed()
 
-    SurfaceContainer {
+    AppSurfaceContainer {
         id: surfaceContainer
         objectName: "surfaceContainer"
         anchors.fill: parent
         surface: model.surface
+        promptSurfaces: model.application.promptSurfaces
+
         property bool appHasCreatedASurface: false
 
         onSurfaceChanged: {
 
=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2014-07-23 12:23:10 +0000
+++ qml/Stages/SurfaceContainer.qml	2014-08-07 14:25:38 +0000
@@ -40,19 +40,12 @@
                 childSurfaces[i].removed();
             }
 
-            //if we don't have children, nothing will tell us to animate out, so do it.
-            if (childSurfaces.length === 0) {
-                animateOut();
-            }
-            // tell our parent to animate out.
-            if (surface.parentSurface) {
-                surface.parentSurface.parent.animateOut();
-            }
+            animateOut();
         }
     }
 
     Repeater {
-        model: container.surface ? container.surface.childSurfaces : 0
+        model: surface.childSurfaces
 
         delegate: Loader {
             z: 2
@@ -68,14 +61,13 @@
             source: Qt.resolvedUrl("SurfaceContainer.qml")
             onLoaded: {
                 item.surface = modelData;
-                item.animateIn(swipeFromBottom);
-                container.animateIn(swipeUp);
+                item.animateIn();
             }
         }
     }
 
-    function animateIn(component) {
-        var animation = component.createObject(container, { "surface": container.surface });
+    function animateIn() {
+        var animation = swipeFromBottom.createObject(container, { "surface": container.surface });
         animation.start();
 
         var tmp = d.animations;
@@ -104,20 +96,11 @@
         id: swipeFromBottom
         SwipeFromBottomAnimation {}
     }
-    Component {
-        id: swipeUp
-        SwipeUpAnimation {}
-    }
-    Component {
-        id: darkenFade
-        DarkenAndFadeInAnimation {}
-    }
 
     states: [
         State {
             name: "initial"
             PropertyChanges { target: surface; anchors.fill: container }
         }
-        // TODO: more animations!
     ]
 }
 
=== modified file 'tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp'
--- tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp	2014-07-25 05:39:21 +0000
+++ tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp	2014-08-07 14:25:38 +0000
@@ -43,10 +43,8 @@
     return child ? child : surface;
 }
 
-quint32 ApplicationDBusAdaptor::addChildSurface(const QString &appId, const QString &surfaceImage)
+quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QString &surfaceImage)
 {
-    qDebug() << "ApplicationDBusAdaptor::addChildSurface - " << appId;
-
     ApplicationInfo* application = m_applicationManager->findApplication(appId);
     if (!application) {
         qDebug() << "ApplicationDBusAdaptor::addChildSurface - No application found for " << appId;
@@ -58,7 +56,16 @@
                                                  MirSurfaceItem::Maximized,
                                                  QUrl(surfaceImage));
     m_childItems[surfaceId] = surface;
-    surface->setParentSurface(topSurface(application->surface()));
+
+    if (application->promptSurfaceList().count() > 0) {
+        surface->setParentSurface(topSurface(application->promptSurfaceList()[0]));
+        qDebug() << "ApplicationDBusAdaptor::addChildSurface - " << appId;
+    } else {
+        application->addPromptSurface(surface);
+        qDebug() << "ApplicationDBusAdaptor::addPromptSurface - " << appId;
+    }
+
+
     return surfaceId;
 }
 
 
=== modified file 'tests/mocks/Unity/Application/ApplicationDBusAdaptor.h'
--- tests/mocks/Unity/Application/ApplicationDBusAdaptor.h	2014-07-19 12:06:55 +0000
+++ tests/mocks/Unity/Application/ApplicationDBusAdaptor.h	2014-08-07 14:25:38 +0000
@@ -31,7 +31,7 @@
     ApplicationDBusAdaptor(ApplicationManager* applicationManager);
 
 public Q_SLOTS:
-    quint32 addChildSurface(const QString& appId, const QString& surfaceImage);
+    quint32 addPromptSurface(const QString& appId, const QString& surfaceImage);
     void removeChildSurface(int surfaceId);
 
 private:
 
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-07-25 00:10:11 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-08-07 14:25:38 +0000
@@ -98,3 +98,52 @@
     Q_EMIT surfaceChanged(m_surface);
     SurfaceManager::singleton()->registerSurface(m_surface);
 }
+
+void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
+{
+    if (m_surface == surface) {
+        setSurface(nullptr);
+    } else if (m_promptSurfaces.contains(surface)) {
+        m_promptSurfaces.removeAll(surface);
+        surface->setApplication(nullptr);
+
+        Q_EMIT promptSurfacesChanged();
+    }
+}
+
+void ApplicationInfo::addPromptSurface(MirSurfaceItem* surface)
+{
+    if (surface == m_surface || m_promptSurfaces.contains(surface)) return;
+
+    surface->setApplication(this);
+    m_promptSurfaces.append(surface);
+    Q_EMIT promptSurfacesChanged();
+}
+
+QList<MirSurfaceItem*> ApplicationInfo::promptSurfaceList() const
+{
+    return m_promptSurfaces;
+}
+
+QQmlListProperty<MirSurfaceItem> ApplicationInfo::promptSurfaces()
+{
+    return QQmlListProperty<MirSurfaceItem>(this,
+                                            0,
+                                            ApplicationInfo::promptSurfaceCount,
+                                            ApplicationInfo::promptSurfaceAt);
+}
+
+int ApplicationInfo::promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop)
+{
+    ApplicationInfo *p = qobject_cast<ApplicationInfo*>(prop->object);
+    return p->m_promptSurfaces.count();
+}
+
+MirSurfaceItem* ApplicationInfo::promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index)
+{
+    ApplicationInfo *p = qobject_cast<ApplicationInfo*>(prop->object);
+
+    if (index < 0 || index >= p->m_promptSurfaces.count())
+        return nullptr;
+    return p->m_promptSurfaces[index];
+}
 
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2014-07-25 00:10:11 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2014-08-07 14:25:38 +0000
@@ -38,6 +38,7 @@
     Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
     Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
     Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
+    Q_PROPERTY(QQmlListProperty<MirSurfaceItem> promptSurfaces READ promptSurfaces NOTIFY promptSurfacesChanged DESIGNABLE false)
 
     // Only exists in this fake implementation
 
@@ -85,8 +86,15 @@
     void setSurface(MirSurfaceItem* surface);
     MirSurfaceItem* surface() const { return m_surface; }
 
+    void removeSurface(MirSurfaceItem* surface);
+
+    void addPromptSurface(MirSurfaceItem* surface);
+    QList<MirSurfaceItem*> promptSurfaceList() const;
+    QQmlListProperty<MirSurfaceItem> promptSurfaces();
+
 Q_SIGNALS:
     void surfaceChanged(MirSurfaceItem*);
+    void promptSurfacesChanged();
 
 private Q_SLOTS:
     void onStateChanged(State state);
@@ -94,10 +102,15 @@
     void createSurface();
 
 private:
+    static int promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
+    static MirSurfaceItem* promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
+
     QQuickItem *m_parentItem;
     MirSurfaceItem* m_surface;
+    QList<MirSurfaceItem*> m_promptSurfaces;
 };
 
 Q_DECLARE_METATYPE(ApplicationInfo*)
+Q_DECLARE_METATYPE(QQmlListProperty<MirSurfaceItem>)
 
 #endif  // APPLICATION_H
 
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2014-07-29 11:41:39 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-08-07 14:25:38 +0000
@@ -51,6 +51,7 @@
 {
     m_roleNames.insert(RoleSurface, "surface");
     m_roleNames.insert(RoleFullscreen, "fullscreen");
+    m_roleNames.insert(RoleApplication, "application");
 
     buildListOfAvailableApplications();
 
@@ -92,6 +93,8 @@
         return QVariant::fromValue(app->surface());
     case RoleFullscreen:
         return app->fullscreen();
+    case RoleApplication:
+        return QVariant::fromValue(app);
     default:
         return QVariant();
     }
 
=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2014-07-25 00:10:11 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2014-08-07 14:25:38 +0000
@@ -53,6 +53,7 @@
     enum MoreRoles {
         RoleSurface = RoleScreenshot+1,
         RoleFullscreen,
+        RoleApplication,
     };
     enum Role {
         Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,
 
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-07-25 05:39:21 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-08-07 14:25:38 +0000
@@ -54,7 +54,7 @@
         m_parentSurface->removeChildSurface(this);
 
     if (m_application)
-        m_application->setSurface(nullptr);
+        m_application->removeSurface(this);
 }
 
 void MirSurfaceItem::paint(QPainter * painter)
@@ -75,7 +75,7 @@
     }
 
     if (m_application) {
-        m_application->setSurface(nullptr);
+        m_application->removeSurface(this);
     }
     if (!parent()) {
         deleteLater();
 
=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2014-07-25 06:50:09 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2014-08-07 14:25:38 +0000
@@ -117,5 +117,6 @@
 };
 
 Q_DECLARE_METATYPE(MirSurfaceItem*)
+Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
 
 #endif // MIRSURFACEITEM_H
 
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2014-08-07 14:25:38 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2014-08-05 12:06:16 +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=4)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -23,14 +23,14 @@
   fake_scope.cpp
   fake_scopes.cpp
   fake_categories.cpp
-  fake_navigation.cpp
+  fake_department.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/NavigationInterface.h
+  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/DepartmentInterface.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-08-07 14:25:38 +0000
+++ tests/mocks/Unity/Unity.qmltypes	2014-07-10 10:59:08 +0000
@@ -24,12 +24,6 @@
             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"
@@ -68,10 +62,6 @@
         prototype: "unity::shell::scopes::ScopeInterface"
         exports: ["Unity/MockScope 0.2"]
         exportMetaObjectRevisions: [0]
-        Signal {
-            name: "performQuery"
-            Parameter { name: "query"; type: "string" }
-        }
         Method {
             name: "setSearchInProgress"
             Parameter { name: "inProg"; type: "bool" }
@@ -91,21 +81,18 @@
             Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
         }
         Method {
-            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: "setNavigationState"
-            Parameter { name: "navigationId"; type: "string" }
-            Parameter { name: "isAltNavigation"; type: "bool" }
-        }
-        Method { name: "refresh" }
+            name: "getDepartment"
+            type: "unity::shell::scopes::DepartmentInterface*"
+            Parameter { name: "id"; type: "string" }
+        }
+        Method {
+            name: "loadDepartment"
+            Parameter { name: "id"; type: "string" }
+        }
+        Method {
+            name: "performQuery"
+            Parameter { name: "query"; type: "string" }
+        }
     }
     Component {
         name: "Scopes"
@@ -150,7 +137,6 @@
                 "RoleRawRendererTemplate": 3,
                 "RoleRenderer": 4,
                 "RoleComponents": 5,
-                "RoleHeaderLink": 6,
                 "RoleResults": 7,
                 "RoleCount": 8
             }
@@ -171,28 +157,27 @@
         }
     }
     Component {
-        name: "unity::shell::scopes::NavigationInterface"
+        name: "unity::shell::scopes::DepartmentInterface"
         prototype: "QAbstractListModel"
-        exports: ["Unity/Navigation 0.2"]
+        exports: ["Unity/Department 0.2"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
             name: "Roles"
             values: {
-                "RoleNavigationId": 0,
+                "RoleDepartmentId": 0,
                 "RoleLabel": 1,
                 "RoleHasChildren": 2,
                 "RoleIsActive": 3
             }
         }
-        Property { name: "navigationId"; type: "string"; isReadonly: true }
+        Property { name: "departmentId"; type: "string"; isReadonly: true }
         Property { name: "label"; type: "string"; isReadonly: true }
         Property { name: "allLabel"; type: "string"; isReadonly: true }
-        Property { name: "parentNavigationId"; type: "string"; isReadonly: true }
+        Property { name: "parentDepartmentId"; 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 {
@@ -262,8 +247,7 @@
                 "RoleEmblem": 8,
                 "RoleSummary": 9,
                 "RoleAttributes": 10,
-                "RoleBackground": 11,
-                "RoleOverlayColor": 12
+                "RoleBackground": 11
             }
         }
         Property { name: "categoryId"; type: "string" }
@@ -275,22 +259,13 @@
         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: "favorite"; type: "bool" }
+        Property { name: "visible"; type: "bool"; isReadonly: true }
         Property { name: "shortcut"; type: "string"; isReadonly: true }
         Property {
             name: "categories"
@@ -298,27 +273,13 @@
             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: "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: "currentDepartmentId"; type: "string"; isReadonly: true }
+        Property { name: "hasDepartments"; 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 {
@@ -337,6 +298,10 @@
             name: "openScope"
             Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
         }
+        Signal {
+            name: "activateApplication"
+            Parameter { name: "desktop"; type: "string" }
+        }
         Method {
             name: "activate"
             Parameter { name: "result"; type: "QVariant" }
@@ -352,25 +317,14 @@
             Parameter { name: "scope"; type: "unity::shell::scopes::ScopeInterface"; isPointer: true }
         }
         Method {
-            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: "setNavigationState"
-            Parameter { name: "navId"; type: "string" }
-            Parameter { name: "altNavigation"; type: "bool" }
-        }
-        Method {
-            name: "performQuery"
-            Parameter { name: "cannedQuery"; type: "string" }
-        }
-        Method { name: "refresh" }
+            name: "getDepartment"
+            type: "unity::shell::scopes::DepartmentInterface*"
+            Parameter { name: "departmentId"; type: "string" }
+        }
+        Method {
+            name: "loadDepartment"
+            Parameter { name: "departmentId"; type: "string" }
+        }
     }
     Component {
         name: "unity::shell::scopes::ScopesInterface"
@@ -380,17 +334,11 @@
             values: {
                 "RoleScope": 0,
                 "RoleId": 1,
-                "RoleTitle": 2
+                "RoleVisible": 2,
+                "RoleTitle": 3
             }
         }
         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_navigation.cpp' => 'tests/mocks/Unity/fake_department.cpp'
--- tests/mocks/Unity/fake_navigation.cpp	2014-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_department.cpp	2014-06-18 13:48:32 +0000
@@ -14,15 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fake_navigation.h"
+#include "fake_department.h"
 
 #include "fake_scope.h"
 
-#include <QDebug>
 #include <QTimer>
 
-Navigation::Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)
- : m_navigationId(navigationId)
+Department::Department(const QString& departmentId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope)
+ : m_departmentId(departmentId)
  , m_label(label)
  , m_allLabel(allLabel)
  , m_parentId(parentId)
@@ -31,87 +30,96 @@
  , m_scope(scope)
 {
     QTimer::singleShot(1500, this, SLOT(slotLoaded()));
-    connect(scope, SIGNAL(currentNavigationIdChanged()), this, SLOT(slotCurrentNavigationChanged()));
+    connect(scope, SIGNAL(currentDepartmentIdChanged()), this, SLOT(slotCurrentDepartmentChanged()));
 }
 
-QString Navigation::navigationId() const
+QString Department::departmentId() const
 {
-    return m_navigationId;
+    return m_departmentId;
 }
 
-QString Navigation::label() const
+QString Department::label() const
 {
     return m_label;
 }
 
-QString Navigation::allLabel() const
+QString Department::allLabel() const
 {
     return m_allLabel;
 }
 
-QString Navigation::parentNavigationId() const
+QString Department::parentDepartmentId() const
 {
     return m_parentId;
 }
 
-QString Navigation::parentLabel() const
+QString Department::parentLabel() const
 {
     return m_parentLabel;
 }
 
-void Navigation::slotLoaded()
+void Department::slotLoaded()
 {
     m_loaded = true;
     Q_EMIT loadedChanged();
 }
 
-bool Navigation::loaded() const
+bool Department::loaded() const
 {
     return m_loaded;
 }
 
-int Navigation::count() const
+int Department::count() const
 {
     return rowCount();
 }
 
-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")
+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")
         return 0;
     else
         return 8;
 }
 
-QVariant Navigation::data(const QModelIndex &index, int role) const
+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
 {
     switch (role) {
-        case RoleNavigationId:
-            if (m_navigationId == "root")
+        case RoleDepartmentId:
+            if (m_departmentId == "root")
                 return QString("middle%1").arg(index.row());
-            else if (m_navigationId.startsWith("middle"))
-                return QString("child%1%2").arg(m_navigationId).arg(index.row());
+            else if (m_departmentId.startsWith("middle"))
+                return QString("child%1%2").arg(m_departmentId).arg(index.row());
+            break;
         case RoleLabel:
-            return QString("%1Child%2").arg(m_navigationId).arg(index.row());
+            return QString("%1Child%2").arg(m_departmentId).arg(index.row());
+            break;
         case RoleHasChildren:
-            return m_navigationId == "root" && index.row() != 3;
+            return m_departmentId == "root" && index.row() != 3;
+            break;
         case RoleIsActive:
-            return m_scope->currentNavigationId() == data(index, RoleNavigationId);
+            return m_scope->currentDepartmentId() == data(index, RoleDepartmentId);
+            break;
     }
     return QVariant();
 }
 
-void Navigation::slotCurrentNavigationChanged()
+void Department::slotCurrentDepartmentChanged()
 {
     // 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_navigation.h' => 'tests/mocks/Unity/fake_department.h'
--- tests/mocks/Unity/fake_navigation.h	2014-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_department.h	2014-05-29 10:25:21 +0000
@@ -14,48 +14,48 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FAKE_NAVIGATION_H
-#define FAKE_NAVIGATION_H
+#ifndef FAKE_DEPARTMENT_H
+#define FAKE_DEPARTMENT_H
 
-#include <unity/shell/scopes/NavigationInterface.h>
+#include <unity/shell/scopes/DepartmentInterface.h>
 
 class Scope;
 
-class Navigation : public unity::shell::scopes::NavigationInterface
+class Department : public unity::shell::scopes::DepartmentInterface
 {
     Q_OBJECT
 
 public:
-    Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);
+    Department(const QString& departmentId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);
 
-    QString navigationId() const override;
+    QString departmentId() const override;
     QString label() const override;
     QString allLabel() const override;
-    QString parentNavigationId() const override;
+    QString parentDepartmentId() const override;
     QString parentLabel() const override;
     bool loaded() const override;
+    int count() const override;
     bool isRoot() const override;
-    bool hidden() const override;
-    int count() 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 slotCurrentNavigationChanged();
+    void slotCurrentDepartmentChanged();
 
 private Q_SLOTS:
     void slotLoaded();
 
 private:
-    QString m_navigationId;
+    QString m_departmentId;
     QString m_label;
     QString m_allLabel;
     QString m_parentId;
     QString m_parentLabel;
     bool m_loaded;
-    QString m_currentNavigation;
+    QString m_currentDepartment;
     Scope *m_scope;
 };
 
-#endif // FAKE_NAVIGATION_H
+#endif // FAKE_DEPARTMENT_H
 
=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-07-24 20:40:57 +0000
@@ -14,26 +14,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDebug>
 #include <QUrl>
 
 #include "fake_scope.h"
-#include "fake_navigation.h"
+#include "fake_department.h"
 #include "fake_resultsmodel.h"
 
 Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)
 {
 }
 
-Scope::Scope(QString const& id, QString const& name, bool favorite, QObject* parent, int categories)
+Scope::Scope(QString const& id, QString const& name, bool visible, 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_currentNavigationId("root")
-    , m_currentAltNavigationId("altroot")
+    , m_currentDeparment("root")
     , m_previewRendererName("preview-generic")
     , m_categories(new Categories(categories, this))
 {
@@ -79,11 +77,6 @@
     return m_searching;
 }
 
-bool Scope::favorite() const
-{
-    return m_favorite;
-}
-
 unity::shell::scopes::CategoriesInterface* Scope::categories() const
 {
     return m_categories;
@@ -104,6 +97,11 @@
     return m_formFactor;
 }
 
+bool Scope::visible() const
+{
+    return m_visible;
+}
+
 bool Scope::isActive() const
 {
     return m_isActive;
@@ -133,13 +131,6 @@
     }
 }
 
-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) {
@@ -179,29 +170,14 @@
     qFatal("Scope::closeScope is not implemented");
 }
 
-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;
+QString Scope::currentDepartmentId() const
+{
+    return m_currentDeparment;
+}
+
+bool Scope::hasDepartments() const
+{
+    return true;
 }
 
 QVariantMap Scope::customizations() const
@@ -220,12 +196,7 @@
     return m;
 }
 
-void Scope::refresh()
-{
-    qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";
-}
-
-unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)
+unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)
 {
     if (id.isEmpty())
         return nullptr;
@@ -239,30 +210,11 @@
         parentId = id.mid(5, 7);
         parentLabel = parentId;
     }
-    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();
-    }
+    return new Department(id, id, "all"+id, parentId, parentLabel, this);
+}
+
+void Scope::loadDepartment(const QString& id)
+{
+    m_currentDeparment = id;
+    Q_EMIT currentDepartmentIdChanged();
 }
 
=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-07-11 16:39:33 +0000
@@ -30,7 +30,7 @@
 
 public:
     Scope(QObject* parent = 0);
-    Scope(QString const& id, QString const& name, bool favorite, QObject* parent = 0, int categories = 20);
+    Scope(QString const& id, QString const& name, bool visible, 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,7 +53,6 @@
     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;
@@ -61,20 +60,14 @@
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) 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;
+    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;
     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;
@@ -84,11 +77,10 @@
     QString m_searchQuery;
     QString m_noResultsHint;
     QString m_formFactor;
+    bool m_visible;
     bool m_searching;
-    bool m_favorite;
     bool m_isActive;
-    QString m_currentNavigationId;
-    QString m_currentAltNavigationId;
+    QString m_currentDeparment;
 
     QString m_previewRendererName;
 
 
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
--- tests/mocks/Unity/fake_scopes.cpp	2014-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_scopes.cpp	2014-07-25 13:25:45 +0000
@@ -32,11 +32,6 @@
     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();
 }
 
@@ -97,6 +92,8 @@
         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 {
@@ -128,11 +125,6 @@
     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-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_scopes.h	2014-07-25 13:25:45 +0000
@@ -50,7 +50,6 @@
     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-08-07 14:25:38 +0000
+++ tests/mocks/Unity/fake_unity_plugin.cpp	2014-07-08 11:26:44 +0000
@@ -22,7 +22,7 @@
 // local
 #include "fake_scopes.h"
 #include "fake_categories.h"
-#include "fake_navigation.h"
+#include "fake_department.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::NavigationInterface>(uri, 0, 2, "Navigation", "Can't create Navigation object in QML.");
+    qmlRegisterUncreatableType<unity::shell::scopes::DepartmentInterface>(uri, 0, 2, "Department", "Can't create Department 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_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-08-07 14:25:38 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-07-29 11:35:10 +0000
@@ -64,10 +64,10 @@
 
         function get_scope_data() {
             return [
-                        { tag: "MockScope1", visualIndex: 0 },
-                        { tag: "MockScope2", visualIndex: 1 },
-                        { tag: "clickscope", visualIndex: 2 },
-                        { tag: "MockScope5", visualIndex: 3 },
+                        { tag: "MockScope1", visualIndex: 0, shouldBeVisible: true },
+                        { tag: "MockScope2", visualIndex: -1, shouldBeVisible: false },
+                        { tag: "clickscope", visualIndex: 1, shouldBeVisible: true },
+                        { tag: "MockScope5", visualIndex: 2, shouldBeVisible: true },
             ]
         }
 
@@ -76,6 +76,10 @@
         }
 
         function test_show_scope_on_load(data) {
+            if (data.shouldBeVisible == false) {
+                console.log("Not testing " + data.tag + ": not visible");
+                return;
+            }
             var dashContentList = findChild(dash, "dashContentList");
 
             dash.showScopeOnLoaded = data.tag
@@ -83,7 +87,7 @@
             tryCompare(dashContentList, "count", 0);
             scopes.load();
             tryCompare(scopes, "loaded", true);
-            tryCompare(dashContentList, "count", 5);
+            tryCompare(dashContentList, "count", 4);
 
             verify(dashContentList != undefined);
             tryCompare(dashContentList, "currentIndex", data.visualIndex);
 
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2014-08-07 14:25:38 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2014-07-21 13:28:35 +0000
@@ -43,6 +43,9 @@
         id: dashContent
         anchors.fill: parent
 
+        model: SortFilterProxyModel {
+            model: scopesModel
+        }
         scopes : scopesModel
     }
 
@@ -265,119 +268,117 @@
             verify(carouselLV.tileWidth / carouselLV.tileHeight == cardTool.components["art"]["aspect-ratio"]);
         }
 
-        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);
+        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);
             mouseClick(backButton, 0, 0);
 
-            tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
-            tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
-            compare(dashNavigation.showList, true);
-            mouseClick(dashNavigation, 0, 0);
-            compare(dashNavigation.showList, false);
+            tryCompare(dashDepartments.currentDepartment, "departmentId", "root");
+            tryCompare(departmentListView.currentItem.department, "departmentId", "root");
+            compare(dashDepartments.showList, true);
+            mouseClick(dashDepartments, 0, 0);
+            compare(dashDepartments.showList, false);
 
-            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(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(allButton, 0, 0);
-            tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
+            tryCompare(dashDepartments.currentDepartment, "departmentId", "middle2");
         }
     }
 }