Merge lp:~stolowski/unity-api/filters-iface into lp:unity-api

[Paweł Stołowski]

Base interfaces for filters.

Base interfaces for filters.

NOTE: Decided no to land yet till designs are closer to be finalized.

[Albert Astals Cid (aacid)]

I'd say we need to rename the id property to filterId, QML doesn't like people taking the id keyword

Q_PROPERTY(OptionSelectorOptionsInterface* options READ options) needs a changed signal, otherwise QML will complain when i bind it to a property

review: Needs Fixing

[Paweł Stołowski (stolowski)]

> I'd say we need to rename the id property to filterId, QML doesn't like people
> taking the id keyword
>
> Q_PROPERTY(OptionSelectorOptionsInterface* options READ options) needs a
> changed signal, otherwise QML will complain when i bind it to a property

Ok, done.

[Albert Astals Cid (aacid)]

Actually i was wrong about the NOTIFY signal what it needed was a CONSTANT marker as do need it both of
 Q_PROPERTY(QString filterId READ filterId)
 Q_PROPERTY(QString filterType READ filterType)

Sorry i didn't realize before

review: Needs Fixing

[Paweł Stołowski (stolowski)]

> Actually i was wrong about the NOTIFY signal what it needed was a CONSTANT
> marker as do need it both of
> Q_PROPERTY(QString filterId READ filterId)
> Q_PROPERTY(QString filterType READ filterType)
>
> Sorry i didn't realize before

No problem, updated.

[Albert Astals Cid (aacid)]

Also make filterType property be an enum instead of a string as discussed on IRC?

review: Needs Fixing

[Paweł Stołowski (stolowski)]

> Also make filterType property be an enum instead of a string as discussed on
> IRC?

Right.. thanks for catching it! Fixed.

[Albert Astals Cid (aacid)]

New a few more Verifier { } added to tst_Scopes.qml to verify the mocks you created are actually returning the stuff it should

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:182
http://jenkins.qa.ubuntu.com/job/unity-api-ci/292/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/292/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-api-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/295/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

The Verifiers have been added, can't remember anything else more that i wanted fixed nor can see on checking the code.

review: Approve

[Albert Astals Cid (aacid)]

Back to needs review since lots of things happened since may :D

[Albert Astals Cid (aacid)]

You forgot a
>>>>>>> MERGE-SOURCE
in the changelog file

review: Needs Fixing

[Albert Astals Cid (aacid)]

Should we remove the altNav* from here too?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/unity-api-ci/331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/331/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-api/filters-iface]

194. By Paweł Stołowski on 2015-09-28

Merged all-label-role

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/unity-api-ci/339/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/339/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-api/filters-iface]

195. By Paweł Stołowski on 2015-09-29

Removed unused alt nav properties/methods

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/unity-api-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/340/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-api/filters-iface]

196. By Paweł Stołowski on 2015-10-09

Fully-qualified filterType property

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/unity-api-ci/348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/47

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/348/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-api/filters-iface]

197. By Paweł Stołowski on 2015-10-26

Merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/unity-api-ci/354/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/354/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good to me.

review: Approve

[lp:~stolowski/unity-api/filters-iface]

198. By Paweł Stołowski on 2015-11-06

Merged trunk

199. By Paweł Stołowski on 2015-11-16

Merged license-check

200. By Paweł Stołowski on 2015-11-17

Added title to filter base

201. By Paweł Stołowski on 2015-11-23

Method for resetting filters to defaults

202. By Paweł Stołowski on 2015-11-23

Merged trunk

203. By Paweł Stołowski on 2015-11-25

Merged trunk

204. By Paweł Stołowski on 2015-12-08

Merged trunk

205. By Paweł Stołowski on 2015-12-15

Merged trunk

206. By Paweł Stołowski on 2016-01-11

Merged trunk

207. By Paweł Stołowski on 2016-01-11

Bump

208. By Paweł Stołowski on 2016-02-19

Merged trunk

209. By Paweł Stołowski on 2016-03-07

Merged trunk

210. By Paweł Stołowski on 2016-03-07

Bump

211. By Paweł Stołowski on 2016-03-11

