Merge lp:~unity-team/unity-scopes-shell/sort-order into lp:unity-scopes-shell

[Michal Hruby]

Implemented alt navigation as per shell interface v4.

Implemented alt navigation as per shell interface v4.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/179/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/76/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/179/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/sort-order]

145. By Michal Hruby on 2014-08-01

Drop support for impl-2 and 3, as the interfaces changed

146. By Michal Hruby on 2014-08-01

Compile with very latest unity-api

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/181/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/78/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/181/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/sort-order]

147. By Michal Hruby on 2014-08-01

Update for the latest interface

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/182/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/79/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/182/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/sort-order]

148. By Michal Hruby on 2014-08-04

Update tests

149. By Michal Hruby on 2014-08-04

Merge with drop-appid branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/183/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/80/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/183/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/sort-order]

150. By Michal Hruby on 2014-08-04

Implement refresh method

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/184/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/81/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/184/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/sort-order]

151. By Michal Hruby on 2014-08-05

Reset filter state on non-empty queries

152. By Michal Hruby on 2014-08-05

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/185/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/82/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/185/rebuild

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

Conflicts with trunk

[lp:~unity-team/unity-scopes-shell/sort-order]

153. By Michal Hruby on 2014-08-06

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/87/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/190/rebuild

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

review: Needs Information

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-05 16:42:48 +0000
+++ debian/changelog	2014-08-06 08:35:31 +0000
@@ -1,3 +1,9 @@
+unity-scopes-shell (0.5.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Implemented shell interface version 4
+
+ -- Michal Hruby <[e-mail]>  Fri, 01 Aug 2014 11:08:43 +0100
+
 unity-scopes-shell (0.5.2+14.10.20140805.1-0ubuntu1) utopic; urgency=low
 
   [ Pete Woods ]
 
=== modified file 'debian/control'
--- debian/control	2014-08-01 10:25:41 +0000
+++ debian/control	2014-08-06 08:35:31 +0000
@@ -3,7 +3,7 @@
 Section: libs
 Build-Depends: cmake,
                debhelper (>= 9),
-               libunity-api-dev (>= 7.87),
+               libunity-api-dev (>= 7.88),
                libunity-scopes-dev (>= 0.6.0~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
@@ -34,8 +34,7 @@
 Provides: unity-scopes-impl,
           unity-scopes-impl-0,
           unity-scopes-impl-1,
-          unity-scopes-impl-2,
-          unity-scopes-impl-3,
+          unity-scopes-impl-4,
 Breaks: unity8-private (<< 7.84)
 Replaces: unity8-private (<< 7.84)
 Description: QML plugin for Scopes
 
=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-08-01 10:25:41 +0000
+++ src/Unity/CMakeLists.txt	2014-08-06 08:35:31 +0000
@@ -2,7 +2,7 @@
 include(Plugins)
 
 # Dependencies
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)
 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.0)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(U1DB REQUIRED libu1db-qt5)
@@ -41,7 +41,7 @@
     # We need these headers here so moc runs and we get the moc-stuff
     # compiled in, otherwise we miss some symbols
     ${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 'src/Unity/collectors.cpp'
--- src/Unity/collectors.cpp	2014-08-01 10:34:32 +0000
+++ src/Unity/collectors.cpp	2014-08-06 08:35:31 +0000
@@ -93,7 +93,19 @@
         m_rootDepartment = department;
     }
 
-    Status collect(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& out_rootDepartment)
+    void setSortOrder(scopes::OptionSelectorFilter::SCPtr const& sortOrder)
+    {
+        QMutexLocker locker(&m_mutex);
+        m_sortOrderFilter = sortOrder;
+    }
+
+    void setFilterState(scopes::FilterState const& state)
+    {
+        QMutexLocker locker(&m_mutex);
+        m_filterState = state;
+    }
+
+    Status collect(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& out_rootDepartment, scopes::OptionSelectorFilter::SCPtr& out_sortOrder, scopes::FilterState& out_filterState)
     {
         Status status;
 
@@ -106,12 +118,17 @@
         m_results.swap(out_results);
         out_rootDepartment = m_rootDepartment;
 
+        out_sortOrder = m_sortOrderFilter;
+        out_filterState = m_filterState;
+
         return status;
     }
 
 private:
     QList<scopes::CategorisedResult::SPtr> m_results;
     scopes::Department::SCPtr m_rootDepartment;
+    scopes::OptionSelectorFilter::SCPtr m_sortOrderFilter;
+    scopes::FilterState m_filterState;
 };
 
 class PreviewDataCollector: public CollectorBase
@@ -222,10 +239,10 @@
     return m_collector->msecsSinceStart();
 }
 
-CollectorBase::Status PushEvent::collectSearchResults(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& rootDepartment)
+CollectorBase::Status PushEvent::collectSearchResults(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& rootDepartment, scopes::OptionSelectorFilter::SCPtr& sortOrder, scopes::FilterState& filterState)
 {
     auto collector = std::dynamic_pointer_cast<SearchDataCollector>(m_collector);
-    return collector->collect(out_results, rootDepartment);
+    return collector->collect(out_results, rootDepartment, sortOrder, filterState);
 }
 
 CollectorBase::Status PushEvent::collectPreviewData(scopes::ColumnLayoutList& out_columns, scopes::PreviewWidgetList& out_widgets, QHash<QString, QVariant>& out_data)
@@ -287,6 +304,23 @@
     m_collector->setDepartment(department);
 }
 
