Merge lp:~fboucault/unity-2d/backend_filters into lp:unity-2d

[Florian Boucault]

[dash] New filters pane on the right hand side of the search results.

Implemented filters:
- multirange
- checkoption
- ratings

[Bob The Builder (bobthebuilder-deactivatedaccount)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-08-23 17:46:06 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-08-25 14:16:01 +0000
@@ -61,6 +61,13 @@
 #include "lenses.h"
 #include "lens.h"
 
+#include "filter.h"
+#include "filters.h"
+#include "ratingsfilter.h"
+#include "radiooptionfilter.h"
+#include "checkoptionfilter.h"
+#include "multirangefilter.h"
+
 #include <QtDeclarative/qdeclarative.h>
 #include <QDeclarativeEngine>
 #include <QDeclarativeContext>
@@ -139,6 +146,15 @@
 
     qmlRegisterType<Lenses>(uri, 1, 0, "Lenses");
     qmlRegisterType<Lens>(uri, 1, 0, "Lens");
+
+    qmlRegisterType<Filter>();
+    qmlRegisterType<Filters>();
+    qmlRegisterType<RatingsFilter>();
+    qmlRegisterType<RadioOptionFilter>();
+    qmlRegisterType<CheckOptionFilter>();
+    qmlRegisterType<MultiRangeFilter>();
+    qmlRegisterType<FilterOption>();
+    qmlRegisterType<FilterOptions>();
 }
 
 void Unity2dPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-08-22 09:17:03 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-08-25 14:16:01 +0000
@@ -60,7 +60,12 @@
     lenses.cpp
     lens.cpp
     filter.cpp
+    filteroption.cpp
     ratingsfilter.cpp
+    radiooptionfilter.cpp
+    checkoptionfilter.cpp
+    multirangefilter.cpp
+    filters.cpp
     cairoutils.cpp
     indicatorentrywidget.cpp
     indicatorsmanager.cpp
@@ -96,7 +101,7 @@
     ${DEE_INCLUDE_DIRS}
     )
 
-add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS})
+add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS} listmodelwrapper.h)
 set_target_properties(${LIB_NAME} PROPERTIES
     VERSION ${libunity-2d-private_VERSION}
     SOVERSION ${libunity-2d-private_SOVERSION}

=== added file 'libunity-2d-private/src/checkoptionfilter.cpp'
--- libunity-2d-private/src/checkoptionfilter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/checkoptionfilter.cpp	2011-08-25 14:16:01 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// Self
+#include "checkoptionfilter.h"
+
+CheckOptionFilter::CheckOptionFilter(QObject *parent) :
+    Filter(parent), m_unityCheckOptionFilter(NULL), m_options(NULL)
+{
+}
+
+FilterOptions* CheckOptionFilter::options() const
+{
+    return m_options;
+}
+
+void CheckOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    Filter::setUnityFilter(filter);
+    m_unityCheckOptionFilter = std::dynamic_pointer_cast<unity::dash::CheckOptionFilter>(m_unityFilter);
+
+    onOptionsChanged(m_unityCheckOptionFilter->options);
+}
+
+void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions options)
+{
+    if (m_options != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+        delete m_options;
+        m_options = NULL;
+    }
+    m_options = new FilterOptions(m_unityCheckOptionFilter->options,
+                                  m_unityCheckOptionFilter->option_added,
+                                  m_unityCheckOptionFilter->option_removed);
+    /* Property change signals */
+    m_unityCheckOptionFilter->options.changed.connect(sigc::mem_fun(this, &CheckOptionFilter::onOptionsChanged));
+
+    Q_EMIT optionsChanged();
+}
+
+#include "checkoptionfilter.moc"

=== added file 'libunity-2d-private/src/checkoptionfilter.h'
--- libunity-2d-private/src/checkoptionfilter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/checkoptionfilter.h	2011-08-25 14:16:01 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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 CHECKOPTIONFILTER_H
+#define CHECKOPTIONFILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/CheckOptionFilter.h>
+
+// Local
+#include "filter.h"
+#include "filteroption.h"
+
+class CheckOptionFilter : public Filter
+{
+    Q_OBJECT
+
+    Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)
+
+public:
+    explicit CheckOptionFilter(QObject *parent = 0);
+
+    /* getters */
+    FilterOptions* options() const;
+
+Q_SIGNALS:
+    void optionsChanged();
+
+protected:
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+private:
+    unity::dash::CheckOptionFilter::Ptr m_unityCheckOptionFilter;
+    FilterOptions* m_options;
+
+    void onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions);
+};
+
+Q_DECLARE_METATYPE(CheckOptionFilter*)
+
+#endif // CHECKOPTIONFILTER_H

=== modified file 'libunity-2d-private/src/filter.cpp'
--- libunity-2d-private/src/filter.cpp	2011-08-02 15:10:09 +0000
+++ libunity-2d-private/src/filter.cpp	2011-08-25 14:16:01 +0000
@@ -20,6 +20,22 @@
 // Self
 #include "filter.h"
 
+// local
+#include "ratingsfilter.h"
+#include "radiooptionfilter.h"
+#include "checkoptionfilter.h"
+#include "multirangefilter.h"
+
+// libunity-core
+#include <UnityCore/Filter.h>
+#include <UnityCore/RatingsFilter.h>
+#include <UnityCore/RadioOptionFilter.h>
+#include <UnityCore/CheckOptionFilter.h>
+#include <UnityCore/MultiRangeFilter.h>
+
+// Qt
+#include <QDebug>
+
 Filter::Filter(QObject *parent) :
     QObject(parent)
 {
@@ -67,13 +83,13 @@
 }
 
 
-void Filter::setUnityFilter(unity::dash::Filter::Ptr filter)
+void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)
 {
     if (m_unityFilter != NULL) {
         // FIXME: should disconnect from m_unityFilter's signals
     }
 
-    m_unityFilter = filter;
+    m_unityFilter = unityFilter;
 
     /* Property change signals */
     m_unityFilter->id.changed.connect(sigc::mem_fun(this, &Filter::idChanged));
@@ -88,5 +104,30 @@
     m_unityFilter->removed.connect(sigc::mem_fun(this, &Filter::removed));
 }
 
+Filter* Filter::newFromUnityFilter(unity::dash::Filter::Ptr unityFilter)
+{
+    Filter* filter;
+
+    if (typeid(*unityFilter) == typeid(unity::dash::RatingsFilter)) {
+        filter = new RatingsFilter;
+    } else if (typeid(*unityFilter) == typeid(unity::dash::CheckOptionFilter)) {
+        filter = new CheckOptionFilter;
+    } else if (typeid(*unityFilter) == typeid(unity::dash::RadioOptionFilter)) {
+        filter = new RadioOptionFilter;
+    } else if (typeid(*unityFilter) == typeid(unity::dash::MultiRangeFilter)) {
+        filter = new MultiRangeFilter;
+    } else {
+        qWarning() << "Filter of unknown type: " << typeid(*unityFilter).name();
+        filter = new Filter;
+    }
+
+    filter->setUnityFilter(unityFilter);
+    return filter;
+}
+
+bool Filter::hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const
+{
+    return m_unityFilter == unityFilter;
+}
 
 #include "filter.moc"