No changelog change:

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-02 11:23:43 +0000
+++ debian/changelog	2015-11-17 14:58:53 +0000
@@ -1,3 +1,10 @@
+unity-api (7.103+15.10.20150903-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Added Filters interface.
+  * Added allLabel role to the scopes NavigationInterface.
+
+ -- Pawel Stolowski <[e-mail]>  Mon, 28 Sep 2015 11:16:45 +0200
+
 unity-api (7.102+16.04.20151102-0ubuntu1) xenial; urgency=medium
 
   [ Nick Dedekind ]

=== modified file 'debian/control'
--- debian/control	2015-07-20 09:35:04 +0000
+++ debian/control	2015-11-17 14:58:53 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               devscripts,
                doxygen,
 # To allow cross-compiling to work, we append :native
 # to g++-4.9 so we don't try to run armhf g++

=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2015-09-15 09:15:11 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2015-11-17 14:58:53 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 7)
+set(VERSION 8)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== added file 'include/unity/shell/scopes/FilterBaseInterface.h'
--- include/unity/shell/scopes/FilterBaseInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/FilterBaseInterface.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SHELL_SCOPES_FILTERBASEINTERHACE_H
+#define UNITY_SHELL_SCOPES_FILTERBASEINTERHACE_H
+
+#include "FiltersInterface.h"
+#include <QObject>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API FilterBaseInterface : public QObject
+{
+    Q_OBJECT
+
+    public:
+
+        Q_PROPERTY(QString filterId READ filterId CONSTANT)
+        Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+        Q_PROPERTY(unity::shell::scopes::FiltersInterface::FilterType filterType READ filterType CONSTANT)
+
+        virtual QString filterId() const = 0;
+        virtual QString title() const = 0;
+        virtual FiltersInterface::FilterType filterType() const = 0;
+        virtual QString filterTag() const = 0;
+
+    Q_SIGNALS:
+        void titleChanged();
+
+    protected:
+        /// @cond
+        explicit FilterBaseInterface(QObject* parent = 0) : QObject(parent) {}
+        /// @endcond
+};
+
+}
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::FilterBaseInterface*)
+
+#endif

=== added file 'include/unity/shell/scopes/FiltersInterface.h'
--- include/unity/shell/scopes/FiltersInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/FiltersInterface.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SHELL_SCOPES_FILTERSINTERFACE_H
+#define UNITY_SHELL_SCOPES_FILTERSINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include <QAbstractListModel>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API FiltersInterface : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+    Q_ENUMS(FilterType)
+
+public:
+    enum Roles {
+        RoleFilterId = Qt::UserRole + 1,
+        RoleFilterType,
+        RoleFilter
+    };
+
+    enum FilterType {
+        Invalid,
+        OptionSelectorFilter,
+        RangeInputFilter
+        // TODO add remaining filters
+    };
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleFilterId] = "id";
+        roles[RoleFilterType] = "type";
+        roles[RoleFilter] = "filter";
+        return roles;
+    }
+
+protected:
+    /// @cond
+    explicit FiltersInterface(QObject* parent = 0) : QAbstractListModel(parent) {}
+    /// @endcond
+};
+
+}
+
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::FiltersInterface*)
+
+#endif

=== modified file 'include/unity/shell/scopes/NavigationInterface.h'
--- include/unity/shell/scopes/NavigationInterface.h	2014-08-04 13:58:53 +0000
+++ include/unity/shell/scopes/NavigationInterface.h	2015-11-17 14:58:53 +0000
@@ -94,6 +94,7 @@
     enum Roles {
         RoleNavigationId,
         RoleLabel,
+        RoleAllLabel,
         RoleHasChildren,
         RoleIsActive
     };
@@ -113,6 +114,7 @@
         QHash<int, QByteArray> roles;
         roles[RoleNavigationId] = "navigationId";
         roles[RoleLabel] = "label";
+        roles[RoleAllLabel] = "allLabel";
         roles[RoleHasChildren] = "hasChildren";
         roles[RoleIsActive] = "isActive";
         return roles;

=== added file 'include/unity/shell/scopes/OptionSelectorFilterInterface.h'
--- include/unity/shell/scopes/OptionSelectorFilterInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/OptionSelectorFilterInterface.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SHELL_SCOPES_OPTIONSELECTORFILTERINTERFACE_H
+#define UNITY_SHELL_SCOPES_OPTIONSELECTORFILTERINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include "FilterBaseInterface.h"
+#include "OptionSelectorOptionsInterface.h"
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API OptionSelectorFilterInterface : public FilterBaseInterface
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(QString label READ label NOTIFY labelChanged)
+    Q_PROPERTY(bool multiSelect READ multiSelect NOTIFY multiSelectChanged)
+    Q_PROPERTY(unity::shell::scopes::OptionSelectorOptionsInterface* options READ options CONSTANT)
+
+    FiltersInterface::FilterType filterType() const override
+    {
+        return FiltersInterface::OptionSelectorFilter;
+    }
+
+    virtual QString label() const = 0;
+    virtual bool multiSelect() const = 0;
+    virtual OptionSelectorOptionsInterface* options() const = 0;
+
+Q_SIGNALS:
+    void labelChanged(const QString&);
+    void multiSelectChanged(bool);
+
+protected:
+    /// @cond
+    explicit OptionSelectorFilterInterface(QObject* parent = 0) : FilterBaseInterface(parent) {}
+    /// @endcond
+};
+
+}
+
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::OptionSelectorFilterInterface*)
+
+#endif