+void SearchResultReceiver::push(scopes::Filters const& filters, scopes::FilterState const& state)
+{
+    for (auto it = filters.begin(); it != filters.end(); ++it) {
+        scopes::FilterBase::SCPtr filter = *it;
+        if (filter->display_hints() == scopes::FilterBase::DisplayHints::Primary) {
+            scopes::OptionSelectorFilter::SCPtr option_filter = std::dynamic_pointer_cast<const scopes::OptionSelectorFilter>(filter);
+            if (!option_filter) {
+                continue;
+            } else {
+                m_collector->setSortOrder(option_filter);
+                break;
+            }
+        }
+    }
+    m_collector->setFilterState(state);
+}
+
 // this might be called from any thread (might be main, might be any other thread)
 void SearchResultReceiver::finished(scopes::CompletionDetails const& details)
 {
 
=== modified file 'src/Unity/collectors.h'
--- src/Unity/collectors.h	2014-08-01 10:34:32 +0000
+++ src/Unity/collectors.h	2014-08-06 08:35:31 +0000
@@ -27,12 +27,15 @@
 #include <QElapsedTimer>
 
 #include <unity/scopes/ActivationListenerBase.h>
-#include <unity/scopes/SearchListenerBase.h>
+#include <unity/scopes/ActivationResponse.h>
+#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/FilterBase.h>
+#include <unity/scopes/FilterState.h>
+#include <unity/scopes/OptionSelectorFilter.h>
 #include <unity/scopes/PreviewListenerBase.h>
-#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/QueryCtrl.h>
-#include <unity/scopes/PreviewWidget.h>
-#include <unity/scopes/ActivationResponse.h>
+#include <unity/scopes/SearchListenerBase.h>
 
 namespace scopes_ng
 {
@@ -73,7 +76,7 @@
     PushEvent(Type event_type, std::shared_ptr<CollectorBase> collector);
     Type type();
 
-    CollectorBase::Status collectSearchResults(QList<std::shared_ptr<unity::scopes::CategorisedResult>>& out_results, unity::scopes::Department::SCPtr& out_rootDepartment);
+    CollectorBase::Status collectSearchResults(QList<std::shared_ptr<unity::scopes::CategorisedResult>>& out_results, unity::scopes::Department::SCPtr& out_rootDepartment, unity::scopes::OptionSelectorFilter::SCPtr& out_sortOrder, unity::scopes::FilterState& out_filterState);
     CollectorBase::Status collectPreviewData(unity::scopes::ColumnLayoutList& out_columns, unity::scopes::PreviewWidgetList& out_widgets, QHash<QString, QVariant>& out_data);
     CollectorBase::Status collectActivationResponse(std::shared_ptr<unity::scopes::ActivationResponse>& out_response, std::shared_ptr<unity::scopes::Result>& out_result);
 
@@ -105,6 +108,7 @@
 public:
     virtual void push(unity::scopes::CategorisedResult result) override;
     virtual void push(unity::scopes::Department::SCPtr const& department) override;
+    virtual void push(unity::scopes::Filters const& filters, unity::scopes::FilterState const& state) override;
     virtual void finished(unity::scopes::CompletionDetails const& details) override;
 
     SearchResultReceiver(QObject* receiver);
 
=== modified file 'src/Unity/department.cpp'
--- src/Unity/department.cpp	2014-06-12 11:34:44 +0000
+++ src/Unity/department.cpp	2014-08-06 08:35:31 +0000
@@ -19,16 +19,22 @@
 
 #include "department.h"
 
+#include <unity/scopes/OptionSelectorFilter.h>
+
 namespace scopes_ng
 {
 
 using namespace unity;
 
 Department::Department(QObject* parent) :
-    unity::shell::scopes::DepartmentInterface(parent),
-    m_loaded(false),
-    m_isRoot(false)
-{
+    unity::shell::scopes::NavigationInterface(parent),
+    m_loaded(false), m_isRoot(false), m_hidden(false), m_isFilter(false)
+{
+}
+
+void Department::setScopeId(QString const& scopeId)
+{
+    m_scopeId = scopeId;
 }
 
 void Department::loadFromDepartmentNode(DepartmentNode* treeNode)
@@ -37,14 +43,17 @@
         qWarning("Tried to set null DepartmentNode!");
         return;
     }
-    m_departmentId = treeNode->id();
+    m_navigationId = treeNode->id();
+    m_filterId = treeNode->filterId();
     m_label = treeNode->label();
     m_allLabel = treeNode->allLabel();
     m_loaded = !treeNode->isLeaf() && treeNode->childCount() > 0;
     m_isRoot = treeNode->isRoot();
+    m_hidden = treeNode->hidden();
+    m_isFilter = treeNode->isFilter();
 
     DepartmentNode* parentNode = treeNode->parent();
-    m_parentDepartmentId = parentNode ? parentNode->id() : "";
+    m_parentNavigationId = parentNode ? parentNode->id() : "";
     m_parentLabel = parentNode ? parentNode->label() : "";
 
     beginResetModel();
@@ -61,14 +70,15 @@
 
     endResetModel();
 
-    Q_EMIT departmentIdChanged();
+    Q_EMIT navigationIdChanged();
     Q_EMIT labelChanged();
     Q_EMIT allLabelChanged();
-    Q_EMIT parentDepartmentIdChanged();
+    Q_EMIT parentNavigationIdChanged();
     Q_EMIT parentLabelChanged();
     Q_EMIT loadedChanged();
     Q_EMIT countChanged();
     Q_EMIT isRootChanged();
+    Q_EMIT hiddenChanged();
 }
 
 void Department::markSubdepartmentActive(QString const& subdepartmentId)
@@ -100,7 +110,7 @@
 {
     SubdepartmentData* data = m_subdepartments[index.row()].data();
     switch (role) {
-        case RoleDepartmentId: return data->id;
+        case RoleNavigationId: return data->id;
         case RoleLabel: return data->label;
         case RoleHasChildren: return data->hasChildren;
         case RoleIsActive: return data->isActive;
@@ -114,9 +124,9 @@
     return m_subdepartments.size();
 }
 
-QString Department::departmentId() const
+QString Department::navigationId() const
 {
-    return m_departmentId;
+    return m_navigationId;
 }
 
 QString Department::label() const
@@ -129,9 +139,9 @@
     return m_allLabel;
 }
 
-QString Department::parentDepartmentId() const
+QString Department::parentNavigationId() const
 {
-    return m_parentDepartmentId;
+    return m_parentNavigationId;
 }
 
 QString Department::parentLabel() const
@@ -149,6 +159,11 @@
     return m_isRoot;
 }
 
+bool Department::hidden() const
+{
+    return m_hidden;
+}
+
 int Department::count() const
 {
     return rowCount();
 
=== modified file 'src/Unity/department.h'
--- src/Unity/department.h	2014-06-12 11:34:44 +0000
+++ src/Unity/department.h	2014-08-06 08:35:31 +0000
@@ -21,7 +21,7 @@
 #ifndef NG_DEPARTMENT_H
 #define NG_DEPARTMENT_H
 
-#include <unity/shell/scopes/DepartmentInterface.h>
+#include <unity/shell/scopes/NavigationInterface.h>
 
 #include <QString>
 #include <QSharedPointer>
@@ -44,37 +44,43 @@
     bool isActive;
 };
 
-class Q_DECL_EXPORT Department : public unity::shell::scopes::DepartmentInterface
+class Q_DECL_EXPORT Department : public unity::shell::scopes::NavigationInterface
 {
     Q_OBJECT
 
 public:
     explicit Department(QObject* parent = 0);
+    void setScopeId(QString const& scopeId);
     void loadFromDepartmentNode(DepartmentNode* treeNode);
     void markSubdepartmentActive(QString const& subdepartmentId);
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    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;
 
 Q_SIGNALS:
 
 private:
-    QString m_departmentId;
+    QString m_navigationId;
+    QString m_scopeId;
+    QString m_filterId;
     QString m_label;
     QString m_allLabel;
-    QString m_parentDepartmentId;
+    QString m_parentNavigationId;
     QString m_parentLabel;
     bool m_loaded;
     bool m_isRoot;
+    bool m_hidden;
+    bool m_isFilter;
 
     QList<QSharedPointer<SubdepartmentData>> m_subdepartments;
 };
 
=== modified file 'src/Unity/departmentnode.cpp'
--- src/Unity/departmentnode.cpp	2014-05-28 07:04:50 +0000
+++ src/Unity/departmentnode.cpp	2014-08-06 08:35:31 +0000
@@ -24,7 +24,11 @@
 
 using namespace unity;
 
-DepartmentNode::DepartmentNode(DepartmentNode* parent) : m_parent(parent), m_isRoot(false)
+DepartmentNode::DepartmentNode(DepartmentNode* parent)
+    : m_parent(parent)
+    , m_isRoot(false)
+    , m_hidden(false)
+    , m_isFilter(false)
 {
 }
 
@@ -39,6 +43,8 @@
     m_label = QString::fromStdString(dep->label());
     m_allLabel = QString::fromStdString(dep->alternate_label());
     m_hasSubdepartments = dep->has_subdepartments();
+    m_hidden = false;
+    m_isFilter = false;
 
     clearChildren();
 
@@ -50,6 +56,41 @@
     }
 }
 
+void DepartmentNode::initializeForFilter(scopes::OptionSelectorFilter::SCPtr const& filter)
+{
+    auto children = filter->options();
+    m_id = QString(""); // this is root (which we shouldn't show really)
+    m_filterId = QString::fromStdString(filter->id());
+    m_label = QString::fromStdString(filter->label());
+    m_allLabel = QString();
+    m_hasSubdepartments = !children.empty();
+    m_isRoot = true;
+    m_hidden = true;
+    m_isFilter = true;
+
+    clearChildren();
+
+    for (auto it = children.begin(); it != children.end(); ++it) {
+        DepartmentNode* subdep = new DepartmentNode(this);
+        subdep->initializeForFilterOption(*it, m_filterId);
+        this->appendChild(subdep);
+    }
+}
+
+void DepartmentNode::initializeForFilterOption(scopes::FilterOption::SCPtr const& option, QString const& filterId)
+{
+    m_id = QString::fromStdString(option->id());
+    m_filterId = filterId;
+    m_label = QString::fromStdString(option->label());
+    m_allLabel = QString();
+    m_hasSubdepartments = false;
+    m_isRoot = false;
+    m_hidden = false;
+    m_isFilter = true;
+
+    clearChildren();
+}
+
 void DepartmentNode::setIsRoot(bool isRoot)
 {
     m_isRoot = isRoot;
@@ -60,6 +101,16 @@
     return m_isRoot;
 }
 
+bool DepartmentNode::hidden() const
+{
+    return m_hidden;
+}
+
+bool DepartmentNode::isFilter() const
+{
+    return m_isFilter;
+}
+
 DepartmentNode* DepartmentNode::findNodeById(QString const& id)
 {
     if (id == m_id) return this;
@@ -87,6 +138,11 @@
     return m_allLabel;
 }
 
