Merge lp:~stolowski/unity-api/social-attributes-role into lp:unity-api

[Paweł Stołowski]

Added RoleSocialActions.

Added RoleSocialActions.

[lp:~stolowski/unity-api/social-attributes-role]

212. By Paweł Stołowski on 2016-03-03

Rename RoleSocialAttributes to RoleSocialActions

213. By Paweł Stołowski on 2016-03-03

Fix comment

[Andrea Cimitan (cimi)]

review: Needs Fixing

[lp:~stolowski/unity-api/social-attributes-role]

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

Merged trunk

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

Bump

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

Fix role name in the test

217. By Paweł Stołowski on 2016-03-16

Merged filters

218. By Paweł Stołowski on 2016-03-24

Merged trunk + bump

219. By Paweł Stołowski on 2016-04-15

Merged trunk + bump

220. By Paweł Stołowski on 2016-04-26

Merged trunk

221. By Paweł Stołowski on 2016-04-26

Fix version

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-23 12:12:26 +0000
+++ debian/changelog	2016-03-16 11:18:19 +0000
@@ -1,3 +1,9 @@
+unity-api (7.108) UNRELEASED; urgency=medium
+
+  * Added RoleSocialActions to ResultsModelInterface of scopes.
+
+ -- Pawel Stolowski <[e-mail]>  Wed, 02 Mar 2016 16:29:42 +0100
+
 unity-api (7.107+16.04.20160223-0ubuntu1) xenial; urgency=medium
 
   * Removed PreviewStackInterface, modified ScopeInterface to return

=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2016-02-18 15:46:46 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2016-03-16 11:18:19 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 10)
+set(VERSION 11)
 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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +0000