=== modified file 'libunity-2d-private/src/filter.h'
--- libunity-2d-private/src/filter.h	2011-08-02 15:10:09 +0000
+++ libunity-2d-private/src/filter.h	2011-08-25 14:16:01 +0000
@@ -51,8 +51,10 @@
     bool collapsed() const;
     bool filtering() const;
 
-    void clear();
-    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+    Q_INVOKABLE void clear();
+
+    static Filter* newFromUnityFilter(unity::dash::Filter::Ptr unityFilter);
+    bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;
 
 Q_SIGNALS:
     void idChanged(std::string);
@@ -67,6 +69,7 @@
 
 protected:
     unity::dash::Filter::Ptr m_unityFilter;
+    virtual void setUnityFilter(unity::dash::Filter::Ptr unityFilter);
 };
 
 Q_DECLARE_METATYPE(Filter*)

=== added file 'libunity-2d-private/src/filteroption.cpp'
--- libunity-2d-private/src/filteroption.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filteroption.cpp	2011-08-25 14:16:01 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// Self
+#include "filteroption.h"
+
+// libunity-core
+#include <UnityCore/Filter.h>
+
+FilterOption::FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent) :
+    QObject(parent), m_unityFilterOption(NULL)
+{
+    setUnityFilterOption(unityFilterOption);
+}
+
+QString FilterOption::id() const
+{
+    return QString::fromStdString(m_unityFilterOption->id());
+}
+
+QString FilterOption::name() const
+{
+    return QString::fromStdString(m_unityFilterOption->name());
+}
+
+QString FilterOption::iconHint() const
+{
+    return QString::fromStdString(m_unityFilterOption->icon_hint());
+}
+
+bool FilterOption::active() const
+{
+    return m_unityFilterOption->active();
+}
+
+void FilterOption::setActive(bool active)
+{
+    m_unityFilterOption->active = active;
+}
+
+void FilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption)
+{
+    if (m_unityFilterOption != NULL) {
+        // FIXME: should disconnect from m_unityFilterOption's signals
+    }
+
+    m_unityFilterOption = unityFilterOption;
+
+    /* Property change signals */
+    m_unityFilterOption->id.changed.connect(sigc::mem_fun(this, &FilterOption::idChanged));
+    m_unityFilterOption->name.changed.connect(sigc::mem_fun(this, &FilterOption::nameChanged));
+    m_unityFilterOption->icon_hint.changed.connect(sigc::mem_fun(this, &FilterOption::iconHintChanged));
+    m_unityFilterOption->active.changed.connect(sigc::mem_fun(this, &FilterOption::activeChanged));
+}
+
+#include "filteroption.moc"

=== added file 'libunity-2d-private/src/filteroption.h'
--- libunity-2d-private/src/filteroption.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filteroption.h	2011-08-25 14:16:01 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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 FILTEROPTION_H
+#define FILTEROPTION_H
+
+// Local
+#include "listmodelwrapper.h"
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/Filter.h>
+
+class FilterOption : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString id READ id NOTIFY idChanged)
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+
+public:
+    explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = 0);
+
+    /* getters */
+    QString id() const;
+    QString name() const;
+    QString iconHint() const;
+    bool active() const;
+
+    /* setters */
+    void setActive(bool active);
+
+Q_SIGNALS:
+    void idChanged(std::string);
+    void nameChanged(std::string);
+    void iconHintChanged(std::string);
+    void activeChanged(bool);
+
+private:
+    void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption);
+
+    unity::dash::FilterOption::Ptr m_unityFilterOption;
+};
+
+Q_DECLARE_METATYPE(FilterOption*)
+
+typedef ListModelWrapper<FilterOption, unity::dash::FilterOption::Ptr> FilterOptions;
+Q_DECLARE_METATYPE(FilterOptions*)
+
+#endif // FILTEROPTION_H

=== added file 'libunity-2d-private/src/filters.cpp'
--- libunity-2d-private/src/filters.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filters.cpp	2011-08-25 14:16:01 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// Self
+#include "filters.h"
+
+// Local
+#include "filter.h"
+
+// Qt
+#include <QDebug>
+
+// libunity-core
+#include <UnityCore/Filters.h>
+
+Filters::Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent) :
+    QAbstractListModel(parent), m_unityFilters(unityFilters)
+{
+    QHash<int, QByteArray> roles;
+    roles[Filters::RoleFilter] = "filter";
+    setRoleNames(roles);
+
+    for (unsigned int i=0; i<m_unityFilters->count(); i++) {
+        unity::dash::Filter::Ptr unityFilter = m_unityFilters->FilterAtIndex(i);
+        addFilter(unityFilter, i);
+    }
+    m_unityFilters->filter_added.connect(sigc::mem_fun(this, &Filters::onFilterAdded));
+    m_unityFilters->filter_changed.connect(sigc::mem_fun(this, &Filters::onFilterChanged));
+    m_unityFilters->filter_removed.connect(sigc::mem_fun(this, &Filters::onFilterRemoved));
+}
+
+Filters::~Filters()
+{
+    while (!m_filters.isEmpty()) {
+        delete m_filters.takeFirst();
+    }
+}
+
+int Filters::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_unityFilters->count();
+}
+
+QVariant Filters::data(const QModelIndex& index, int role) const
+{
+    Q_UNUSED(role)
+
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    Filter* filter = m_filters.at(index.row());
+
+    if (role == Filters::RoleFilter) {
+        return QVariant::fromValue(filter);
+    } else {
+        return QVariant();
+    }
+}
+
+void Filters::onFilterAdded(unity::dash::Filter::Ptr unityFilter)
+{
+    if (unityFilter == NULL) {
+        return;
+    }
+
+    /* FIXME: figure out actual index of unityFilter; for now filters are appended */
+    int index = m_filters.count();
+    addFilter(unityFilter, index);
+}
+
+void Filters::onFilterChanged(unity::dash::Filter::Ptr unityFilter)
+{
+    if (unityFilter == NULL) {
+        return;
+    }
+
+    QModelIndex filterIndex = index(indexForFilter(unityFilter));
+    Q_EMIT dataChanged(filterIndex, filterIndex);
+}
+
+void Filters::onFilterRemoved(unity::dash::Filter::Ptr unityFilter)
+{
+    removeFilter(indexForFilter(unityFilter));
+}
+
+void Filters::addFilter(unity::dash::Filter::Ptr unityFilter, int index)
+{
+    beginInsertRows(QModelIndex(), index, index);
+    Filter* filter = Filter::newFromUnityFilter(unityFilter);
+    m_filters.insert(index, filter);
+    endInsertRows();
+}
+
+void Filters::removeFilter(int index)
+{
+    beginRemoveRows(QModelIndex(), index, index);
+    Filter* filter = m_filters.takeAt(index);
+    delete filter;
+    endRemoveRows();
+}
+
+int Filters::indexForFilter(unity::dash::Filter::Ptr unityFilter)
+{
+    int index;
+    for (index=0; index<m_filters.count(); index++) {
+        if (m_filters[index]->hasUnityFilter(unityFilter)) {
+            return index;
+        }
+    }
+    qWarning() << "Filter" << QString::fromStdString(unityFilter->name()) << "not found in local cache.";
+    return -1;
+}
+
+
+#include "filters.moc"