+QString DepartmentNode::filterId() const
+{
+    return m_filterId;
+}
+
 bool DepartmentNode::hasSubdepartments() const
 {
     return m_hasSubdepartments;
 
=== modified file 'src/Unity/departmentnode.h'
--- src/Unity/departmentnode.h	2014-05-28 07:04:50 +0000
+++ src/Unity/departmentnode.h	2014-08-06 08:35:31 +0000
@@ -38,6 +38,7 @@
     ~DepartmentNode();
 
     void initializeForDepartment(unity::scopes::Department::SCPtr const& dep);
+    void initializeForFilter(unity::scopes::OptionSelectorFilter::SCPtr const& filter);
     DepartmentNode* findNodeById(QString const& id);
 
     QString id() const;
@@ -45,6 +46,8 @@
     QString allLabel() const;
     bool hasSubdepartments() const;
     bool isRoot() const;
+    bool hidden() const;
+    bool isFilter() const;
 
     void setIsRoot(bool isRoot);
 
@@ -53,17 +56,22 @@
     bool isLeaf() const;
     QList<DepartmentNode*> childNodes() const;
     DepartmentNode* parent() const;
+    QString filterId() const;
 
 private:
     void clearChildren();
+    void initializeForFilterOption(unity::scopes::FilterOption::SCPtr const&, QString const&);
 
     DepartmentNode* m_parent;
     QList<DepartmentNode*> m_children;
     QString m_id;
     QString m_label;
     QString m_allLabel;
+    QString m_filterId;
     bool m_hasSubdepartments;
     bool m_isRoot;
+    bool m_hidden;
+    bool m_isFilter;
 };
 
 } // namespace scopes_ng
 
=== modified file 'src/Unity/overviewscope.cpp'
--- src/Unity/overviewscope.cpp	2014-07-23 12:32:48 +0000
+++ src/Unity/overviewscope.cpp	2014-08-06 08:35:31 +0000
@@ -96,11 +96,6 @@
     return QString("scopes");
 }
 