=== added file 'include/unity/shell/scopes/OptionSelectorOptionsInterface.h'
--- include/unity/shell/scopes/OptionSelectorOptionsInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/OptionSelectorOptionsInterface.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SHELL_SCOPES_OPTIONSELECTOROPTIONSINTERFACE_H
+#define UNITY_SHELL_SCOPES_OPTIONSELECTOROPTIONSINTERFACE_H
+
+#include <unity/SymbolExport.h>
+#include <QAbstractListModel>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API OptionSelectorOptionsInterface : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(OptionRoles)
+
+public:
+    enum Roles {
+        RoleOptionId = Qt::UserRole + 1,
+        RoleOptionLabel,
+        RoleOptionChecked
+    };
+
+    Q_INVOKABLE virtual void setChecked(int index, bool checked) = 0;
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleOptionId] = "id";
+        roles[RoleOptionLabel] = "label";
+        roles[RoleOptionChecked] = "checked";
+        return roles;
+    }
+
+protected:
+    /// @cond
+    explicit OptionSelectorOptionsInterface(QObject* parent = 0) : QAbstractListModel(parent) {}
+    /// @endcond
+};
+
+}
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::OptionSelectorOptionsInterface*)
+
+#endif

=== modified file 'include/unity/shell/scopes/ScopeInterface.h'
--- include/unity/shell/scopes/ScopeInterface.h	2015-09-15 09:15:11 +0000
+++ include/unity/shell/scopes/ScopeInterface.h	2015-11-17 14:58:53 +0000
@@ -33,6 +33,8 @@
 class PreviewStackInterface;
 class NavigationInterface;
 class SettingsModelInterface;
+class FiltersInterface;
+class FilterBaseInterface;
 
 /**
  * @brief Object representing scope instance, which exposes model(s) with results.
@@ -93,6 +95,11 @@
     Q_PROPERTY(unity::shell::scopes::SettingsModelInterface* settings READ settings NOTIFY settingsChanged)
 
     /**
+     * @brief
+     */
+    Q_PROPERTY(unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter READ primaryNavigationFilter NOTIFY primaryNavigationFilterChanged)
+
+    /**
      * @brief Current search query.
      *
      * Writing to this property issues a new search to the scope.
@@ -129,16 +136,6 @@
     Q_PROPERTY(bool hasNavigation READ hasNavigation NOTIFY hasNavigationChanged)
 
     /**
-     * @brief String specifying currently selected sort order
-     */
-    Q_PROPERTY(QString currentAltNavigationId READ currentAltNavigationId NOTIFY currentAltNavigationIdChanged)
-
-    /**
-     * @brief Boolean specifying whether current query has sort order.
-     */
-    Q_PROPERTY(bool hasAltNavigation READ hasAltNavigation NOTIFY hasAltNavigationChanged)
-
-    /**
      * @brief VariantMap with customization properties
      */
     Q_PROPERTY(QVariantMap customizations READ customizations NOTIFY customizationsChanged)
@@ -148,6 +145,21 @@
      */
     Q_PROPERTY(unity::shell::scopes::ScopeInterface::Status status READ status NOTIFY statusChanged)
 
+    /**
+     * @brief Filters model for the scope.
+     */
+    Q_PROPERTY(unity::shell::scopes::FiltersInterface* filters READ filters NOTIFY filtersChanged)
+
+    /**
+     * @brief Label for the currently active top level navigation (department or primary filter).
+     */
+    Q_PROPERTY(QString primaryNavigationTag READ primaryNavigationTag NOTIFY primaryNavigationTagChanged)
+
+    /**
+     * @brief The number of currently selected filters.
+     */
+    Q_PROPERTY(int activeFiltersCount READ activeFiltersCount NOTIFY activeFiltersCountChanged)
+
 protected:
     /// @cond
     explicit ScopeInterface(QObject* parent = 0) : QObject(parent) { }