=== added file 'libunity-2d-private/src/filters.h'
--- libunity-2d-private/src/filters.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/filters.h	2011-08-25 14:16:01 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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 FILTERS_H
+#define FILTERS_H
+
+// Qt
+#include <QAbstractListModel>
+#include <QList>
+
+// libunity-core
+#include <UnityCore/Filters.h>
+#include <UnityCore/Filter.h>
+
+
+class Filter;
+
+class Filters : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+    explicit Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent = 0);
+    ~Filters();
+
+    enum Roles {
+        RoleFilter
+    };
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+private:
+    unity::dash::Filters::Ptr m_unityFilters;
+    QList<Filter*> m_filters;
+
+    void onFilterAdded(unity::dash::Filter::Ptr unityFilter);
+    void onFilterChanged(unity::dash::Filter::Ptr unityFilter);
+    void onFilterRemoved(unity::dash::Filter::Ptr unityFilter);
+
+    void addFilter(unity::dash::Filter::Ptr unityFilter, int index);
+    void removeFilter(int index);
+
+    int indexForFilter(unity::dash::Filter::Ptr unityFilter);
+};
+
+Q_DECLARE_METATYPE(Filters*)
+
+#endif // FILTERS_H

=== modified file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	2011-08-11 17:11:58 +0000
+++ libunity-2d-private/src/lens.cpp	2011-08-25 14:16:01 +0000
@@ -23,6 +23,7 @@
 // libunity-2d
 #include <debug_p.h>
 #include "launcherapplication.h"
+#include "filters.h"
 
 // Qt
 #include <QUrl>
@@ -31,9 +32,9 @@
 Lens::Lens(QObject *parent) :
     QObject(parent)
 {
-    m_results = new DeeListModel;
-    m_globalResults = new DeeListModel;
-    m_categories = new DeeListModel;
+    m_results = new DeeListModel(this);
+    m_globalResults = new DeeListModel(this);
+    m_categories = new DeeListModel(this);
 }
 
 QString Lens::id() const
@@ -111,6 +112,11 @@
     return m_unityLens->active();
 }
 
+Filters* Lens::filters() const
+{
+    return m_filters;
+}
+
 QString Lens::searchQuery() const
 {
     return m_searchQuery;
@@ -201,12 +207,15 @@
 {
     if (m_unityLens != NULL) {
         // FIXME: should disconnect from m_unityLens's signals
+        delete m_filters;
     }
 
     // FIXME: should emit change notification signals for all properties
 
     m_unityLens = lens;
 
+    m_filters = new Filters(m_unityLens->filters, this);
+
     m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
     m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
     m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));

=== modified file 'libunity-2d-private/src/lens.h'
--- libunity-2d-private/src/lens.h	2011-08-11 17:11:58 +0000
+++ libunity-2d-private/src/lens.h	2011-08-25 14:16:01 +0000
@@ -20,6 +20,8 @@
 #ifndef LENS_H
 #define LENS_H
 
+// Local
+
 // Qt
 #include <QObject>
 #include <QString>
@@ -31,6 +33,7 @@
 // dee-qt
 #include "deelistmodel.h"
 
+class Filters;
 
 class Lens : public QObject
 {
@@ -51,6 +54,7 @@
     Q_PROPERTY(DeeListModel* globalResults READ globalResults NOTIFY globalResultsChanged)
     Q_PROPERTY(DeeListModel* categories READ categories NOTIFY categoriesChanged)
     Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(Filters* filters READ filters NOTIFY filtersChanged)
 
     Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
     Q_PROPERTY(QString globalSearchQuery READ globalSearchQuery WRITE setGlobalSearchQuery NOTIFY globalSearchQueryChanged)
@@ -74,6 +78,7 @@
     DeeListModel* globalResults() const;
     DeeListModel* categories() const;
     bool active() const;
+    Filters* filters() const;
     QString searchQuery() const;
     QString globalSearchQuery() const;
 
@@ -101,6 +106,7 @@
     void globalResultsChanged();
     void categoriesChanged();
     void activeChanged(bool);
+    void filtersChanged();
     void searchFinished(std::string const&);
     void globalSearchFinished(std::string const&);
     void searchQueryChanged();
@@ -123,6 +129,7 @@
     DeeListModel* m_categories;
     QString m_searchQuery;
     QString m_globalSearchQuery;
+    Filters* m_filters;
 };
 
 Q_DECLARE_METATYPE(Lens*)