-bool OverviewScope::visible() const
-{
-    return false;
-}
-
 scopes::ScopeProxy OverviewScope::proxy_for_result(scopes::Result::SPtr const& result) const
 {
     try {
 
=== modified file 'src/Unity/overviewscope.h'
--- src/Unity/overviewscope.h	2014-07-18 17:10:39 +0000
+++ src/Unity/overviewscope.h	2014-08-06 08:35:31 +0000
@@ -35,7 +35,6 @@
 
     /* getters */
     QString id() const override;
-    bool visible() const override;
 
     void dispatchSearch() override;
 
 
=== modified file 'src/Unity/plugin.cpp'
--- src/Unity/plugin.cpp	2014-06-11 17:08:34 +0000
+++ src/Unity/plugin.cpp	2014-08-06 08:35:31 +0000
@@ -41,7 +41,7 @@
     // new Scopes classes
     qmlRegisterType<scopes_ng::Scopes>(uri, 0, 2, "Scopes");
     qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Scope object in QML. Get them from Scopes instance.");
-    qmlRegisterUncreatableType<unity::shell::scopes::DepartmentInterface>(uri, 0, 2, "Department", "Can't create Department object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::NavigationInterface>(uri, 0, 2, "Navigation", "Can't create Navigation object in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::SettingsModelInterface>(uri, 0, 2, "Settings", "Can't create Settings object in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<scopes_ng::ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create new ResultsModel in QML. Get them from Categories instance.");
 
=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-08-05 16:24:32 +0000
+++ src/Unity/scope.cpp	2014-08-06 08:35:31 +0000
@@ -47,6 +47,8 @@
 #include <libintl.h>
 
 #include <unity/scopes/ListenerBase.h>
+#include <unity/scopes/CannedQuery.h>
+#include <unity/scopes/OptionSelectorFilter.h>
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/QueryCtrl.h>
 #include <unity/scopes/PreviewWidget.h>
@@ -70,9 +72,11 @@
     , m_searchInProgress(false)
     , m_resultsDirty(false)
     , m_delayedClear(false)
-    , m_hasDepartments(false)
+    , m_hasNavigation(false)
+    , m_hasAltNavigation(false)
     , m_searchController(new CollectionController)
     , m_activationController(new CollectionController)
+    , m_status(Status::Okay)
 {
     m_categories.reset(new Categories(this));
 
@@ -99,13 +103,17 @@
     CollectorBase::Status status;
     QList<std::shared_ptr<scopes::CategorisedResult>> results;
     scopes::Department::SCPtr rootDepartment;
+    scopes::OptionSelectorFilter::SCPtr sortOrderFilter;
+    scopes::FilterState filterState;
 
-    status = pushEvent->collectSearchResults(results, rootDepartment);
+    status = pushEvent->collectSearchResults(results, rootDepartment, sortOrderFilter, filterState);
     if (status == CollectorBase::Status::CANCELLED) {
         return;
     }
 
     m_rootDepartment = rootDepartment;
+    m_sortOrderFilter = sortOrderFilter;
+    m_receivedFilterState = filterState;
 
     if (m_cachedResults.empty()) {
         m_cachedResults.swap(results);
@@ -126,6 +134,7 @@
         flushUpdates();
 
         setSearchInProgress(false);
+        setStatus(status == CollectorBase::Status::FINISHED ? Status::Okay : Status::Unknown);
 
         // Don't schedule a refresh if the query suffered an error
         if (status == CollectorBase::Status::FINISHED) {
@@ -226,9 +235,13 @@
     }
 
     if (scope != nullptr) {
-        // TODO: change filters?
-        scope->setCurrentDepartmentId(departmentId);
+        scope->setCurrentNavigationId(departmentId);
+        scope->setFilterState(query.filter_state());
         scope->setSearchQuery(searchString);
+        // FIXME: implement better way to do multiple changes to search props and dispatch single search
+        if (!scope->searchInProgress()) {
+            scope->invalidateResults();
+        }
         if (scope != this) Q_EMIT gotoScope(scopeId);
     } else {
         // create temp dash page
@@ -237,7 +250,8 @@
             scope = new scopes_ng::Scope(this);
             scope->setScopeData(*meta_sptr);
             scope->setScopesInstance(m_scopesInstance);
-            scope->setCurrentDepartmentId(departmentId);
+            scope->setCurrentNavigationId(departmentId);
+            scope->setFilterState(query.filter_state());
             scope->setSearchQuery(searchString);
             m_tempScopes.insert(scope);
             Q_EMIT openScope(scope);
@@ -263,6 +277,9 @@
         m_clearTimer.stop();
     }
 
+    if (m_status != Status::Okay) {
+        setStatus(Status::Okay);
+    }
     processResultSet(m_cachedResults); // clears the result list
 
     // process departments
@@ -289,25 +306,7 @@
             m_departmentTree->setIsRoot(true);
 
             // update corresponding models
-            QString activeDepartment(m_currentDepartmentId);
-            node = m_departmentTree->findNodeById(activeDepartment);
-            DepartmentNode* parentNode = nullptr;
-            if (node != nullptr) {
-                auto it = m_departmentModels.find(activeDepartment);
-                while (it != m_departmentModels.end() && it.key() == activeDepartment) {
-                    it.value()->loadFromDepartmentNode(node);
-                    ++it;
-                }
-                // if this node is a leaf, we need to update models for the parent
-                parentNode = node->isLeaf() ? node->parent() : nullptr;
-            }
-            if (parentNode != nullptr) {
-                auto it = m_departmentModels.find(parentNode->id());
-                while (it != m_departmentModels.end() && it.key() == parentNode->id()) {
-                    it.value()->markSubdepartmentActive(activeDepartment);
-                    ++it;
-                }
-            }
+            updateNavigationModels(m_departmentTree.data(), m_departmentModels, m_currentNavigationId);
         } else {
             m_departmentTree.reset(new DepartmentNode);
             m_departmentTree->initializeForDepartment(m_rootDepartment);
@@ -320,17 +319,80 @@
     m_lastRootDepartment = m_rootDepartment;
 
     bool containsDepartments = m_rootDepartment.get() != nullptr;
-    // design decision - no departments when doing searches
+    // design decision - no navigation when doing searches
     containsDepartments &= m_searchQuery.isEmpty();
 
-    if (containsDepartments != m_hasDepartments) {
-        m_hasDepartments = containsDepartments;
-        Q_EMIT hasDepartmentsChanged();
-    }
-
-    if (!containsDepartments && !m_currentDepartmentId.isEmpty()) {
-        m_currentDepartmentId = "";
-        Q_EMIT currentDepartmentIdChanged();
+    if (containsDepartments != m_hasNavigation) {
+        m_hasNavigation = containsDepartments;
+        Q_EMIT hasNavigationChanged();
+    }
+
+    if (!containsDepartments && !m_currentNavigationId.isEmpty()) {
+        m_currentNavigationId = "";
+        Q_EMIT currentNavigationIdChanged();
+    }
+
+    // process the alt navigation (sort order filter)
+    QString currentAltNav(m_currentAltNavigationId);
+
+    if (m_sortOrderFilter && m_sortOrderFilter != m_lastSortOrderFilter) {
+        // build the nodes
+        m_altNavTree.reset(new DepartmentNode);
+        m_altNavTree->initializeForFilter(m_sortOrderFilter);
+
+        if (m_sortOrderFilter->has_active_option(m_receivedFilterState)) {
+            auto active_options = m_sortOrderFilter->active_options(m_receivedFilterState);
+            scopes::FilterOption::SCPtr active_option = *active_options.begin();
+            if (active_option) {
+                currentAltNav = QString::fromStdString(active_option->id());
+            }
+        }
+    }
+
+    m_lastSortOrderFilter = m_sortOrderFilter;
+
+    bool containsAltNav = m_sortOrderFilter.get() != nullptr;
+    // design decision - no navigation when doing searches
+    containsAltNav &= m_searchQuery.isEmpty();
+
+    if (containsAltNav != m_hasAltNavigation) {
+        m_hasAltNavigation = containsAltNav;
+        Q_EMIT hasAltNavigationChanged();
+    }
+
+    if (!containsAltNav && !m_currentAltNavigationId.isEmpty()) {
+        m_currentAltNavigationId = "";
+        Q_EMIT currentAltNavigationIdChanged();
+    }
+
+    if (containsAltNav && currentAltNav != m_currentAltNavigationId) {
+        m_currentAltNavigationId = currentAltNav;
+        Q_EMIT currentAltNavigationIdChanged();
+
+        // update the alt navigation models
+        updateNavigationModels(m_altNavTree.data(), m_altNavModels, m_currentAltNavigationId);
+    }
+}
+
+void Scope::updateNavigationModels(DepartmentNode* rootNode, QMultiMap<QString, Department*>& navigationModels, QString const& activeNavigation)
+{
+    DepartmentNode* parentNode = nullptr;
+    DepartmentNode* node = rootNode->findNodeById(activeNavigation);
+    if (node != nullptr) {
+        auto it = navigationModels.find(activeNavigation);
+        while (it != navigationModels.end() && it.key() == activeNavigation) {
+            it.value()->loadFromDepartmentNode(node);
+            ++it;
+        }
+        // if this node is a leaf, we need to update models for the parent
+        parentNode = node->isLeaf() ? node->parent() : nullptr;
+    }
+    if (parentNode != nullptr) {
+        auto it = navigationModels.find(parentNode->id());
+        while (it != navigationModels.end() && it.key() == parentNode->id()) {
+            it.value()->markSubdepartmentActive(activeNavigation);
+            ++it;
+        }
     }
 }
 
@@ -494,12 +556,25 @@
     }
 }
 
-void Scope::setCurrentDepartmentId(QString const& id)
-{
-    if (m_currentDepartmentId != id) {
-        m_currentDepartmentId = id;
-        Q_EMIT currentDepartmentIdChanged();
-    }
+void Scope::setStatus(shell::scopes::ScopeInterface::Status status)
+{
+    if (m_status != status) {
+        m_status = status;
+        Q_EMIT statusChanged();
+    }
+}
+
+void Scope::setCurrentNavigationId(QString const& id)
+{
+    if (m_currentNavigationId != id) {
+        m_currentNavigationId = id;
+        Q_EMIT currentNavigationIdChanged();
+    }
+}
+
+void Scope::setFilterState(scopes::FilterState const& filterState)
+{
+    m_filterState = filterState;
 }
 
 void Scope::dispatchSearch()
@@ -554,7 +629,7 @@
         scopes::SearchListenerBase::SPtr listener(new SearchResultReceiver(this));
         m_searchController->setListener(listener);
         try {
-            scopes::QueryCtrlProxy controller = m_proxy->search(m_searchQuery.toStdString(), m_currentDepartmentId.toStdString(), scopes::FilterState(), meta, listener);
+            scopes::QueryCtrlProxy controller = m_proxy->search(m_searchQuery.toStdString(), m_currentNavigationId.toStdString(), m_filterState, meta, listener);
             m_searchController->setController(controller);
         } catch (std::exception& e) {
             qWarning("Caught an error from create_query(): %s", e.what());
@@ -652,9 +727,13 @@
     return m_searchInProgress;
 }
 
-bool Scope::visible() const
-{
-    // FIXME: get from scope config
+unity::shell::scopes::ScopeInterface::Status Scope::status() const
+{
+    return m_status;
+}
+
+bool Scope::favorite() const
+{
     return true;
 }
 
@@ -689,42 +768,86 @@
 }
 */
 
-unity::shell::scopes::DepartmentInterface* Scope::getDepartment(QString const& departmentId)
+unity::shell::scopes::NavigationInterface* Scope::getNavigation(QString const& navId)
 {
     if (!m_departmentTree) return nullptr;
 
-    DepartmentNode* node = m_departmentTree->findNodeById(departmentId);
-    if (!node) return nullptr;
-
-    Department* departmentModel = new Department;
-    departmentModel->loadFromDepartmentNode(node);
-
-    m_departmentModels.insert(departmentId, departmentModel);
-    m_inverseDepartments.insert(departmentModel, departmentId);
-    QObject::connect(departmentModel, &QObject::destroyed, this, &Scope::departmentModelDestroyed);
-
-    return departmentModel;
+    DepartmentNode* node = m_departmentTree->findNodeById(navId);
+    if (!node) return nullptr;
+
+    Department* navModel = new Department;
+    navModel->setScopeId(this->id());
+    navModel->loadFromDepartmentNode(node);
+    navModel->markSubdepartmentActive(m_currentNavigationId);
+
+    // sharing m_inverseDepartments with getAltNavigation
+    m_departmentModels.insert(navId, navModel);
+    m_inverseDepartments.insert(navModel, navId);
+    QObject::connect(navModel, &QObject::destroyed, this, &Scope::departmentModelDestroyed);
+
+    return navModel;
+}
+
+unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& navId)
+{
+    if (!m_altNavTree) return nullptr;
+
+    DepartmentNode* node = m_altNavTree->findNodeById(navId);
+    if (!node) return nullptr;
+
+    Department* navModel = new Department;
+    navModel->setScopeId(this->id());
+    navModel->loadFromDepartmentNode(node);
+    navModel->markSubdepartmentActive(m_currentAltNavigationId);
+
+    // sharing m_inverseDepartments with getNavigation
+    m_altNavModels.insert(navId, navModel);
+    m_inverseDepartments.insert(navModel, navId);
+    QObject::connect(navModel, &QObject::destroyed, this, &Scope::departmentModelDestroyed);
+
+    return navModel;
+}
+
+QString Scope::buildQuery(QString const& scopeId, QString const& searchQuery, QString const& departmentId, QString const& primaryFilterId, QString const& primaryOptionId)
+{
+    scopes::CannedQuery q(scopeId.toStdString());
+    q.set_query_string(searchQuery.toStdString());
+    q.set_department_id(departmentId.toStdString());
+
+    if (!primaryFilterId.isEmpty() && !primaryOptionId.isEmpty()) {
+        scopes::FilterState filter_state;
+        scopes::OptionSelectorFilter::update_state(filter_state, primaryFilterId.toStdString(), primaryOptionId.toStdString(), true);
+        q.set_filter_state(filter_state);
+    }
+
+    return QString::fromStdString(q.to_uri());
+}
+
+void Scope::setNavigationState(QString const& navId, bool altNavigation)
+{
+    QString primaryFilterId;
+    if (m_sortOrderFilter) {
+        primaryFilterId = QString::fromStdString(m_sortOrderFilter->id());
+    }
+    if (!altNavigation) {
+        // switch current department id
+        performQuery(buildQuery(id(), m_searchQuery, navId, primaryFilterId, m_currentAltNavigationId));
+    } else {
+        // switch current primary filter
+        performQuery(buildQuery(id(), m_searchQuery, m_currentNavigationId, primaryFilterId, navId));
+    }
 }
 
 void Scope::departmentModelDestroyed(QObject* obj)
 {
-  scopes_ng::Department* department = reinterpret_cast<scopes_ng::Department*>(obj);
-
-  auto it = m_inverseDepartments.find(department);
-  if (it == m_inverseDepartments.end()) return;
-
-  m_departmentModels.remove(it.value(), department);
-  m_inverseDepartments.erase(it);
-}
-
-void Scope::loadDepartment(QString const& departmentId)
-{
-    if (departmentId != m_currentDepartmentId) {
-        m_currentDepartmentId = departmentId;
-        Q_EMIT currentDepartmentIdChanged();
-
-        dispatchSearch();
-    }
+    scopes_ng::Department* navigation = reinterpret_cast<scopes_ng::Department*>(obj);
+
+    auto it = m_inverseDepartments.find(navigation);
+    if (it == m_inverseDepartments.end()) return;
+
+    m_departmentModels.remove(it.value(), navigation);
+    m_altNavModels.remove(it.value(), navigation);
+    m_inverseDepartments.erase(it);
 }
 
 void Scope::performQuery(QString const& cannedQuery)
@@ -737,6 +860,12 @@
     }
 }
 
+void Scope::refresh()
+{
+    // shell has to specifically call this, maybe we should ignore the active flag here and just call dispatchSearch
+    invalidateResults();
+}
+
 QString Scope::searchQuery() const
 {
     return m_searchQuery;
@@ -757,14 +886,24 @@
     return m_isActive;
 }
 
-QString Scope::currentDepartmentId() const
-{
-    return m_currentDepartmentId;
-}
-
-bool Scope::hasDepartments() const
-{
-    return m_hasDepartments;
+QString Scope::currentNavigationId() const
+{
+    return m_currentNavigationId;
+}
+
+bool Scope::hasNavigation() const
+{
+    return m_hasNavigation;
+}
+
+QString Scope::currentAltNavigationId() const
+{
+    return m_currentAltNavigationId;
+}
+
+bool Scope::hasAltNavigation() const
+{
+    return m_hasAltNavigation;
 }
 
 QVariantMap Scope::customizations() const
@@ -783,6 +922,11 @@
     if (m_searchQuery.isNull() || search_query != m_searchQuery) {
         m_searchQuery = search_query;
 
+        // atm only empty query can have a filter state
+        if (!m_searchQuery.isEmpty()) {
+            m_filterState = scopes::FilterState();
+        }
+
         // FIXME: use a timeout
         invalidateResults();
 
@@ -828,6 +972,13 @@
     }
 }
 
+void Scope::setFavorite(const bool value)
+{
+    Q_UNUSED(value);
+
+    qWarning("Unimplemented: %s", __func__);
+}
+
 void Scope::activate(QVariant const& result_var)
 {
     if (!result_var.canConvert<std::shared_ptr<scopes::Result>>()) {
 
=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2014-07-31 11:08:50 +0000
+++ src/Unity/scope.h	2014-08-06 08:35:31 +0000
@@ -116,17 +116,20 @@
     QString iconHint() const override;
     QString description() const override;
     QString searchHint() const override;
-    bool visible() const override;
+    bool favorite() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    unity::shell::scopes::ScopeInterface::Status status() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     unity::shell::scopes::SettingsModelInterface* settings() const override;
     QString searchQuery() const override;
     QString noResultsHint() const override;
     QString formFactor() const override;
     bool isActive() const override;
-    QString currentDepartmentId() const override;
-    bool hasDepartments() const override;
+    QString currentNavigationId() const override;
+    bool hasNavigation() const override;
+    QString currentAltNavigationId() const override;
+    bool hasAltNavigation() const override;
     QVariantMap customizations() const override;
 
     /* setters */
@@ -134,14 +137,17 @@
     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 activate(QVariant const& result) override;
     Q_INVOKABLE unity::shell::scopes::PreviewStackInterface* preview(QVariant const& result) override;
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
-    Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(QString const& id) override;
-    Q_INVOKABLE void loadDepartment(QString const& id) override;
+    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& id) override;
+    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& id) override;
+    Q_INVOKABLE void setNavigationState(QString const& navId, bool altNavigation) override;
     Q_INVOKABLE void performQuery(QString const& cannedQuery) override;
+    Q_INVOKABLE void refresh() override;
 
     void setScopeData(unity::scopes::ScopeMetadata const& data);
     void handleActivation(std::shared_ptr<unity::scopes::ActivationResponse> const&, unity::scopes::Result::SPtr const&);
@@ -164,6 +170,7 @@
 
 protected:
     void setSearchInProgress(bool searchInProgress);
+    void setStatus(unity::shell::scopes::ScopeInterface::Status status);
     void invalidateLastSearch();
     virtual void dispatchSearch();
 
@@ -173,9 +180,12 @@
     QPointer<Scopes> m_scopesInstance;
 
 private:
+    static void updateNavigationModels(DepartmentNode* rootNode, QMultiMap<QString, Department*>& navigationModels, QString const& activeNavigation);
+    static QString buildQuery(QString const& scopeId, QString const& searchQuery, QString const& departmentId, QString const& primaryFilterId, QString const& primaryOptionId);
     void setScopesInstance(Scopes*);
     void startTtlTimer();
-    void setCurrentDepartmentId(QString const& id);
+    void setCurrentNavigationId(QString const& id);
+    void setFilterState(unity::scopes::FilterState const& filterState);
     void processSearchChunk(PushEvent* pushEvent);
     void executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation);
 