@@ -0,0 +1,75 @@
+/*
+ * 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,
+        ValueSliderFilter
+        // 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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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

=== added file 'include/unity/shell/scopes/RangeInputFilterInterface.h'
--- include/unity/shell/scopes/RangeInputFilterInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/RangeInputFilterInterface.h	2016-03-16 11:18:19 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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_RANGEINPUTFILTERINTERFACE_H
+#define UNITY_SHELL_SCOPES_RANGEINPUTFILTERINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include "FilterBaseInterface.h"
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API RangeInputFilterInterface : public FilterBaseInterface
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(double startValue READ startValue WRITE setStartValue NOTIFY startValueChanged)
+    Q_PROPERTY(double endValue READ endValue WRITE setEndValue NOTIFY endValueChanged)
+    Q_PROPERTY(QString startPrefixLabel READ startPrefixLabel NOTIFY startPrefixLabelChanged)
+    Q_PROPERTY(QString startPostfixLabel READ startPostfixLabel NOTIFY startPostfixLabelChanged)
+    Q_PROPERTY(QString centralLabel READ centralLabel NOTIFY centralLabelChanged)
+    Q_PROPERTY(QString endPrefixLabel READ endPrefixLabel NOTIFY endPrefixLabelChanged)
+    Q_PROPERTY(QString endPostfixLabel READ endPostfixLabel NOTIFY endPostfixLabelChanged)
+    Q_PROPERTY(bool hasStartValue READ hasStartValue NOTIFY hasStartValueChanged)
+    Q_PROPERTY(bool hasEndValue READ hasEndValue NOTIFY hasEndValueChanged)
+
+    FiltersInterface::FilterType filterType() const override
+    {
+        return FiltersInterface::RangeInputFilter;
+    }
+
+    virtual double startValue() const = 0;
+    virtual double endValue() const = 0;
+    virtual void setStartValue(double value) = 0;
+    virtual void setEndValue(double value)  = 0;
+    virtual QString startPrefixLabel() const = 0;
+    virtual QString startPostfixLabel() const = 0;
+    virtual QString centralLabel() const = 0;
+    virtual QString endPrefixLabel() const = 0;
+    virtual QString endPostfixLabel() const = 0;
+    virtual bool hasStartValue() const = 0;
+    virtual bool hasEndValue() const = 0;
+
+    Q_INVOKABLE virtual void eraseStartValue() = 0;
+    Q_INVOKABLE virtual void eraseEndValue() = 0;
+
+Q_SIGNALS:
+    void startValueChanged();
+    void endValueChanged();
+    void hasStartValueChanged();
+    void hasEndValueChanged();
+    void startPrefixLabelChanged();
+    void startPostfixLabelChanged();
+    void centralLabelChanged();
+    void endPrefixLabelChanged();
+    void endPostfixLabelChanged();
+
+protected:
+    /// @cond
+    explicit RangeInputFilterInterface(QObject* parent = 0) : FilterBaseInterface(parent) {}
+    /// @endcond
+};
+
+}
+
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::RangeInputFilterInterface*)
+
+#endif

=== modified file 'include/unity/shell/scopes/ResultsModelInterface.h'
--- include/unity/shell/scopes/ResultsModelInterface.h	2015-09-16 10:05:47 +0000
+++ include/unity/shell/scopes/ResultsModelInterface.h	2016-03-16 11:18:19 +0000
@@ -71,7 +71,8 @@
         RoleAttributes,
         RoleBackground,
         RoleOverlayColor,
-        RoleQuickPreviewData ///< Data for UI quick previewing. In case of audio should contain uri and duration
+        RoleQuickPreviewData, ///< Data for UI quick previewing. In case of audio should contain uri and duration
+        RoleSocialActions  ///< Data for social actions (in-card actions such as "+1").
     };
 
     // @cond
@@ -96,6 +97,7 @@
         roles[RoleAttributes] = "attributes";
         roles[RoleBackground] = "background";
         roles[RoleOverlayColor] = "overlayColor";
+        roles[RoleSocialActions] = "socialActions";
         return roles;
     }
 

=== modified file 'include/unity/shell/scopes/ScopeInterface.h'
--- include/unity/shell/scopes/ScopeInterface.h	2016-02-18 15:46:46 +0000
+++ include/unity/shell/scopes/ScopeInterface.h	2016-03-16 11:18:19 +0000
@@ -33,6 +33,8 @@
 class PreviewModelInterface;
 class NavigationInterface;
 class SettingsModelInterface;
+class FiltersInterface;
+class FilterBaseInterface;
 
 /**
  * @brief Object representing scope instance, which exposes model(s) with results.
@@ -98,6 +100,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.
@@ -134,16 +141,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)
@@ -153,6 +150,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) { }
@@ -182,16 +194,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;
@@ -230,14 +244,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.
@@ -250,6 +259,16 @@
     Q_INVOKABLE virtual void refresh() = 0;
 
     /**
+     * @brief Reset primary navigation filter and its tag in the search bar.
+     */
+    Q_INVOKABLE virtual void resetPrimaryNavigationTag() = 0;
+
+    /**
+     * @brief Reset filters to default values.
+     */
+    Q_INVOKABLE virtual void resetFilters() = 0;
+
+    /*
      * @brief Method used to activate an action of a result.
      */
     Q_INVOKABLE virtual void activateAction(QVariant const& result, QString const& categoryId, QString const& actionId) = 0;
@@ -273,11 +292,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.

=== added file 'include/unity/shell/scopes/ValueSliderFilterInterface.h'
--- include/unity/shell/scopes/ValueSliderFilterInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/ValueSliderFilterInterface.h	2016-03-16 11:18:19 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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_VALUESLIDERFILTERINTERFACE_H
+#define UNITY_SHELL_SCOPES_VALUESLIDERFILTERINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include "FilterBaseInterface.h"
+#include "ValueSliderValuesInterface.h"
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API ValueSliderFilterInterface : public FilterBaseInterface
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(double value READ value WRITE setValue NOTIFY valueChanged)
+    Q_PROPERTY(unity::shell::scopes::ValueSliderValuesInterface* values READ values NOTIFY valuesChanged)
+    Q_PROPERTY(double minValue READ minValue NOTIFY minValueChanged)
+    Q_PROPERTY(double maxValue READ maxValue NOTIFY maxValueChanged)
+
+public:
+    FiltersInterface::FilterType filterType() const override
+    {
+        return FiltersInterface::ValueSliderFilter;
+    }
+
+    virtual double value() const = 0;
+    virtual void setValue(double)  = 0;
+    virtual double minValue() const = 0;
+    virtual double maxValue() const = 0;
+    virtual ValueSliderValuesInterface* values() const = 0;
+
+Q_SIGNALS:
+    void valueChanged();
+    void valuesChanged();
+    void minValueChanged();
+    void maxValueChanged();
+
+protected:
+    /// @cond
+    explicit ValueSliderFilterInterface(QObject* parent = 0) : FilterBaseInterface(parent) {}
+    /// @endcond
+};
+
+}
+
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::ValueSliderFilterInterface*)
+
+#endif