=== added file 'libunity-2d-private/src/listmodelwrapper.h'
--- libunity-2d-private/src/listmodelwrapper.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/listmodelwrapper.h	2011-08-25 14:16:01 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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 LISTMODELWRAPPER_H
+#define LISTMODELWRAPPER_H
+
+// Qt
+#include <QAbstractListModel>
+#include <QList>
+
+#include <sigc++/signal.h>
+#include <vector>
+
+template <class WrapperItem, class ItemClass>
+class ListModelWrapper : public QAbstractListModel
+{
+    Q_ENUMS(Roles)
+
+public:
+    explicit ListModelWrapper(const std::vector<ItemClass>& list,
+                              sigc::signal<void, ItemClass> itemAddedSignal,
+                              sigc::signal<void, ItemClass> itemRemovedSignal,
+                              QObject *parent = 0);
+    ~ListModelWrapper();
+
+    enum Roles {
+        RoleItem
+    };
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const;
+
+private:
+    void onItemAdded(ItemClass item);
+    void onItemRemoved(ItemClass item);
+    void onItemChanged(ItemClass item);
+
+    QList<WrapperItem*> m_list;
+    QMap<ItemClass, int> m_indexes;
+
+    void addItem(ItemClass item, int index);
+    void removeItem(ItemClass item, int index);
+};
+
+
+template <class WrapperItem, class ItemClass>
+ListModelWrapper<WrapperItem, ItemClass>::ListModelWrapper(const std::vector<ItemClass>& list,
+                                                           sigc::signal<void, ItemClass> itemAddedSignal,
+                                                           sigc::signal<void, ItemClass> itemRemovedSignal,
+                                                           QObject *parent) :
+    QAbstractListModel(parent)
+{
+    QHash<int, QByteArray> roles;
+    roles[ListModelWrapper::RoleItem] = "item";
+    setRoleNames(roles);
+
+    for (unsigned int i=0; i<list.size(); i++) {
+        addItem(list[i], i);
+    }
+    itemAddedSignal.connect(sigc::mem_fun(this, &ListModelWrapper::onItemAdded));
+    itemRemovedSignal.connect(sigc::mem_fun(this, &ListModelWrapper::onItemRemoved));
+}
+
+template <class WrapperItem, class ItemClass>
+ListModelWrapper<WrapperItem, ItemClass>::~ListModelWrapper()
+{
+    m_indexes.clear();
+    while (!m_list.isEmpty()) {
+        delete m_list.takeFirst();
+    }
+}
+
+template <class WrapperItem, class ItemClass>
+int ListModelWrapper<WrapperItem, ItemClass>::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent)
+
+    return m_list.count();
+}
+
+template <class WrapperItem, class ItemClass>
+QVariant ListModelWrapper<WrapperItem, ItemClass>::data(const QModelIndex& index, int role) const
+{
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    WrapperItem* item = m_list.at(index.row());
+
+    if (role == ListModelWrapper::RoleItem) {
+        return QVariant::fromValue(item);
+    } else {
+        return QVariant();
+    }
+}
+
+template <class WrapperItem, class ItemClass>
+void ListModelWrapper<WrapperItem, ItemClass>::onItemAdded(ItemClass item)
+{
+    /* FIXME: figure out actual index of item; for now items are appended */
+    int index = m_list.count();
+    beginInsertRows(QModelIndex(), index, index);
+    addItem(item, index);
+    endInsertRows();
+}
+
+template <class WrapperItem, class ItemClass>
+void ListModelWrapper<WrapperItem, ItemClass>::onItemRemoved(ItemClass item)
+{
+    int index = m_indexes[item];
+    beginInsertRows(QModelIndex(), index, index);
+    removeItem(item, index);
+    endInsertRows();
+}
+
+template <class WrapperItem, class ItemClass>
+void ListModelWrapper<WrapperItem, ItemClass>::onItemChanged(ItemClass item)
+{
+    QModelIndex itemIndex = index(m_indexes[item]);
+    Q_EMIT dataChanged(itemIndex, itemIndex);
+}
+
+template <class WrapperItem, class ItemClass>
+void ListModelWrapper<WrapperItem, ItemClass>::addItem(ItemClass item, int index)
+{
+    m_indexes.insert(item, index);
+    m_list.insert(index, new WrapperItem(item));
+}
+
+template <class WrapperItem, class ItemClass>
+void ListModelWrapper<WrapperItem, ItemClass>::removeItem(ItemClass item, int index)
+{
+    m_indexes.remove(item);
+    delete m_list.takeAt(index);
+}
+
+#endif // LISTMODELWRAPPER_H

=== added file 'libunity-2d-private/src/multirangefilter.cpp'
--- libunity-2d-private/src/multirangefilter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/multirangefilter.cpp	2011-08-25 14:16:01 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// Self
+#include "multirangefilter.h"
+
+MultiRangeFilter::MultiRangeFilter(QObject *parent) :
+    Filter(parent), m_unityMultiRangeFilter(NULL), m_options(NULL)
+{
+}
+
+FilterOptions* MultiRangeFilter::options() const
+{
+    return m_options;
+}
+
+void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    Filter::setUnityFilter(filter);
+    m_unityMultiRangeFilter = std::dynamic_pointer_cast<unity::dash::MultiRangeFilter>(m_unityFilter);
+
+    onOptionsChanged(m_unityMultiRangeFilter->options);
+}
+
+void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options options)
+{
+    if (m_options != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+        delete m_options;
+        m_options = NULL;
+    }
+    m_options = new FilterOptions(m_unityMultiRangeFilter->options,
+                                  m_unityMultiRangeFilter->option_added,
+                                  m_unityMultiRangeFilter->option_removed);
+    /* Property change signals */
+    m_unityMultiRangeFilter->options.changed.connect(sigc::mem_fun(this, &MultiRangeFilter::onOptionsChanged));
+
+    Q_EMIT optionsChanged();
+}
+
+#include "multirangefilter.moc"

=== added file 'libunity-2d-private/src/multirangefilter.h'
--- libunity-2d-private/src/multirangefilter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/multirangefilter.h	2011-08-25 14:16:01 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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 MULTIRANGEFILTER_H
+#define MULTIRANGEFILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/MultiRangeFilter.h>
+
+// Local
+#include "filter.h"
+#include "filteroption.h"
+
+class MultiRangeFilter : public Filter
+{
+    Q_OBJECT
+
+    Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)
+
+public:
+    explicit MultiRangeFilter(QObject *parent = 0);
+
+    /* getters */
+    FilterOptions* options() const;
+
+Q_SIGNALS:
+    void optionsChanged();
+
+protected:
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+private:
+    unity::dash::MultiRangeFilter::Ptr m_unityMultiRangeFilter;
+    FilterOptions* m_options;
+
+    void onOptionsChanged(unity::dash::MultiRangeFilter::Options);
+};
+
+Q_DECLARE_METATYPE(MultiRangeFilter*)
+
+#endif // MULTIRANGEFILTER_H

=== added file 'libunity-2d-private/src/radiooptionfilter.cpp'
--- libunity-2d-private/src/radiooptionfilter.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/radiooptionfilter.cpp	2011-08-25 14:16:01 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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/>.
+ */
+
+// Self
+#include "radiooptionfilter.h"
+
+RadioOptionFilter::RadioOptionFilter(QObject *parent) :
+    Filter(parent), m_unityRadioOptionFilter(NULL), m_options(NULL)
+{
+}
+
+FilterOptions* RadioOptionFilter::options() const
+{
+    return m_options;
+}
+
+void RadioOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
+{
+    Filter::setUnityFilter(filter);
+    m_unityRadioOptionFilter = std::dynamic_pointer_cast<unity::dash::RadioOptionFilter>(m_unityFilter);
+
+    onOptionsChanged(m_unityRadioOptionFilter->options);
+}
+
+void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOptions options)
+{
+    if (m_options != NULL) {
+        // FIXME: should disconnect from m_unityFilter's signals
+        delete m_options;
+        m_options = NULL;
+    }
+    m_options = new FilterOptions(m_unityRadioOptionFilter->options,
+                                 m_unityRadioOptionFilter->option_added,
+                                 m_unityRadioOptionFilter->option_removed);
+    /* Property change signals */
+    m_unityRadioOptionFilter->options.changed.connect(sigc::mem_fun(this, &RadioOptionFilter::onOptionsChanged));
+
+    Q_EMIT optionsChanged();
+}
+
+#include "radiooptionfilter.moc"