@@ -187,13 +197,15 @@
     QString m_searchQuery;
     QString m_noResultsHint;
     QString m_formFactor;
-    QString m_currentDepartmentId;
+    QString m_currentNavigationId;
+    QString m_currentAltNavigationId;
     QVariantMap m_customizations;
     bool m_isActive;
     bool m_searchInProgress;
     bool m_resultsDirty;
     bool m_delayedClear;
-    bool m_hasDepartments;
+    bool m_hasNavigation;
+    bool m_hasAltNavigation;
 
     std::unique_ptr<CollectionController> m_searchController;
     std::unique_ptr<CollectionController> m_activationController;
@@ -202,15 +214,22 @@
     std::shared_ptr<unity::scopes::ActivationResponse> m_delayedActivation;
     unity::scopes::Department::SCPtr m_rootDepartment;
     unity::scopes::Department::SCPtr m_lastRootDepartment;
+    unity::scopes::OptionSelectorFilter::SCPtr m_sortOrderFilter;
+    unity::scopes::OptionSelectorFilter::SCPtr m_lastSortOrderFilter;
+    unity::scopes::FilterState m_filterState;
+    unity::scopes::FilterState m_receivedFilterState;
+    unity::shell::scopes::ScopeInterface::Status m_status;
     QGSettings* m_settings;
     QScopedPointer<SettingsModel> m_settingsModel;
     QSharedPointer<DepartmentNode> m_departmentTree;
+    QSharedPointer<DepartmentNode> m_altNavTree;
     QTimer m_aggregatorTimer;
     QTimer m_clearTimer;
     QTimer m_invalidateTimer;
     QList<std::shared_ptr<unity::scopes::CategorisedResult>> m_cachedResults;
     QSet<unity::shell::scopes::ScopeInterface*> m_tempScopes;
     QMultiMap<QString, Department*> m_departmentModels;
+    QMultiMap<QString, Department*> m_altNavModels;
     QMap<Department*, QString> m_inverseDepartments;
     QMetaObject::Connection m_metadataConnection;
     LocationService::Ptr m_locationService;
 
=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-07-31 11:08:50 +0000
+++ src/Unity/scopes.cpp	2014-08-06 08:35:31 +0000
@@ -130,6 +130,11 @@
     return m_scopes.count();
 }
 