@@ -176,16 +188,18 @@
     virtual bool favorite() const = 0;
     virtual CategoriesInterface* categories() const = 0;
     virtual SettingsModelInterface* settings() const = 0;
+    virtual FilterBaseInterface* primaryNavigationFilter() const = 0;
     virtual QString searchQuery() const = 0;
     virtual QString noResultsHint() const = 0;
     virtual QString formFactor() const = 0;
     virtual bool isActive() const = 0;
     virtual QString currentNavigationId() const = 0;
     virtual bool hasNavigation() const = 0;
-    virtual QString currentAltNavigationId() const = 0;
-    virtual bool hasAltNavigation() const = 0;
     virtual Status status() const = 0;
     virtual QVariantMap customizations() const = 0;
+    virtual FiltersInterface* filters() const = 0;
+    virtual QString primaryNavigationTag() const = 0;
+    virtual int activeFiltersCount() const = 0;
 
     /* setters */
     virtual void setSearchQuery(const QString& search_query) = 0;
@@ -224,14 +238,9 @@
     Q_INVOKABLE virtual unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) = 0;
 
     /**
-     * @brief Get a NavigationInterface instance for the passed altNavigationId.
-     */
-    Q_INVOKABLE virtual unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) = 0;
-
-    /**
-     * @brief Request change to the current navigation or altNavigation id.
-     */
-    Q_INVOKABLE virtual void setNavigationState(QString const& navId, bool altNavigation) = 0;
+     * @brief Request change to the current navigation id.
+     */
+    Q_INVOKABLE virtual void setNavigationState(QString const& navId) = 0;
 
     /**
      * @brief Execute canned query.
@@ -243,6 +252,11 @@
      */
     Q_INVOKABLE virtual void refresh() = 0;
 
+    /**
+     * @brief Reset primary navigation filter and its tag in the search bar.
+     */
+    Q_INVOKABLE virtual void resetPrimaryNavigationTag() = 0;
+
 Q_SIGNALS:
     // @cond
     void idChanged();
@@ -261,11 +275,13 @@
     void isActiveChanged();
     void hasNavigationChanged();
     void currentNavigationIdChanged();
-    void hasAltNavigationChanged();
-    void currentAltNavigationIdChanged();
     void customizationsChanged();
     void statusChanged();
     void detailsChanged();
+    void filtersChanged();
+    void primaryNavigationTagChanged();
+    void activeFiltersCountChanged();
+    void primaryNavigationFilterChanged();
     // @endcond
 
     // signals triggered by activate(..) or preview(..) requests.