=== added file 'libunity-2d-private/src/radiooptionfilter.h'
--- libunity-2d-private/src/radiooptionfilter.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/radiooptionfilter.h	2011-08-25 14:16:01 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Florian Boucault <[e-mail]>
+ *
+ * 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 RADIOOPTIONFILTER_H
+#define RADIOOPTIONFILTER_H
+
+// Qt
+#include <QObject>
+#include <QMetaType>
+
+// libunity-core
+#include <UnityCore/RadioOptionFilter.h>
+
+// Local
+#include "filter.h"
+#include "filteroption.h"
+
+class RadioOptionFilter : public Filter
+{
+    Q_OBJECT
+
+    Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)
+
+public:
+    explicit RadioOptionFilter(QObject *parent = 0);
+
+    /* getters */
+    FilterOptions* options() const;
+
+Q_SIGNALS:
+    void optionsChanged();
+
+protected:
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
+private:
+    unity::dash::RadioOptionFilter::Ptr m_unityRadioOptionFilter;
+    FilterOptions* m_options;
+
+    void onOptionsChanged(unity::dash::RadioOptionFilter::RadioOptions);
+};
+
+Q_DECLARE_METATYPE(RadioOptionFilter*)
+
+#endif // RADIOOPTIONFILTER_H

=== modified file 'libunity-2d-private/src/ratingsfilter.cpp'
--- libunity-2d-private/src/ratingsfilter.cpp	2011-08-02 15:10:09 +0000
+++ libunity-2d-private/src/ratingsfilter.cpp	2011-08-25 14:16:01 +0000
@@ -21,7 +21,7 @@
 #include "ratingsfilter.h"
 
 RatingsFilter::RatingsFilter(QObject *parent) :
-    Filter(parent)
+    Filter(parent), m_unityRatingsFilter(NULL)
 {
 }
 
@@ -30,6 +30,11 @@
     return m_unityRatingsFilter->rating();
 }
 