+int Scopes::count() const
+{
+    return m_scopes.count();
+}
+
 void Scopes::populateScopes()
 {
     auto thread = new ScopeListWorker;
@@ -198,6 +203,7 @@
 
     m_loaded = true;
     Q_EMIT loadedChanged();
+    Q_EMIT countChanged();
     Q_EMIT overviewScopeChanged();
     Q_EMIT metadataRefreshed();
 
@@ -249,8 +255,6 @@
             return QVariant::fromValue(scope);
         case Scopes::RoleId:
             return QString(scope->id());
-        case Scopes::RoleVisible:
-            return QVariant::fromValue(scope->visible());
         case Scopes::RoleTitle:
             return QString(scope->name());
         default:
 
=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2014-07-31 11:08:50 +0000
+++ src/Unity/scopes.h	2014-08-06 08:35:31 +0000
@@ -62,6 +62,7 @@
     void refreshScopeMetadata();
 
     bool loaded() const override;
+    int count() const override;
     unity::shell::scopes::ScopeInterface* overviewScope() const override;
 
     LocationService::Ptr locationService() const;
 
=== modified file 'tests/data/CMakeLists.txt'
--- tests/data/CMakeLists.txt	2014-07-22 13:49:50 +0000
+++ tests/data/CMakeLists.txt	2014-08-06 08:35:31 +0000
@@ -1,5 +1,6 @@
 add_subdirectory(mock-scope)
 add_subdirectory(mock-scope-departments)
+add_subdirectory(mock-scope-double-nav)
 add_subdirectory(mock-scope-ttl)
 add_subdirectory(scopes)
 
 
=== added directory 'tests/data/mock-scope-double-nav'
=== added file 'tests/data/mock-scope-double-nav/CMakeLists.txt'
--- tests/data/mock-scope-double-nav/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-double-nav/CMakeLists.txt	2014-08-06 08:35:31 +0000
@@ -0,0 +1,16 @@
+include(FindPkgConfig)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
+
+set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
+
+include_directories(${SCOPESLIB_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(SCOPE_SOURCES
+    mock-scope-double-nav.cpp
+    )
+
+add_library(mock-scope-double-nav MODULE ${SCOPE_SOURCES})
+target_link_libraries(mock-scope-double-nav ${SCOPESLIB_LDFLAGS})
+
+configure_file(mock-scope-double-nav.ini.in mock-scope-double-nav.ini)
 
=== added file 'tests/data/mock-scope-double-nav/mock-scope-double-nav.cpp'
--- tests/data/mock-scope-double-nav/mock-scope-double-nav.cpp	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-double-nav/mock-scope-double-nav.cpp	2014-08-06 08:35:31 +0000
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authored by: Pete Woods <[e-mail]>
+ */
+
+#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/OptionSelectorFilter.h>
+#include <unity/scopes/ScopeBase.h>
+#include <unity/scopes/SearchReply.h>
+
+#include <iostream>
+#include <thread>
+#include <atomic>
+#include <sstream>
+
+#define EXPORT __attribute__ ((visibility ("default")))
+
+using namespace std;
+using namespace unity::scopes;
+
+class MyQuery : public SearchQueryBase
+{
+public:
+    MyQuery(CannedQuery const& query, SearchMetadata const& metadata) :
+        SearchQueryBase(query, metadata),
+        department_id_(query.department_id())
+    {
+    }
+
+    ~MyQuery()
+    {
+    }
+
+    virtual void cancelled() override
+    {
+    }
+
+    static Department::SPtr create_root_dep(CannedQuery const& query)
+    {
+        Department::SPtr child_dep;
+        Department::SPtr root_dep;
+        root_dep = Department::create("", query, "All departments");
+
+        child_dep = Department::create("books", query, "Books");
+        child_dep->set_has_subdepartments();
+        root_dep->add_subdepartment(child_dep);
+
+        child_dep = Department::create("movies", query, "Movies, TV, Music");
+        child_dep->set_has_subdepartments();
+        root_dep->add_subdepartment(child_dep);
+
+        child_dep = Department::create("electronics", query, "Electronics");
+        child_dep->set_has_subdepartments();
+        root_dep->add_subdepartment(child_dep);
+
+        child_dep = Department::create("home", query, "Home, Garden & DIY");
+        child_dep->set_has_subdepartments();
+        root_dep->add_subdepartment(child_dep);
+
+        child_dep = Department::create("toys", query, "Toys, Children & Baby");
+        child_dep->set_has_subdepartments();
+        root_dep->add_subdepartment(child_dep);
+
+        return root_dep;
+    }
+
+    static Department::SPtr get_department_by_id(Department::SPtr root_dep, std::string const& dep_id)
+    {
+        auto children = root_dep->subdepartments();
+        for (auto it = children.begin(); it != children.end(); ++it)
+        {
+            if ((*it)->id() == dep_id) return const_pointer_cast<Department>(*it);
+        }
+        return Department::SPtr();
+    }
+
+    virtual void run(SearchReplyProxy const& reply) override
+    {
+        Department::SPtr child_dep;
+        Department::SPtr root_dep;
+        Department::SPtr active_dep;
+
+        root_dep = create_root_dep(query());
+
+        if (department_id_.compare(0, 5, "books") == 0)
+        {
+            active_dep = get_department_by_id(root_dep, "books");
+            child_dep = Department::create("books-kindle", query(), "Kindle Books");
+            active_dep->add_subdepartment(child_dep);
+
+            child_dep = Department::create("books-study", query(), "Books for Study");
+            active_dep->add_subdepartment(child_dep);
+
+            child_dep = Department::create("books-audio", query(), "Audiobooks");
+            active_dep->add_subdepartment(child_dep);
+        }
+
+        if (department_id_.compare(0, 4, "home") == 0)
+        {
+            active_dep = get_department_by_id(root_dep, "home");
+            child_dep = Department::create("home-garden", query(), "Garden & Outdoors");
+            active_dep->add_subdepartment(child_dep);
+
+            child_dep = Department::create("home-furniture", query(), "Homeware & Furniture");
+            active_dep->add_subdepartment(child_dep);
+
+            child_dep = Department::create("home-kitchen", query(), "Kitchen & Dining");
+            active_dep->add_subdepartment(child_dep);
+        }
+
+        if (department_id_.compare(0, 4, "toys") == 0)
+        {
+            active_dep = get_department_by_id(root_dep, "toys");
+            child_dep = Department::create("toys-games", query(), "Toys & Games");
+            active_dep->add_subdepartment(child_dep);
+
+            child_dep = Department::create("toys-baby", query(), "Baby");
+            active_dep->add_subdepartment(child_dep);
+        }
+
+        // provide only partial tree for this leaf
+        if (department_id_ == "toys-games")
+        {
+            root_dep = Department::create("", query(), "All departments");
+            child_dep = Department::create("toys", query(), "Toys, Children & Baby");
+            root_dep->add_subdepartment(child_dep);
+            active_dep = Department::create("toys-games", query(), "Toys & Games");
+            child_dep->add_subdepartment(active_dep);
+        }
+
+        reply->register_departments(root_dep);
+
+        // add sort order filter
+        OptionSelectorFilter::UPtr sort_order_filter = OptionSelectorFilter::create("sort-order", "Sort Order");
+        sort_order_filter->set_display_hints(FilterBase::Primary);
+        sort_order_filter->add_option("featured", "Featured");
+        sort_order_filter->add_option("top", "Most popular");
+        sort_order_filter->add_option("best", "Best sellers");
+        Filters filters;
+        filters.push_back(std::move(sort_order_filter));
+
+        FilterState state;
+        FilterState initial_filter_state(query().filter_state());
+        if (initial_filter_state.has_filter("sort-order")) {
+            state = initial_filter_state;
+        } else {
+            // default option
+            OptionSelectorFilter::update_state(state, "sort-order", "featured", true);
+        }
+
+        reply->push(filters, state);
+
+        auto cat1 = reply->register_category("cat1", "Category 1", "");
+        CategorisedResult res1(cat1);
+        res1.set_uri("test:uri");
+        res1.set_title("result for: \"" + query().query_string() + "\"");
+        reply->push(res1);
+    }
+
+protected:
+    string department_id_;
+};
+
+class MyScope : public ScopeBase
+{
+public:
+    MyScope()
+    {
+    }
+
+    virtual SearchQueryBase::UPtr search(CannedQuery const& q, SearchMetadata const& metadata) override
+    {
+        return SearchQueryBase::UPtr(new MyQuery(q, metadata));
+    }
+
+    virtual PreviewQueryBase::UPtr preview(Result const&, ActionMetadata const&) override
+    {
+        return nullptr;
+    }
+};
+
+extern "C"
+{
+
+    EXPORT
+    unity::scopes::ScopeBase*
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_CREATE_FUNCTION()
+    {
+        return new MyScope;
+    }
+
+    EXPORT
+    void
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
+    {
+        delete scope_base;
+    }
+
+}
 
=== added file 'tests/data/mock-scope-double-nav/mock-scope-double-nav.ini.in'
--- tests/data/mock-scope-double-nav/mock-scope-double-nav.ini.in	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-double-nav/mock-scope-double-nav.ini.in	2014-08-06 08:35:31 +0000
@@ -0,0 +1,8 @@
+[ScopeConfig]
+DisplayName = mock-double-nav.DisplayName
+Description = mock-double-nav.Description
+Art = /mock-double-nav.Art
+Icon = /mock-double-nav.Icon
+SearchHint = mock-double-nav.SearchHint
+HotKey = mock-double-nav.HotKey
+Author = mock-double-nav.Author
 
=== modified file 'tests/departmentstest.cpp'
--- tests/departmentstest.cpp	2014-07-18 16:35:52 +0000
+++ tests/departmentstest.cpp	2014-08-06 08:35:31 +0000
@@ -48,6 +48,7 @@
 private:
     QScopedPointer<Scopes> m_scopes;
     Scope* m_scope;
+    Scope* m_scope_navs;
     QScopedPointer<RegistrySpawner> m_registry;
 
 private Q_SLOTS:
@@ -78,6 +79,10 @@
         m_scope = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope-departments")));
         QVERIFY(m_scope != nullptr);
         m_scope->setActive(true);
+
+        m_scope_navs = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope-double-nav")));
+        QVERIFY(m_scope_navs != nullptr);
+        m_scope_navs->setActive(true);
     }
 
     void cleanup()
@@ -90,37 +95,40 @@
     {
         performSearch(m_scope, QString("foo"));
 
-        QCOMPARE(m_scope->hasDepartments(), false);
+        QCOMPARE(m_scope->hasNavigation(), false);
+        QCOMPARE(m_scope->hasAltNavigation(), false);
     }
 
     void testRootDepartment()
     {
         performSearch(m_scope, QString(""));
 
-        QCOMPARE(m_scope->hasDepartments(), true);
-        QCOMPARE(m_scope->currentDepartmentId(), QString(""));
-        QScopedPointer<DepartmentInterface> departmentModel(m_scope->getDepartment(m_scope->currentDepartmentId()));
+        QCOMPARE(m_scope->hasNavigation(), true);
+        QCOMPARE(m_scope->hasAltNavigation(), false);
+        QCOMPARE(m_scope->currentNavigationId(), QString(""));
+        QScopedPointer<NavigationInterface> departmentModel(m_scope->getNavigation(m_scope->currentNavigationId()));
         QVERIFY(departmentModel != nullptr);
 
-        QVERIFY(departmentModel->departmentId().isEmpty());
+        QVERIFY(departmentModel->navigationId().isEmpty());
         QCOMPARE(departmentModel->label(), QString("All departments"));
         QCOMPARE(departmentModel->allLabel(), QString(""));
-        QCOMPARE(departmentModel->parentDepartmentId(), QString());
+        QCOMPARE(departmentModel->parentNavigationId(), QString());
         QCOMPARE(departmentModel->parentLabel(), QString());
         QCOMPARE(departmentModel->loaded(), true);
         QCOMPARE(departmentModel->isRoot(), true);
+        QCOMPARE(departmentModel->hidden(), false);
 
         QCOMPARE(departmentModel->rowCount(), 5);
         QModelIndex idx;
 
         idx = departmentModel->index(0);
-        QCOMPARE(departmentModel->data(idx, Department::Roles::RoleDepartmentId), QVariant(QString("books")));
+        QCOMPARE(departmentModel->data(idx, Department::Roles::RoleNavigationId), QVariant(QString("books")));
         QCOMPARE(departmentModel->data(idx, Department::Roles::RoleLabel), QVariant(QString("Books")));
         QCOMPARE(departmentModel->data(idx, Department::Roles::RoleHasChildren), QVariant(true));
         QCOMPARE(departmentModel->data(idx, Department::Roles::RoleIsActive), QVariant(false));
 
         idx = departmentModel->index(4);
-        QCOMPARE(departmentModel->data(idx, Department::Roles::RoleDepartmentId), QVariant(QString("toys")));
+        QCOMPARE(departmentModel->data(idx, Department::Roles::RoleNavigationId), QVariant(QString("toys")));
         QCOMPARE(departmentModel->data(idx, Department::Roles::RoleLabel), QVariant(QString("Toys, Children & Baby")));
         QCOMPARE(departmentModel->data(idx, Department::Roles::RoleHasChildren), QVariant(true));
         QCOMPARE(departmentModel->data(idx, Department::Roles::RoleIsActive), QVariant(false));
@@ -130,23 +138,23 @@
     {
         performSearch(m_scope, QString(""));
 
-        QCOMPARE(m_scope->currentDepartmentId(), QString(""));
-        QScopedPointer<DepartmentInterface> departmentModel(m_scope->getDepartment(QString("toys")));
+        QCOMPARE(m_scope->currentNavigationId(), QString(""));
+        QScopedPointer<NavigationInterface> departmentModel(m_scope->getNavigation(QString("toys")));
         QVERIFY(departmentModel != nullptr);
 
         QSignalSpy spy(departmentModel.data(), SIGNAL(loadedChanged()));
 
-        QCOMPARE(departmentModel->departmentId(), QString("toys"));
+        QCOMPARE(departmentModel->navigationId(), QString("toys"));
         QCOMPARE(departmentModel->label(), QString("Toys, Children & Baby"));
         QCOMPARE(departmentModel->allLabel(), QString(""));
-        QCOMPARE(departmentModel->parentDepartmentId(), QString(""));
+        QCOMPARE(departmentModel->parentNavigationId(), QString(""));
         QCOMPARE(departmentModel->parentLabel(), QString("All departments"));
         QCOMPARE(departmentModel->loaded(), false);
         QCOMPARE(departmentModel->isRoot(), false);
 
         QCOMPARE(departmentModel->rowCount(), 0);
 
-        m_scope->loadDepartment(QString("toys"));
+        m_scope->setNavigationState(departmentModel->navigationId(), false);
         QVERIFY(spy.wait());
 
         QCOMPARE(departmentModel->rowCount(), 2);
@@ -158,16 +166,18 @@
     {
         performSearch(m_scope, QString(""));
 
-        QCOMPARE(m_scope->currentDepartmentId(), QString(""));
+        QCOMPARE(m_scope->currentNavigationId(), QString(""));
         QSignalSpy spy(m_scope, SIGNAL(searchInProgressChanged()));
-        m_scope->loadDepartment(QString("books"));
+        QScopedPointer<NavigationInterface> navModel(m_scope->getNavigation(QString("books")));
+        m_scope->setNavigationState(navModel->navigationId(), false);
         QVERIFY(spy.wait());
         QCOMPARE(m_scope->searchInProgress(), false);
-        QScopedPointer<DepartmentInterface> departmentModel(m_scope->getDepartment(QString("books")));
+        QScopedPointer<NavigationInterface> departmentModel(m_scope->getNavigation(QString("books")));
         QCOMPARE(departmentModel->isRoot(), false);
 
+        navModel.reset(m_scope->getNavigation(QString("books-audio")));
         // this is a leaf department, so activating it should update the parent model
-        m_scope->loadDepartment(QString("books-audio"));
+        m_scope->setNavigationState(navModel->navigationId(), false);
         QVERIFY(spy.wait());
         QCOMPARE(m_scope->searchInProgress(), false);
         QCOMPARE(departmentModel->isRoot(), false);
@@ -175,7 +185,7 @@
         bool foundAudiobooks = false;
         for (int i = 0; i < departmentModel->rowCount(); i++) {
             QModelIndex idx(departmentModel->index(i));
-            QVariant data = departmentModel->data(idx, Department::Roles::RoleDepartmentId);
+            QVariant data = departmentModel->data(idx, Department::Roles::RoleNavigationId);
             if (data.toString() == QString("books-audio")) {
                 QCOMPARE(departmentModel->data(idx, Department::Roles::RoleIsActive).toBool(), true);
                 foundAudiobooks = true;
@@ -188,16 +198,17 @@
     {
         performSearch(m_scope, QString(""));
 
-        QCOMPARE(m_scope->currentDepartmentId(), QString(""));
+        QCOMPARE(m_scope->currentNavigationId(), QString(""));
         QSignalSpy spy(m_scope, SIGNAL(searchInProgressChanged()));
-        m_scope->loadDepartment(QString("books"));
+        QScopedPointer<NavigationInterface> navModel(m_scope->getNavigation(QString("books")));
+        m_scope->setNavigationState(navModel->navigationId(), false);
         QVERIFY(spy.wait());
         QCOMPARE(m_scope->searchInProgress(), false);
-        QScopedPointer<DepartmentInterface> departmentModel(m_scope->getDepartment(QString("books")));
+        QScopedPointer<NavigationInterface> departmentModel(m_scope->getNavigation(QString("books")));
         QCOMPARE(departmentModel->isRoot(), false);
 
         // get the root again without actually loading the department
-        departmentModel.reset(m_scope->getDepartment(departmentModel->parentDepartmentId()));
+        departmentModel.reset(m_scope->getNavigation(departmentModel->parentNavigationId()));
         QCOMPARE(departmentModel->isRoot(), true);
         QEXPECT_FAIL("", "We have the department in cache, to it kind of is loaded", Continue);
         QCOMPARE(departmentModel->loaded(), false);
@@ -205,32 +216,98 @@
 
     void testIncompleteTreeOnLeaf()
     {
-        QScopedPointer<DepartmentInterface> departmentModel;
+        QScopedPointer<NavigationInterface> navModel;
+        QScopedPointer<NavigationInterface> departmentModel;
         performSearch(m_scope, QString(""));
 
-        QCOMPARE(m_scope->currentDepartmentId(), QString(""));
-        QCOMPARE(m_scope->hasDepartments(), true);
+        QCOMPARE(m_scope->currentNavigationId(), QString(""));
+        QCOMPARE(m_scope->hasNavigation(), true);
 
         QSignalSpy spy(m_scope, SIGNAL(searchInProgressChanged()));
-        m_scope->loadDepartment(QString("toys"));
+        navModel.reset(m_scope->getNavigation(QString("toys")));
+        m_scope->setNavigationState(navModel->navigationId(), false);
         QVERIFY(spy.wait());
         QCOMPARE(m_scope->searchInProgress(), false);
 
-        departmentModel.reset(m_scope->getDepartment(QString("toys")));
+        departmentModel.reset(m_scope->getNavigation(QString("toys")));
         QCOMPARE(departmentModel->isRoot(), false);
         QCOMPARE(departmentModel->rowCount(), 2);
 
-        m_scope->loadDepartment(QString("toys-games"));
+        navModel.reset(m_scope->getNavigation(QString("toys-games")));
+        m_scope->setNavigationState(navModel->navigationId(), false);
         QVERIFY(spy.wait());
         QCOMPARE(m_scope->searchInProgress(), false);
 
         // after getting the parent department model, it should still have
         // all the leaves, even though the leaf served just itself
-        departmentModel.reset(m_scope->getDepartment(QString("toys")));
+        departmentModel.reset(m_scope->getNavigation(QString("toys")));
         QCOMPARE(departmentModel->isRoot(), false);
         QCOMPARE(departmentModel->rowCount(), 2);
     }
 
+    void testDoubleNavigation()
+    {
+        performSearch(m_scope_navs, QString(""));
+
+        QCOMPARE(m_scope_navs->hasNavigation(), true);
+        QCOMPARE(m_scope_navs->hasAltNavigation(), true);
+        QCOMPARE(m_scope_navs->currentNavigationId(), QString(""));
+        QCOMPARE(m_scope_navs->currentAltNavigationId(), QString("featured"));
+        QScopedPointer<NavigationInterface> departmentModel(m_scope_navs->getNavigation(m_scope_navs->currentNavigationId()));
+        QVERIFY(departmentModel != nullptr);
+
+        QVERIFY(!m_scope_navs->currentAltNavigationId().isEmpty());
+        QScopedPointer<NavigationInterface> sortOrderModel(m_scope_navs->getAltNavigation(""));
+        QVERIFY(sortOrderModel != nullptr);
+
+        QCOMPARE(sortOrderModel->navigationId(), QString(""));
+        QCOMPARE(sortOrderModel->label(), QString("Sort Order"));
+        QCOMPARE(sortOrderModel->allLabel(), QString(""));
+        QCOMPARE(sortOrderModel->parentNavigationId(), QString());
+        QCOMPARE(sortOrderModel->parentLabel(), QString());
+        QCOMPARE(sortOrderModel->loaded(), true);
+        QCOMPARE(sortOrderModel->isRoot(), true);
+        QCOMPARE(sortOrderModel->hidden(), true);
+
+        QCOMPARE(sortOrderModel->rowCount(), 3);
+        QModelIndex idx;
+
+        idx = sortOrderModel->index(0);
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleNavigationId), QVariant(QString("featured")));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleLabel), QVariant(QString("Featured")));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleHasChildren), QVariant(false));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleIsActive), QVariant(true));
+
+        idx = sortOrderModel->index(2);
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleNavigationId), QVariant(QString("best")));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleLabel), QVariant(QString("Best sellers")));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleHasChildren), QVariant(false));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleIsActive), QVariant(false));
+    }
+
+    void testDoubleNavChangeActive()
+    {
+        performSearch(m_scope_navs, QString(""));
+
+        QCOMPARE(m_scope_navs->currentAltNavigationId(), QString("featured"));
+        QScopedPointer<NavigationInterface> sortOrderModel(m_scope_navs->getAltNavigation(""));
+        QVERIFY(sortOrderModel != nullptr);
+        QCOMPARE(sortOrderModel->loaded(), true);
+        QCOMPARE(sortOrderModel->rowCount(), 3);
+
+        QModelIndex idx(sortOrderModel->index(1));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleNavigationId), QVariant(QString("top")));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleIsActive), QVariant(false));
+
+        // perform a query for the other navigation
+        QSignalSpy spy(m_scope_navs, SIGNAL(searchInProgressChanged()));
+        m_scope_navs->setNavigationState("top", true);
+        QVERIFY(spy.wait());
+
+        // the model should be updated
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleNavigationId), QVariant(QString("top")));
+        QCOMPARE(sortOrderModel->data(idx, Department::Roles::RoleIsActive), QVariant(true));
+    }
 };
 
 QTEST_GUILESS_MAIN(DepartmentsTest)
 