=== modified file 'test/copyright/check_copyright.sh'
--- test/copyright/check_copyright.sh	2013-06-26 23:47:34 +0000
+++ test/copyright/check_copyright.sh	2015-11-17 14:58:53 +0000
@@ -33,6 +33,11 @@
 [ $# -lt 1 ] && usage
 [ $# -gt 2 ] && usage
 
+
+# TODO: Temporary hack to work around broken licensecheck on xenial. Remove this once that is fixed.
+distro=$(lsb_release -c -s)
+[ "$distro" = "xenial" ] && exit 0
+
 ignore_pat="\\.sci$|CMakeFiles"
 
 #

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt'
--- test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2014-07-25 15:17:40 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2015-11-17 14:58:53 +0000
@@ -20,7 +20,14 @@
     Mocks/MockScope.cpp
     Mocks/MockScopes.cpp
     Mocks/MockSettingsModel.cpp
+    Mocks/MockFiltersModel.cpp
+    Mocks/MockOptionSelectorFilter.cpp
+    Mocks/MockSelectorOptions.cpp
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/CategoriesInterface.h
+    ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/FiltersInterface.h
+    ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/FilterBaseInterface.h
+    ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/OptionSelectorFilterInterface.h
+    ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/OptionSelectorOptionsInterface.h
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/NavigationInterface.h
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/ResultsModelInterface.h
     ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/PreviewModelInterface.h

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.cpp	2014-08-04 13:58:53 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockDepartment.cpp	2015-11-17 14:58:53 +0000
@@ -79,6 +79,8 @@
             return "child";
         case RoleLabel:
             return "Child Clothes";
+        case RoleAllLabel:
+            return "All Child Clothes";
         case RoleHasChildren:
             return true;
         case RoleIsActive:

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.cpp	2015-11-17 14:58:53 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockFiltersModel.h"
+#include "MockOptionSelectorFilter.h"
+
+MockFiltersModel::MockFiltersModel(unity::shell::scopes::ScopeInterface *parent)
+    : unity::shell::scopes::FiltersInterface(parent)
+{
+    MockOptionSelectorFilter *f = new MockOptionSelectorFilter("f1", "Filter 1", false, this);
+    m_filters.append(f); // owned by parent, so no need to manage it
+}
+
+QVariant MockFiltersModel::data(const QModelIndex& index, int role) const
+{
+    if (index.row() >= 0 && index.row() < m_filters.count())
+    {
+        auto filter = m_filters.at(index.row());
+        switch (role)
+        {
+            case Qt::DisplayRole:
+            case unity::shell::scopes::FiltersInterface::RoleFilterId:
+                return QVariant(filter->filterId());
+            case unity::shell::scopes::FiltersInterface::RoleFilterType:
+                return QVariant(static_cast<int>(filter->filterType()));
+            case unity::shell::scopes::FiltersInterface::RoleFilter:
+                return QVariant::fromValue(filter);
+            default:
+                return QVariant();
+        }
+    }
+    return QVariant();
+}
+
+int MockFiltersModel::rowCount(const QModelIndex&) const
+{
+    return m_filters.count();
+}

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.h	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockFiltersModel.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCKFILTERS_H
+#define MOCKFILTERS_H
+
+#include <unity/shell/scopes/FiltersInterface.h>
+#include <unity/shell/scopes/FilterBaseInterface.h>
+#include <unity/shell/scopes/ScopeInterface.h>
+
+#include <QList>
+
+class MockFiltersModel : public unity::shell::scopes::FiltersInterface
+{
+    Q_OBJECT
+
+public:
+    explicit MockFiltersModel(unity::shell::scopes::ScopeInterface *parent = 0);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+private:
+    QList<unity::shell::scopes::FilterBaseInterface*> m_filters;
+};
+
+#endif // MOCKDEPARTMENT_H

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockOptionSelectorFilter.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockOptionSelectorFilter.cpp	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockOptionSelectorFilter.cpp	2015-11-17 14:58:53 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockOptionSelectorFilter.h"
+
+MockOptionSelectorFilter::MockOptionSelectorFilter(const QString &id, const QString &title, const QString &label, bool multi, QObject *parent)
+    : unity::shell::scopes::OptionSelectorFilterInterface(parent),
+      m_id(id),
+      m_title(title),
+      m_label(label),
+      m_multiSelect(multi),
+      m_options(new MockSelectorOptions(2, this))
+{
+}
+
+QString MockOptionSelectorFilter::filterId() const
+{
+    return m_id;
+}
+
+QString MockOptionSelectorFilter::title() const
+{
+    return m_title;
+}
+
+QString MockOptionSelectorFilter::label() const
+{
+    return m_label;
+}
+
+bool MockOptionSelectorFilter::multiSelect() const
+{
+    return m_multiSelect;
+}
+
+unity::shell::scopes::OptionSelectorOptionsInterface* MockOptionSelectorFilter::options() const
+{
+    return m_options;
+}
+
+QString MockOptionSelectorFilter::filterTag() const
+{
+    return "";
+}

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockOptionSelectorFilter.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockOptionSelectorFilter.h	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockOptionSelectorFilter.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCKOPTIONSELECTORFILTER_H
+#define MOCKOPTIONSELECTORFILTER_H
+
+#include <unity/shell/scopes/OptionSelectorFilterInterface.h>
+#include <unity/shell/scopes/FiltersInterface.h>
+#include "MockSelectorOptions.h"
+
+class MockOptionSelectorFilter : public unity::shell::scopes::OptionSelectorFilterInterface
+{
+    Q_OBJECT
+
+public:
+    MockOptionSelectorFilter(const QString &id, const QString& title, const QString &label, bool multi, QObject *parent = 0);
+    QString filterId() const override;
+    QString title() const override;
+    QString label() const override;
+    bool multiSelect() const override;
+    unity::shell::scopes::OptionSelectorOptionsInterface* options() const override;
+    QString filterTag() const override;
+
+private:
+    QString m_id;
+    QString m_title;
+    QString m_label;
+    bool m_multiSelect;
+    MockSelectorOptions *m_options;
+};
+
+#endif

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2015-09-15 09:15:11 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2015-11-17 14:58:53 +0000
@@ -19,6 +19,7 @@
 #include "MockPreviewStack.h"
 #include "MockDepartment.h"
 #include "MockSettingsModel.h"
+#include "MockFiltersModel.h"
 
 MockScope::MockScope(QObject* parent) : MockScope(QString(), QString(), parent)
 {
@@ -34,6 +35,7 @@
     , m_previewRendererName("preview-generic")
     , m_categories(new MockCategories(20, this))
     , m_settings(new MockSettingsModel(this))
+    , m_filters(new MockFiltersModel(this))
 {
 }
 
@@ -69,10 +71,6 @@
     return m_currentDepartmentId;
 }
 
-QString MockScope::currentAltNavigationId() const {
-    return m_currentAltDepartmentId;
-}
-
 bool MockScope::searchInProgress() const {
     return m_searching;
 }
@@ -85,6 +83,14 @@
     return m_settings;
 }
 
+unity::shell::scopes::FiltersInterface* MockScope::filters() const {
+    return m_filters;
+}
+
+unity::shell::scopes::FilterBaseInterface* MockScope::primaryNavigationFilter() const {
+    return nullptr;
+}
+
 QString MockScope::noResultsHint() const {
     return m_noResultsHint;
 }
@@ -105,10 +111,6 @@
     return m_hasNavigation;
 }
 