=== added file 'include/unity/shell/scopes/ValueSliderValuesInterface.h'
--- include/unity/shell/scopes/ValueSliderValuesInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/ValueSliderValuesInterface.h	2016-03-16 11:18:19 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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_VALUESLIDERVALUESINTERFACE_H
+#define UNITY_SHELL_SCOPES_VALUESLIDERVALUESINTERFACE_H
+
+#include <unity/SymbolExport.h>
+#include <QAbstractListModel>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API ValueSliderValuesInterface : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(SliderValueRoles)
+
+public:
+    enum Roles {
+        RoleValue = Qt::UserRole + 1,
+        RoleLabel
+    };
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleValue] = "value";
+        roles[RoleLabel] = "label";
+        return roles;
+    }
+
+protected:
+    /// @cond
+    explicit ValueSliderValuesInterface(QObject* parent = 0) : QAbstractListModel(parent) {}
+    /// @endcond
+};
+
+}
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::ValueSliderValuesInterface*)
+
+#endif

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt'
--- test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2016-02-11 14:00:36 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2016-03-16 11:18:19 +0000
@@ -19,7 +19,15 @@
     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/RangeInputFilterInterface.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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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/MockResultsModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp	2014-07-18 12:56:46 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp	2016-03-16 11:18:19 +0000
@@ -67,6 +67,8 @@
         case RoleUri:
         case RoleCategoryId:
         case RoleDndUri:
+        case RoleAttributes:
+        case RoleSocialActions:
         default:
             return QString();
     }

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2016-02-18 15:46:46 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2016-03-16 11:18:19 +0000
@@ -19,6 +19,7 @@
 #include "MockPreviewModel.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;
 }
@@ -89,6 +87,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;
 }
@@ -109,10 +115,6 @@
     return m_hasNavigation;
 }
 
-bool MockScope::hasAltNavigation() const {
-    return m_hasAltNavigation;
-}
-
 QVariantMap MockScope::customizations() const {
     return m_customizations;
 }
@@ -193,17 +195,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()
@@ -223,3 +217,21 @@
 void MockScope::refresh()
 {
 }
+
+QString MockScope::primaryNavigationTag() const
+{
+    return "";
+}
+
+void MockScope::resetPrimaryNavigationTag()
+{
+}
+
+void MockScope::resetFilters()
+{
+}
+
+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	2016-02-18 15:46:46 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2016-03-16 11:18:19 +0000
@@ -39,16 +39,18 @@
     bool activationInProgress() 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);
@@ -64,10 +66,11 @@
     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;
+    Q_INVOKABLE void resetFilters() override;
 
 protected:
     QString m_id;
@@ -78,18 +81,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	2016-03-16 11:18:19 +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	2016-03-16 11:18:19 +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	2016-02-11 14:00:36 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2016-03-16 11:18:19 +0000
@@ -25,6 +25,11 @@
 #include "PreviewModelInterface.h"
 #include "PreviewWidgetModelInterface.h"
 #include "SettingsModelInterface.h"
+#include "FiltersInterface.h"
+#include "FilterBaseInterface.h"
+#include "OptionSelectorOptionsInterface.h"
+#include "OptionSelectorFilterInterface.h"
+#include "RangeInputFilterInterface.h"
 #include "Mocks/MockScopes.h"
 #include "Mocks/MockScope.h"
 
@@ -38,4 +43,9 @@
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from Scope instance.");
     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::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 Filters instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::RangeInputFilterInterface>(uri, 0, 2, "RangeInputFilter", "Can't create new RangeInputFilter in QML. Get them from Filters instance.");
 }

=== modified file 'test/qmltest/unity/shell/scopes/tst_Scopes.qml'
--- test/qmltest/unity/shell/scopes/tst_Scopes.qml	2016-02-11 14:06:46 +0000
+++ test/qmltest/unity/shell/scopes/tst_Scopes.qml	2016-03-16 11:18:19 +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 {
@@ -319,6 +427,7 @@
                 { tag: "Model.roles[attributes]", role: "attributes", type: "string" },
                 { tag: "Model.roles[background]", role: "background", type: "object" },
                 { tag: "Model.roles[overlayColor]", role: "overlayColor", type: "string" },
+                { tag: "Model.roles[socialActions]", role: "socialActions", type: "string" },
             ];
         }