=== modified file 'tests/previewtest.cpp'
--- tests/previewtest.cpp	2014-08-05 12:10:41 +0000
+++ tests/previewtest.cpp	2014-08-06 08:35:31 +0000
@@ -67,14 +67,14 @@
         QVERIFY(spy.wait());
         QCOMPARE(m_scopes->loaded(), true);
         // should have at least one scope now
-        QCOMPARE(m_scopes->rowCount(), 4);
+        QVERIFY(m_scopes->rowCount() > 1);
 
         QVariant scope_var = m_scopes->data(m_scopes->index(0), Scopes::Roles::RoleScope);
         QVERIFY(scope_var.canConvert<Scope*>());
 
         // get scope proxy
-        m_scope = scope_var.value<Scope*>();
-        QCOMPARE(m_scope->id(), QString("mock-scope"));
+        m_scope = m_scopes->getScopeById("mock-scope");
+        QVERIFY(m_scope != nullptr);
         m_scope->setActive(true);
     }
 
 
=== modified file 'tests/resultstest.cpp'
--- tests/resultstest.cpp	2014-07-31 13:04:20 +0000
+++ tests/resultstest.cpp	2014-08-06 08:35:31 +0000
@@ -112,15 +112,15 @@
         QVERIFY(spy.wait());
         QCOMPARE(m_scopes->loaded(), true);
         // should have at least one scope now