-bool MockScope::hasAltNavigation() const {
-    return m_hasAltNavigation;
-}
-
 QVariantMap MockScope::customizations() const {
     return m_customizations;
 }
@@ -182,17 +184,9 @@
     return new MockDepartment();
 }
 
-unity::shell::scopes::NavigationInterface* MockScope::getAltNavigation(QString const& navigationId)
-{
-    Q_UNUSED(navigationId);
-
-    return new MockDepartment();
-}
-
-void MockScope::setNavigationState(QString const& navId, bool altNavigation)
+void MockScope::setNavigationState(QString const& navId)
 {
     Q_UNUSED(navId);
-    Q_UNUSED(altNavigation);
 }
 
 void MockScope::cancelActivation()
@@ -212,3 +206,17 @@
 void MockScope::refresh()
 {
 }
+
+QString MockScope::primaryNavigationTag() const
+{
+    return "";
+}
+
+void MockScope::resetPrimaryNavigationTag()
+{
+}
+
+int MockScope::activeFiltersCount() const
+{
+    return 0;
+}

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2015-09-15 09:15:11 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2015-11-17 14:58:53 +0000
@@ -38,16 +38,18 @@
     bool searchInProgress() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     unity::shell::scopes::SettingsModelInterface* settings() const override;
+    unity::shell::scopes::FiltersInterface* filters() const override;
+    unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter() const override;
     QString searchQuery() const override;
     QString noResultsHint() const override;
     QString formFactor() const override;
     bool isActive() const override;
     bool hasNavigation() const override;
     QString currentNavigationId() const override;
-    bool hasAltNavigation() const override;
-    QString currentAltNavigationId() const override;
     QVariantMap customizations() const override;
     Status status() const override;
+    QString primaryNavigationTag() const override;
+    int activeFiltersCount() const override;
 
     /* setters */
     void setName(const QString& name);
@@ -62,10 +64,10 @@
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
     Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& departmentId) override;
-    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& departmentId) override;
-    Q_INVOKABLE void setNavigationState(QString const& navId, bool altNavigation) override;
+    Q_INVOKABLE void setNavigationState(QString const& navId) override;
     Q_INVOKABLE void performQuery(QString const& cannedQuery) override;
     Q_INVOKABLE void refresh() override;
+    Q_INVOKABLE void resetPrimaryNavigationTag() override;
 
 protected:
     QString m_id;
@@ -76,18 +78,17 @@
     QString m_noResultsHint;
     QString m_formFactor;
     QString m_currentDepartmentId;
-    QString m_currentAltDepartmentId;
     bool m_favorite;
     bool m_searching;
     bool m_isActive;
     bool m_hasNavigation;
-    bool m_hasAltNavigation;
     QVariantMap m_customizations;
 
     QString m_previewRendererName;
 
     unity::shell::scopes::CategoriesInterface* m_categories;
     unity::shell::scopes::SettingsModelInterface* m_settings;