+void RatingsFilter::setRating(float rating)
+{
+    m_unityRatingsFilter->rating = rating;
+}
+
 void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
 {
     if (m_unityFilter != NULL) {

=== modified file 'libunity-2d-private/src/ratingsfilter.h'
--- libunity-2d-private/src/ratingsfilter.h	2011-08-02 15:10:09 +0000
+++ libunity-2d-private/src/ratingsfilter.h	2011-08-25 14:16:01 +0000
@@ -34,7 +34,7 @@
 {
     Q_OBJECT
 
-    Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)
+    Q_PROPERTY(float rating READ rating WRITE setRating NOTIFY ratingChanged)
 
 public:
     explicit RatingsFilter(QObject *parent = 0);
@@ -42,11 +42,15 @@
     /* getters */
     float rating() const;
 
-    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+    /* setters */
+    void setRating(float rating);
 
 Q_SIGNALS:
     void ratingChanged(float);
 
+protected:
+    virtual void setUnityFilter(unity::dash::Filter::Ptr filter);
+
 private:
     unity::dash::RatingsFilter::Ptr m_unityRatingsFilter;
 };

=== modified file 'places/ButtonBackground.qml'
--- places/ButtonBackground.qml	2011-08-23 17:34:44 +0000
+++ places/ButtonBackground.qml	2011-08-25 14:16:01 +0000
@@ -1,3 +1,21 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
 import QtQuick 1.0
 
 Item {

=== renamed file 'places/SearchRefineOption.qml' => 'places/Filter.qml'
--- places/SearchRefineOption.qml	2011-08-11 08:17:14 +0000
+++ places/Filter.qml	2011-08-25 14:16:01 +0000
@@ -19,9 +19,10 @@
 import QtQuick 1.0
 
 FocusScope {
-    property string title
+    id: filterView
+
     property variant lens
+    property variant filterModel
 
-    width: parent.width
     height: childrenRect.height
 }

=== renamed file 'places/SearchRefineOptionType.qml' => 'places/FilterCheckoption.qml'
--- places/SearchRefineOptionType.qml	2011-08-25 13:08:52 +0000
+++ places/FilterCheckoption.qml	2011-08-25 14:16:01 +0000
@@ -18,39 +18,16 @@
 
 import QtQuick 1.0
 
-SearchRefineOption {
-    id: searchRefineOption
-
-    Item {
-        id: header
-
-        Accessible.name: searchRefineOption.title
-
-        KeyNavigation.down: filters
-
-        focus: true
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: childrenRect.height
-
-        TextCustom {
-            id: title
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-
-            text: searchRefineOption.title
-            fontSize: "large"
-            font.bold: true
-            font.underline: ( parent.state == "selected" || parent.state == "hovered" )
-        }
-    }
+Filter {
+    id: filterView
+
+    height: filters.height
 
     GridViewWithSpacing {
         id: filters
 
-        columns: 2
+        columns: ( filterView.filterModel.id == "genre"
+                  || filterView.filterModel.id == "modified" ) ? 3 : 2
         rows: Math.ceil(count/columns)
 
         horizontalSpacing: 10
@@ -59,17 +36,16 @@
         cellWidth: width/columns
         delegateHeight: 30
 
-        anchors.top: header.bottom
-        anchors.topMargin: 15
         height: cellHeight * rows
         boundsBehavior: Flickable.StopAtBounds
 
+        focus: true
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.top: parent.top
 
         /* Make sure the first item is selected when getting the focus for the first time */
         currentIndex: 0
-        KeyNavigation.up: header
 
         delegate: FocusScope {
             TickBox {
@@ -77,15 +53,12 @@
                 width: filters.delegateWidth
                 height: filters.delegateHeight
                 x: filters.delegateX(model.index % filters.columns)
-                       /* Not checking for lens != undefined leads to a segfault
-                          when switching lenses */
-                       text: lens != undefined ? column_0 : ""
-                       checked: dash.currentPage.model.activeSection == model.index
-
-                       onClicked: lens.activeSection = model.index
+                text: item.name
+                checked: item.active
+                onClicked: item.active = !item.active
             }
         }
 
-        model: lens != undefined ? lens.sections : undefined
+        model: filterView.filterModel.options
     }
 }

=== added file 'places/FilterLoader.qml'
--- places/FilterLoader.qml	1970-01-01 00:00:00 +0000
+++ places/FilterLoader.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,117 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+import "utils.js" as Utils
+
+FocusScope {
+    id: filterLoader
+
+    property variant lens
+    property variant filterModel
+    property bool isFirst
+
+    height: childrenRect.height
+
+    FocusScope {
+        id: header
+
+        function accessibleDescription() {
+            if (filterModel.filtering) {
+                return u2d.tr("Filter %1 active").arg(filterModel.name)
+            } else {
+                return u2d.tr("Filter %1 inactive").arg(filterModel.name)
+            }
+        }
+
+        Accessible.name: accessibleDescription()
+
+        KeyNavigation.down: filterView
+
+        focus: true
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: childrenRect.height
+
+        Rectangle {
+            id: separatorLine
+
+            color: "#21ffffff"
+
+            height: 1
+            visible: !isFirst
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+        }
+
+        TextCustom {
+            id: title
+
+            anchors.verticalCenter: clearButton.verticalCenter
+            anchors.topMargin: isFirst ? 0 : 13
+            anchors.left: parent.left
+
+            text: u2d.tr(filterModel.name)
+            fontSize: "large"
+            font.bold: true
+            font.underline: ( parent.state == "selected" || parent.state == "hovered" )
+        }
+
+        TickBox {
+            id: clearButton
+
+            focus: true
+
+            /* FIXME: should be 48px wide in English but made bigger to
+                      accomodate for more verbose languages */
+            width: 55
+            height: 30
+            anchors.top: parent.top
+            anchors.topMargin: isFirst ? 0 : 13
+            anchors.right: parent.right
+
+            text: u2d.tr("All")
+            checked: !filterModel.filtering
+            onClicked: filterModel.clear()
+        }
+    }
+
+    Loader {
+        id: filterView
+
+        KeyNavigation.up: header
+        anchors.top: header.bottom
+        anchors.topMargin: 15
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        source: Utils.convertToCamelCase(filterModel.rendererName) + ".qml"
+        onStatusChanged: {
+            if (status == Loader.Error) {
+                console.log("Failed to load filter renderer", filterModel.rendererName)
+            }
+        }
+
+        Binding { target: filterView.item; property: "lens"; value: filterLoader.lens }
+        Binding { target: filterView.item; property: "filterModel"; value: filterLoader.filterModel }
+
+        onLoaded: item.focus = true
+    }
+}

=== added file 'places/FilterMultirange.qml'
--- places/FilterMultirange.qml	1970-01-01 00:00:00 +0000
+++ places/FilterMultirange.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,37 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+
+Filter {
+    id: filterView
+
+    height: filters.height
+
+    MultiRangeView {
+        id: filters
+
+        focus: true
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        height: 30
+
+        model: filterView.filterModel.options
+    }
+}

=== renamed file 'places/SearchRefine.qml' => 'places/FilterPane.qml'
--- places/SearchRefine.qml	2011-08-25 13:08:52 +0000
+++ places/FilterPane.qml	2011-08-25 14:16:01 +0000
@@ -20,7 +20,7 @@
 import Effects 1.0
 
 FocusScope {
-    id: searchRefine
+    id: filterPane
 
     property bool folded: true
     property int headerHeight
@@ -51,12 +51,12 @@
                     color: "white"
                 }
 
-        onClicked: searchRefine.folded = !searchRefine.folded
+        onClicked: filterPane.folded = !filterPane.folded
 
         focus: true
 
         /* Do not navigate down to the options if they are folded */
-        KeyNavigation.down: !searchRefine.folded ? options : header
+        KeyNavigation.down: !filterPane.folded ? options : header
 
         anchors.left: parent.left
         anchors.right: parent.right
@@ -79,25 +79,17 @@
         FoldingArrow {
             id: arrow
 
-            folded: searchRefine.folded
+            folded: filterPane.folded
 
             anchors.verticalCenter: title.verticalCenter
             anchors.right: parent.right
         }
     }
 
-    VisualItemModel {
-        id: optionsModel
-
-        SearchRefineOptionType {
-            title: u2d.tr("Type")
-            lens: searchRefine.lens
-        }
-    }
-
     ListView {
         id: options
 
+        clip: true
         opacity: folded ? 0.0 : 1.0
         Behavior on opacity {NumberAnimation {duration: 100; easing.type: Easing.InOutQuad}}
 
@@ -109,6 +101,7 @@
         anchors.topMargin: 7
         anchors.bottom: parent.bottom
         orientation: ListView.Vertical
+        spacing: 12
 
         /* Make sure the first section is selected when getting the focus */
         currentIndex: 0
@@ -123,6 +116,16 @@
         /* Non-draggable when all items are visible */
         boundsBehavior: Flickable.StopAtBounds
 
-        model: optionsModel
+        model: filterPane.lens != undefined ? filterPane.lens.filters : undefined
+        /* Dynamically load the QML file corresponding to filter.rendererName.
+           For example, if filter.rendererName == "filter-checkoption" then
+           load "FilterCheckoption.qml".
+        */
+        delegate: FilterLoader {
+            width: ListView.view.width
+            lens: filterPane.lens
+            filterModel: filter
+            isFirst: index == 0
+        }
     }
 }

=== added file 'places/FilterRadiooption.qml'
--- places/FilterRadiooption.qml	1970-01-01 00:00:00 +0000
+++ places/FilterRadiooption.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,22 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+
+FilterCheckoption {
+}

=== added file 'places/FilterRatings.qml'
--- places/FilterRatings.qml	1970-01-01 00:00:00 +0000
+++ places/FilterRatings.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,47 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+
+Filter {
+    id: filterView
+
+    height: rating.height
+
+    RatingStars {
+        id: rating
+
+        height: childrenRect.height
+
+        focus: true
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+
+        size: 5
+        spacing: 7
+        rating: filterView.filterModel.rating
+        Binding {
+            target: filterView.filterModel
+            property: "rating"
+            value: rating.rating
+        }
+
+        enabled: true
+    }
+}

=== added file 'places/MultiRangeButton.qml'
--- places/MultiRangeButton.qml	1970-01-01 00:00:00 +0000
+++ places/MultiRangeButton.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,65 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+import Effects 1.0
+
+AbstractButton {
+    id: multiRangeButton
+
+    property string text
+    property bool checked: false
+    property bool isLast: false
+
+    Accessible.name: text
+
+    TextCustom {
+        id: label
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.leftMargin: 1
+        width: parent.width-1
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        fontSize: "small"
+        color: "white"
+        text: multiRangeButton.text
+        elide: Text.ElideRight
+
+        effect: DropShadow {
+             blurRadius: 8
+             color: "white"
+             offset.x: 0
+             offset.y: 0
+             enabled: ( multiRangeButton.state == "selected" )
+        }
+    }
+
+    Rectangle {
+        id: separatorLine
+
+        color: "#21ffffff"
+
+        width: 1
+        visible: ( !isLast )
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.left: parent.right
+    }
+}

=== added file 'places/MultiRangeSelectionBar.qml'
--- places/MultiRangeSelectionBar.qml	1970-01-01 00:00:00 +0000
+++ places/MultiRangeSelectionBar.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,64 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+
+Item {
+    id: multiRangeSelectionBar
+
+    property bool isFirst: true
+    property bool isLast: false
+    property int leftPos: 0
+    property int rightPos: 100
+
+    x: leftPos
+    width: rightPos - leftPos
+    height: childrenRect.height
+
+    Image {
+        id: leftBorder
+        source: (isFirst) ? "artwork/multirange_selection_left_first.png"
+                          : "artwork/multirange_selection_left.png"
+        width: sourceSize.width
+        height: sourceSize.height
+        anchors.left: parent.left
+        anchors.top: parent.top
+    }
+
+    Image {
+        id: background
+        source: "artwork/multirange_selection_middle.png"
+        width: sourceSize.width
+        height: sourceSize.height
+        anchors.top: parent.top
+        anchors.left: leftBorder.right
+        anchors.right: rightBorder.left
+        fillMode: Image.TileHorizontally
+    }
+
+    Image {
+        id: rightBorder
+        source: (isLast) ? "artwork/multirange_selection_right_last.png"
+                         : "artwork/multirange_selection_right.png"
+        width: sourceSize.width
+        height: sourceSize.height
+        anchors.top: parent.top
+        anchors.right: parent.right
+    }
+
+}

=== added file 'places/MultiRangeView.qml'
--- places/MultiRangeView.qml	1970-01-01 00:00:00 +0000
+++ places/MultiRangeView.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,97 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+
+FocusScope {
+    id: multiRangeView
+
+    property alias model: list.model
+    property alias count: list.count
+    property int cellWidth: Math.floor(width / count)
+
+    /* Keep track of active cells with array, from which determine index
+        of leftmost and rightmost active cells.*/
+    property variant activeCells: Array(count)
+    property int leftActiveCell: -1
+    property int rightActiveCell: -1
+
+    function cellActivationChanged(cellId, state) {
+        var tmp = activeCells
+        tmp[cellId] = state
+        activeCells = tmp
+        setSelectionBarPosition()
+    }
+
+    function setSelectionBarPosition() {
+        leftActiveCell = activeCells.indexOf(true)
+        rightActiveCell = activeCells.lastIndexOf(true);
+    }
+
+    Rectangle {
+        id: container
+
+        /* FIXME: Rectangle's borders grow half inside and half outside of the
+           rectangle. In order to avoid it being clipped, we adjust its size
+           and position depending on its border's width.
+
+           Ref.: http://lists.qt.nokia.com/pipermail/qt-qml/2010-May/000264.html
+        */
+        x: Math.floor(border.width / 2)
+        y: Math.floor(border.width / 2)
+        width: parent.width - border.width
+        height: parent.height - border.width
+
+        border.color: "#21ffffff" // 80% opaque white
+        border.width: 1
+        color: "transparent"
+        radius: 5
+    }
+
+    ListView {
+        id: list
+
+        anchors.fill: parent
+        orientation: ListView.Horizontal
+        focus: true
+        boundsBehavior: Flickable.StopAtBounds
+
+        delegate: MultiRangeButton {
+            height: ListView.view.height
+            width: cellWidth
+            text: item.name
+            checked: item.active
+            onClicked: item.active = !item.active
+            onCheckedChanged: cellActivationChanged(model.index, checked)
+            isLast: ( model.index == count-1 )
+            Component.onCompleted: cellActivationChanged(model.index, item.active)
+        }
+    }
+
+    MultiRangeSelectionBar {
+        id: selectionBar
+
+        visible: ( leftActiveCell != -1 && rightActiveCell != -1 )
+        isFirst: ( leftActiveCell == 0 )
+        isLast: ( rightActiveCell == count-1 )
+        leftPos: ( leftActiveCell == 0 ) ? 0 : leftActiveCell*cellWidth-2
+        /* Hack: Rounding errors can mean the right of the selectionBar fails
+           to wholly cover the container Rectangle (and its border) */
+        rightPos: ( rightActiveCell == count-1 ) ? parent.width : (rightActiveCell+1)*cellWidth+3
+    }
+}

=== added file 'places/RatingStars.qml'
--- places/RatingStars.qml	1970-01-01 00:00:00 +0000
+++ places/RatingStars.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,129 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+
+Item {
+    id: ratingStars
+
+    property real rating: 3.7
+    property int size: 5 /* Number of stars */
+    property alias enabled: starsMouseArea.enabled
+    property alias spacing: stars.spacing
+
+    /* Configure icon size to use. Requires icon files named:
+       - artwork/star_empty-${starIconSize}.png
+       - artwork/star_full-${starIconSize}.png
+    */
+    property int starIconSize: 32
+
+    width: stars.width
+    height: stars.height
+
+    function clamp(x, min, max) {
+        return Math.max(Math.min(x, max), min)
+    }
+
+    function incrementRating() {
+        /* Make math easier since half rating accepted */
+        var double_rating = rating * 2
+
+        if ( double_rating % 1 > 0){ /* if non-integer, round up */
+            double_rating = Math.ceil(double_rating)
+        }
+        else {
+            double_rating = clamp(double_rating+1, 0, size * 2)
+        }
+        rating = double_rating / 2
+    }
+
+    function decrementRating() {
+        var double_rating = rating * 2
+
+        if ( double_rating % 1 > 0){ /* if non-integer, round down */
+            double_rating = Math.ceil(double_rating)
+        }
+        else {
+            double_rating = clamp(double_rating-1, 0, size * 2)
+        }
+        rating = double_rating / 2
+    }
+
+    Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
+    function handleKeyPress(key) {
+        switch (key) {
+        case Qt.Key_Right:
+            incrementRating()
+            return true
+        case Qt.Key_Left:
+            decrementRating()
+            return true
+        }
+        return false
+    }
+
+    Row {
+        id: stars
+
+        Repeater {
+            model: size
+            Star {
+                fill: clamp(rating - index, 0, 1)
+                iconSize: starIconSize
+                selected: ( ratingStars.activeFocus )
+            }
+        }
+    }
+
+    MouseArea {
+        id: starsMouseArea
+
+        /* Calculating Star Rating incorporating inter-star spacing/gap.
+
+           Consider each star+gap as a "unit". Determine what unit the mouse is over,
+           and remove the width of the gaps to the left from the reported mouse position.
+          */
+
+        /* Width of each unit */
+        property int unitWidth: starIconSize + stars.spacing
+
+        function calculateRating( posX ){
+            /* Small left-hand edge to set zero rating */
+            if( posX < 4 ) return 0
+
+            /* Mouse X coordinate over one unit, relative to that unit's left edge*/
+            var posXOverUnit = posX % unitWidth
+
+            /* What unit is the mouse over? This is the integer part of the rating (plus one)*/
+            var rating = (posX - posXOverUnit) / unitWidth + 1
+
+            /* If posX under half the star's width, remove 0.5 from the rating */
+            if( posXOverUnit <= (starIconSize/2) ){
+                rating = rating - 0.5
+            }
+            return clamp( rating, 0, size )
+        }
+
+        anchors.fill: stars
+
+        onPressed: rating = calculateRating(mouseX)
+        onPositionChanged: {
+            if (pressed) rating = calculateRating(mouseX)
+        }
+    }
+}

=== added file 'places/Star.qml'
--- places/Star.qml	1970-01-01 00:00:00 +0000
+++ places/Star.qml	2011-08-25 14:16:01 +0000
@@ -0,0 +1,59 @@
+/*
+ * This file is part of unity-2d
+ *
+ * Copyright 2010-2011 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/>.
+ */
+
+import QtQuick 1.0
+import Effects 1.0
+
+Item {
+    /* Fill is between 0 and 1 */
+    property real fill: 0
+    property int iconSize: 32
+    property bool selected: false
+
+    width: childrenRect.width
+    height: childrenRect.height
+
+    effect: DropShadow {
+         blurRadius: 8
+         color: "white"
+         offset.x: 0
+         offset.y: 0
+    }
+
+    Image {
+        width: sourceSize.width
+        height: sourceSize.height
+
+        source: ("artwork/star_empty-%1.png").arg(iconSize)
+        opacity: ( selected ) ? 0.8 : 0.3
+        asynchronous: true
+    }
+
+    Image {
+        width: Math.ceil(sourceSize.width * fill)
+        height: sourceSize.height
+
+        source: ("artwork/star_full-%1.png").arg(iconSize)
+        fillMode: Image.TileHorizontally
+        asynchronous: true
+        opacity: ( selected ) ? 1 : 0.8
+        clip: true
+    }
+}
+
+

=== modified file 'places/TickBox.qml'
--- places/TickBox.qml	2011-08-25 13:08:52 +0000
+++ places/TickBox.qml	2011-08-25 14:16:01 +0000
@@ -42,8 +42,17 @@
 
     Rectangle {
         id: container
-        width: parent.width
-        height: parent.height
+
+        /* FIXME: Rectangle's borders grow half inside and half outside of the
+           rectangle. In order to avoid it being clipped, we adjust its size
+           and position depending on its border's width.
+
+           Ref.: http://lists.qt.nokia.com/pipermail/qt-qml/2010-May/000264.html
+        */
+        x: Math.floor(border.width / 2)
+        y: Math.floor(border.width / 2)
+        width: parent.width - border.width
+        height: parent.height - border.width
         border.color: if ( parent.state == "selected") return "white"
                       else if ( checked ) return "#cdffffff" // 13% opaque
                       else return "#21ffffff" // 80% opaque
@@ -54,7 +63,7 @@
 
     TextCustom {
         id: label
-        anchors.fill: container
+        anchors.fill: parent
         width: parent.width
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter

=== added file 'places/artwork/multirange_selection_left.png'
Binary files places/artwork/multirange_selection_left.png	1970-01-01 00:00:00 +0000 and places/artwork/multirange_selection_left.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/multirange_selection_left_first.png'
Binary files places/artwork/multirange_selection_left_first.png	1970-01-01 00:00:00 +0000 and places/artwork/multirange_selection_left_first.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/multirange_selection_middle.png'
Binary files places/artwork/multirange_selection_middle.png	1970-01-01 00:00:00 +0000 and places/artwork/multirange_selection_middle.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/multirange_selection_right.png'
Binary files places/artwork/multirange_selection_right.png	1970-01-01 00:00:00 +0000 and places/artwork/multirange_selection_right.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/multirange_selection_right_last.png'
Binary files places/artwork/multirange_selection_right_last.png	1970-01-01 00:00:00 +0000 and places/artwork/multirange_selection_right_last.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/star_empty-32.png'
Binary files places/artwork/star_empty-32.png	1970-01-01 00:00:00 +0000 and places/artwork/star_empty-32.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/star_empty.png'
Binary files places/artwork/star_empty.png	1970-01-01 00:00:00 +0000 and places/artwork/star_empty.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/star_full-32.png'
Binary files places/artwork/star_full-32.png	1970-01-01 00:00:00 +0000 and places/artwork/star_full-32.png	2011-08-25 14:16:01 +0000 differ
=== added file 'places/artwork/star_full.png'
Binary files places/artwork/star_full.png	1970-01-01 00:00:00 +0000 and places/artwork/star_full.png	2011-08-25 14:16:01 +0000 differ
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-08-23 17:51:00 +0000
+++ places/dash.qml	2011-08-25 14:16:01 +0000
@@ -191,36 +191,31 @@
             /* FIXME: check on visible necessary; fixed in Qt Quick 1.1
                       ref: http://bugreports.qt.nokia.com/browse/QTBUG-15862
             */
-            KeyNavigation.right: refine_search.visible ? refine_search : search_entry
+            KeyNavigation.right: filterPane.visible ? filterPane : search_entry
             KeyNavigation.down: pageLoader
 
             anchors.top: parent.top
             anchors.topMargin: 10
             anchors.left: parent.left
             anchors.leftMargin: 16
-            anchors.right: refine_search.left
+            anchors.right: filterPane.left
             anchors.rightMargin: 10
 
             height: 53
         }
 
-        SearchRefine {
-            id: refine_search
+        FilterPane {
+            id: filterPane
 
             KeyNavigation.left: search_entry
 
-            /* SearchRefine is only to be displayed for lenses, not in the home page */
-            /* FIXME: deactivated for now as the Qt bindings for the filters
-                      backend are not ready. Code should be:
-
-                      visible: dashView.activeLens != ""
-            */
-            visible: false
+            /* FilterPane is only to be displayed for lenses, not in the home page */
+            visible: dashView.activeLens != ""
             lens: visible && currentPage != undefined ? currentPage.model : undefined
 
             anchors.top: search_entry.anchors.top
             anchors.topMargin: search_entry.anchors.topMargin
-            height: parent.height
+            anchors.bottom: lensBar.top
             headerHeight: search_entry.height
             width: 310
             anchors.right: parent.right
@@ -234,7 +229,7 @@
             /* FIXME: check on visible necessary; fixed in Qt Quick 1.1
                       ref: http://bugreports.qt.nokia.com/browse/QTBUG-15862
             */
-            KeyNavigation.right: refine_search.visible && !refine_search.folded ? refine_search : pageLoader
+            KeyNavigation.right: filterPane.visible && !filterPane.folded ? filterPane : pageLoader
             KeyNavigation.up: search_entry
             KeyNavigation.down: lensBar
 
@@ -242,8 +237,8 @@
             anchors.topMargin: 2
             anchors.bottom: lensBar.top
             anchors.left: parent.left
-            anchors.right: !refine_search.visible || refine_search.folded ? parent.right : refine_search.left
-            anchors.rightMargin: !refine_search.visible || refine_search.folded ? 0 : 15
+            anchors.right: !filterPane.visible || filterPane.folded ? parent.right : filterPane.left
+            anchors.rightMargin: !filterPane.visible || filterPane.folded ? 0 : 15
             onLoaded: item.focus = true
         }