-        QCOMPARE(m_scopes->rowCount(), 4);
+        QVERIFY(m_scopes->rowCount() > 1);
 
         // get scope proxy
-        m_scope = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope")));
+        m_scope = qobject_cast<scopes_ng::Scope*>(m_scopes->getScopeById(QString("mock-scope")));
         QVERIFY(m_scope != nullptr);
         m_scope->setActive(true);
 
         // get scope proxy for TTL scope
-        m_scope_ttl = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope-ttl")));
+        m_scope_ttl = qobject_cast<scopes_ng::Scope*>(m_scopes->getScopeById(QString("mock-scope-ttl")));
         QVERIFY(m_scope != nullptr);
         m_scope_ttl->setActive(true);
     }
@@ -177,7 +177,6 @@
         QCOMPARE(m_scope->description(), QString("mock.Description"));
         QCOMPARE(m_scope->searchHint(), QString("mock.SearchHint"));
         QCOMPARE(m_scope->shortcut(), QString("mock.HotKey"));
-        QCOMPARE(m_scope->visible(), true);
         QCOMPARE(m_scope->searchQuery(), QString());
 
         QVariantMap customizations(m_scope->customizations());
@@ -199,7 +198,6 @@
         QCOMPARE(m_scope_ttl->description(), QString("mock-ttl.Description"));
         QCOMPARE(m_scope_ttl->searchHint(), QString());
         QCOMPARE(m_scope_ttl->shortcut(), QString());
-        QCOMPARE(m_scope_ttl->visible(), true);
         QCOMPARE(m_scope_ttl->searchQuery(), QString());
     }
 
 
=== modified file 'tests/settingsendtoendtest.cpp'
--- tests/settingsendtoendtest.cpp	2014-08-05 16:41:02 +0000
+++ tests/settingsendtoendtest.cpp	2014-08-06 08:35:31 +0000
@@ -61,10 +61,10 @@
         QVERIFY(spy.wait());
         QCOMPARE(m_scopes->loaded(), true);
         // should have at least one scope now
-        QCOMPARE(m_scopes->rowCount(), 4);
+        QVERIFY(m_scopes->rowCount() > 1);
 
         // get scope proxy
-        m_scope = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope")));
+        m_scope = m_scopes->getScopeById("mock-scope");
         QVERIFY(m_scope != nullptr);
         m_scope->setActive(true);
     }