+    unity::shell::scopes::FiltersInterface* m_filters;
 };
 
 #endif

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockSelectorOptions.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockSelectorOptions.cpp	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockSelectorOptions.cpp	2015-11-17 14:58:53 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockSelectorOptions.h"
+
+MockSelectorOptions::MockSelectorOptions(int num, QObject *parent)
+    : unity::shell::scopes::OptionSelectorOptionsInterface(parent),
+    m_numOfOptions(num)
+{
+}
+
+QVariant MockSelectorOptions::data(const QModelIndex& index, int role) const
+{
+    if (index.row() >= 0 && index.row() < m_numOfOptions)
+    {
+        switch (role)
+        {
+            case unity::shell::scopes::OptionSelectorOptionsInterface::RoleOptionId:
+                return QVariant(QString("option") + QString::number(index.row()));
+            case Qt::DisplayRole:
+            case unity::shell::scopes::OptionSelectorOptionsInterface::RoleOptionLabel:
+                return QVariant(QString("Option") + QString::number(index.row()));
+            case unity::shell::scopes::OptionSelectorOptionsInterface::RoleOptionChecked:
+                return QVariant(false);
+            default:
+                return QVariant();
+        }
+    }
+    return QVariant();
+}
+
+int MockSelectorOptions::rowCount(const QModelIndex&) const
+{
+    return m_numOfOptions;
+}
+
+void MockSelectorOptions::setChecked(int, bool)
+{
+    qFatal("Using un-implemented setChecked() method");
+}

=== added file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockSelectorOptions.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockSelectorOptions.h	1970-01-01 00:00:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockSelectorOptions.h	2015-11-17 14:58:53 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCKOPTIONSELECTOROPTIONS_H
+#define MOCKOPTIONSELECTOROPTIONS_H
+
+#include <unity/shell/scopes/OptionSelectorOptionsInterface.h>
+
+class MockSelectorOptions : public unity::shell::scopes::OptionSelectorOptionsInterface
+{
+    Q_OBJECT
+
+public:
+    MockSelectorOptions(int num = 2, QObject *parent = 0);
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    void setChecked(int index, bool checked) override;
+
+private:
+    int m_numOfOptions;
+};
+
+#endif

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2014-07-25 15:17:40 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2015-11-17 14:58:53 +0000
@@ -26,6 +26,10 @@
 #include "PreviewWidgetModelInterface.h"
 #include "PreviewStackInterface.h"
 #include "SettingsModelInterface.h"
+#include "FiltersInterface.h"
+#include "FilterBaseInterface.h"
+#include "OptionSelectorOptionsInterface.h"
+#include "OptionSelectorFilterInterface.h"
 #include "Mocks/MockScopes.h"
 #include "Mocks/MockScope.h"
 
@@ -40,4 +44,8 @@
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewWidgetModelInterface>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewStackInterface>(uri, 0, 2, "PreviewStack", "Can't create new PreviewStack in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::SettingsModelInterface>(uri, 0, 2, "Settings", "Can't create new Settings in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::FilterBaseInterface>(uri, 0, 2, "FilterBase", "Can't create new Filter in QML. Get them from Filters instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::FiltersInterface>(uri, 0, 2, "Filters", "Can't create new Filters in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorOptionsInterface>(uri, 0, 2, "OptionSelectorOptions", "Can't create new OptionSelectorOptions in QML. Get them from OptionSelectorFilter instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorFilterInterface>(uri, 0, 2, "OptionSelectorFilter", "Can't create new OptionSelectorFilter in QML. Get them from Scope instance.");
 }

=== modified file 'test/qmltest/unity/shell/scopes/tst_Scopes.qml'
--- test/qmltest/unity/shell/scopes/tst_Scopes.qml	2015-09-15 09:15:11 +0000
+++ test/qmltest/unity/shell/scopes/tst_Scopes.qml	2015-11-17 14:58:53 +0000
@@ -122,14 +122,13 @@
                 { tag: "Item.properties[favorite]", constant: "favorite", type: "boolean" },
                 { tag: "Item.properties[shortcut]", constant: "shortcut", type: "string" },
                 { tag: "Item.properties[categories]", constant: "categories", type: "object" },
+                { tag: "Item.properties[filters]", constant: "filters", type: "object" },
                 { tag: "Item.properties[searchQuery]", constant: "searchQuery", type: "string" },
                 { tag: "Item.properties[noResultsHint]", constant: "noResultsHint", type: "string" },
                 { tag: "Item.properties[formFactor]", constant: "formFactor", type: "string" },
                 { tag: "Item.properties[isActive]", constant: "isActive", type: "boolean" },
                 { tag: "Item.properties[currentNavigationId]", constant: "currentNavigationId", type: "string" },
                 { tag: "Item.properties[hasNavigation]", constant: "hasNavigation", type: "boolean" },
-                { tag: "Item.properties[currentAltNavigationId]", constant: "currentAltNavigationId", type: "string" },
-                { tag: "Item.properties[hasAltNavigation]", constant: "hasAltNavigation", type: "boolean" },
                 { tag: "Item.properties[customizations]", constant: "customizations", type: "object" },
                 { tag: "Item.properties[status]", constant: "status", type: "number" }
             ];
@@ -156,7 +155,6 @@
                 { tag: "Model.methods[performQuery]", method: "performQuery" },
                 { tag: "Model.methods[refresh]", method: "refresh" },
                 { tag: "Model.methods[getNavigation]", method: "getNavigation" },
-                { tag: "Model.methods[getAltNavigation]", method: "getAltNavigation" },
                 { tag: "Model.methods[setNavigationState]", method: "setNavigationState" },
             ];
         }
@@ -169,6 +167,116 @@
     }
 
     Verifier {
+        id: filtersVerifier
+
+        Repeater {
+            id: filtersRepeater
+            model: root.scope.filters
+            delegate: Item {
+                property var roles: model
+            }
+        }
+
+        function test_filters(data) {
+            object = filtersRepeater.model;
+            name = "Filters";
+            verifyData(data);
+        }
+
+        function test_filters_data() {
+            return [
+                { tag: "Filters[object]", type: "object" },
+                { tag: "Filters[FiltersInterface]", type: "unity::shell::scopes::FiltersInterface" },
+            ];
+        }
+
+        function test_filters_roles(data) {
+            object = filtersRepeater.itemAt(0).roles;
+            name = "Filters";
+            verifyData(data);
+        }
+
+        function test_filters_roles_data() {
+            return [
+                { tag: "Model.roles[id]", role: "id", type: "string" },
+                { tag: "Model.roles[type]", role: "type", type: "number" },
+                { tag: "Model.roles[filter]", role: "filter", type: "unity::shell::scopes::FilterBaseInterface" },
+            ];
+        }
+    }
+
+    Verifier {
+        id: optionSelectorFilterVerifier
+
+        function test_option_selector_filter(data) {
+            object = filtersRepeater.itemAt(0).roles.filter;
+            name = "Filter";
+            verifyData(data);
+        }
+
+        function test_option_selector_filter_data() {
+            return [
+                { tag: "Filter[object]", type: "object" },
+                { tag: "Filter[OptionSelectorFilterInterface]", type: "unity::shell::scopes::OptionSelectorFilterInterface" },
+            ];
+        }
+
+        function test_option_selector_filter_properties_data() {
+            return [
+                { tag: "Filter.properties[filterId]", constant: "filterId", type: "string" },
+                { tag: "Filter.properties[label]", constant: "label", type: "string" },
+                { tag: "Filter.properties[multiSelect]", constant: "multiSelect", type: "boolean" },
+                { tag: "Filter.properties[options]", constant: "options", type: "object" },
+            ];
+        }
+
+        function test_option_selector_filter_properties(data) {
+            object = filtersRepeater.itemAt(0).roles.filter;
+            name = "Filter";
+            verifyData(data);
+        }
+
+        function test_options_data() {
+            return [
+                { tag: "Options[object]", type: "object" },
+                { tag: "Options[OptionSelectorOptionsInterface]", type: "unity::shell::scopes::OptionSelectorOptionsInterface" },
+            ];
+        }
+
+        function test_options(data) {
+            object = filtersRepeater.itemAt(0).roles.filter.options;
+            name = "Options";
+            verifyData(data);
+        }
+    }
+
+    Verifier {
+        id: optionSelectorFilterOptionsVerifier
+
+        Repeater {
+            id: optionsRepeater
+            model: filtersRepeater.count > 0 ? filtersRepeater.itemAt(0).roles.filter.options : undefined
+            delegate: Item {
+                property var roles: model
+            }
+        }
+
+        function test_option_selector_filter_options_roles_data() {
+            return [
+                { tag: "Model.roles[id]", role: "id", type: "string" },
+                { tag: "Model.roles[label]", role: "label", type: "string" },
+                { tag: "Model.roles[checked]", role: "checked", type: "boolean" },
+            ];
+        }
+
+        function test_option_selector_filter_options_roles(data) {
+            object = optionsRepeater.itemAt(0).roles;
+            name = "Options";
+            verifyData(data);
+        }
+    }
+
+    Verifier {
         id: categoriesVerifier
 
         Repeater {