Merge lp:~unity-team/unity-scopes-shell/overview into lp:unity-scopes-shell

[Michal Hruby]

Implement support for the scopes overview.

Implement support for the scopes overview.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

124. By Michal Hruby on 2014-07-23

Added missing file

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

125. By Michal Hruby on 2014-07-23

Pretend we're the scopes scope, so server recommendations work

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

126. By Michal Hruby on 2014-07-24

Bump dep on libunity-api

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Been using it with my unity8 branch and can't find nothing wrong.

review: Approve (functional)

[Pete Woods (pete-woods)]

The code changes look good to me.

review: Approve

[lp:~unity-team/unity-scopes-shell/overview]

127. By Michal Hruby on 2014-07-25

Merge trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

128. By Michal Hruby on 2014-07-25

Fix tests

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

129. By Michal Hruby on 2014-07-31

Merge trunk

130. By Michal Hruby on 2014-07-31

Fix up things

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

131. By Michal Hruby on 2014-07-31

Fix tests

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity-scopes-shell/overview]

132. By Michal Hruby on 2014-07-31

Merge the catch branch

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-28 15:27:16 +0000
+++ debian/changelog	2014-07-31 13:04:48 +0000
@@ -1,3 +1,9 @@
+unity-scopes-shell (0.5.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Specialized implementation of scopes overview
+
+ -- Michal Hruby <[e-mail]>  Wed, 16 Jul 2014 18:18:08 +0100
+
 unity-scopes-shell (0.5.0+14.10.20140728.1-0ubuntu1) utopic; urgency=low
 
   [ Pete Woods ]

=== modified file 'debian/control'
--- debian/control	2014-07-28 15:20:34 +0000
+++ debian/control	2014-07-31 13:04:48 +0000
@@ -3,7 +3,7 @@
 Section: libs
 Build-Depends: cmake,
                debhelper (>= 9),
-               libunity-api-dev (>= 7.85),
+               libunity-api-dev (>= 7.87),
                libunity-scopes-dev (>= 0.5.3~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
@@ -35,6 +35,7 @@
           unity-scopes-impl-0,
           unity-scopes-impl-1,
           unity-scopes-impl-2,
+          unity-scopes-impl-3,
 Breaks: unity8-private (<< 7.84)
 Replaces: unity8-private (<< 7.84)
 Description: QML plugin for Scopes

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-07-25 15:30:02 +0000
+++ src/Unity/CMakeLists.txt	2014-07-31 13:04:48 +0000
@@ -2,7 +2,7 @@
 include(Plugins)
 
 # Dependencies
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.3)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(U1DB REQUIRED libu1db-qt5)
@@ -24,6 +24,9 @@
     departmentnode.cpp
     geoip.cpp
     locationservice.cpp
+    overviewcategories.cpp
+    overviewresults.cpp
+    overviewscope.cpp
     previewmodel.cpp
     previewstack.cpp
     previewwidgetmodel.cpp

=== modified file 'src/Unity/categories.cpp'
--- src/Unity/categories.cpp	2014-07-24 15:21:23 +0000
+++ src/Unity/categories.cpp	2014-07-31 13:04:48 +0000
@@ -39,7 +39,7 @@
 namespace scopes_ng {
 
 // FIXME: this should be in a common place
-#define CATEGORY_JSON_DEFAULTS R"({"schema-version":1,"template": {"category-layout":"grid","card-layout":"vertical","card-size":"small","overlay-mode":null,"collapsed-rows":2}, "components": { "title":null, "art": { "aspect-ratio":1.0, "fill-mode":"crop" }, "subtitle":null, "mascot":null, "emblem":null, "summary":null, "attributes": { "max-count":2 }, "background":null }, "resources":{}})"
+#define CATEGORY_JSON_DEFAULTS R"({"schema-version":1,"template": {"category-layout":"grid","card-layout":"vertical","card-size":"small","overlay-mode":null,"collapsed-rows":2}, "components": { "title":null, "art": { "aspect-ratio":1.0, "fill-mode":"crop" }, "subtitle":null, "mascot":null, "emblem":null, "summary":null, "attributes": { "max-count":2 }, "background":null, "overlay-color":null }, "resources":{}})"
 
 class CategoryData
 {
@@ -219,19 +219,6 @@
         return m_isSpecial;
     }
 
-private:
-    static QJsonValue* DEFAULTS;
-    scopes::Category::SCPtr m_category;
-    QString m_catId;
-    QString m_catTitle;
-    QString m_catIcon;
-    std::string m_rawTemplate;
-    QJsonValue m_rendererTemplate;
-    QJsonValue m_components;
-    ResultsModel* m_resultsModel;
-    QPointer<QObject> m_countObject;
-    bool m_isSpecial;
-
     static bool parseTemplate(std::string const& raw_template, QJsonValue* renderer, QJsonValue* components)
     {
         // lazy init of the defaults
@@ -265,6 +252,19 @@
         return true;
     }
 
+private:
+    static QJsonValue* DEFAULTS;
+    scopes::Category::SCPtr m_category;
+    QString m_catId;
+    QString m_catTitle;
+    QString m_catIcon;
+    std::string m_rawTemplate;
+    QJsonValue m_rendererTemplate;
+    QJsonValue m_components;
+    ResultsModel* m_resultsModel;
+    QPointer<QObject> m_countObject;
+    bool m_isSpecial;
+
     static QJsonValue mergeOverrides(QJsonValue const& defaultVal, QJsonValue const& overrideVal)
     {
         if (overrideVal.isObject() && defaultVal.isObject()) {
@@ -440,6 +440,12 @@
     dataChanged(changeStart, changeEnd, roles);
 }
 
+
+bool Categories::parseTemplate(std::string const& raw_template, QJsonValue* renderer, QJsonValue* components)
+{
+    return CategoryData::parseTemplate(raw_template, renderer, components);
+}
+
 bool Categories::overrideCategoryJson(QString const& categoryId, QString const& json)
 {
     int idx = getCategoryIndex(categoryId);

=== modified file 'src/Unity/categories.h'
--- src/Unity/categories.h	2014-05-13 13:59:41 +0000
+++ src/Unity/categories.h	2014-07-31 13:04:48 +0000
@@ -24,9 +24,8 @@
 
 #include <unity/shell/scopes/CategoriesInterface.h>
 
-#include <QSet>
-#include <QTimer>
 #include <QSharedPointer>
+#include <QJsonValue>
 
 #include <unity/scopes/Category.h>
 
@@ -55,6 +54,8 @@
     void updateResultCount(ResultsModel* resultsModel);
     void clearAll();
 
+    static bool parseTemplate(std::string const& raw_template, QJsonValue* renderer, QJsonValue* components);
+
 private Q_SLOTS:
     void countChanged();
 

=== added file 'src/Unity/overviewcategories.cpp'
--- src/Unity/overviewcategories.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/overviewcategories.cpp	2014-07-31 13:04:48 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michał Sawicz <[e-mail]>
+ *  Michal Hruby <[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 "overviewcategories.h"
+
+// local
+#include "overviewresults.h"
+#include "utils.h"
+
+namespace scopes_ng
+{
+
+#define CATEGORY_JSON R"({"schema-version":1,"template": {"category-layout":"grid","card-size":"small","overlay":true}, "components": { "title":"title", "art": {"field":"art", "aspect-ratio": 0.5}, "overlay-color": "overlay-color"}})"
+
+struct ScopesCategoryData
+{
+    QString categoryId;
+    QString rawTemplate;
+    QVariant rendererVar;
+    QVariant componentsVar;
+
+    ScopesCategoryData(QString const& id, QString const& jsonTemplate): categoryId(id), rawTemplate(jsonTemplate)
+    {
+        QJsonValue rendererTemplate;
+        QJsonValue components;
+
+        Categories::parseTemplate(jsonTemplate.toStdString(), &rendererTemplate, &components);
+        rendererVar = rendererTemplate.toVariant();
+        componentsVar = components.toVariant();
+    }
+};
+
+OverviewCategories::OverviewCategories(QObject* parent)
+    : scopes_ng::Categories(parent)
+    , m_isSurfacing(true)
+{
+    m_allScopes.reset(new OverviewResultsModel(this));
+    m_favouriteScopes.reset(new OverviewResultsModel(this));
+
+    m_surfaceCategories.append(QSharedPointer<ScopesCategoryData>(new ScopesCategoryData("favorites", CATEGORY_JSON)));
+    m_surfaceCategories.append(QSharedPointer<ScopesCategoryData>(new ScopesCategoryData("all", CATEGORY_JSON)));
+}
+
+OverviewCategories::~OverviewCategories()
+{
+}
+
+void OverviewCategories::setSurfacingMode(bool surfacingMode)
+{
+    if (m_isSurfacing != surfacingMode) {
+        beginResetModel();
+        m_isSurfacing = surfacingMode;
+        endResetModel();
+    }
+}
+
+void OverviewCategories::setAllScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes)
+{
+    m_allScopes->setResults(scopes);
+
+    if (!m_isSurfacing) return;
+
+    QVector<int> roles;
+    roles.append(RoleCount);
+
+    QModelIndex changedIndex(index(1));
+    dataChanged(changedIndex, changedIndex, roles);
+}
+ 
+void OverviewCategories::setFavouriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes)
+{
+    m_favouriteScopes->setResults(scopes);
+
+    if (!m_isSurfacing) return;
+
+    QVector<int> roles;
+    roles.append(RoleCount);
+
+    QModelIndex changedIndex(index(0));
+    dataChanged(changedIndex, changedIndex, roles);
+}
+
+int OverviewCategories::rowCount(const QModelIndex& parent) const
+{
+    if (m_isSurfacing) {
+        return m_surfaceCategories.size();
+    } else {
+        return Categories::rowCount(parent);
+    }
+}
+
+QVariant
+OverviewCategories::data(const QModelIndex& index, int role) const
+{
+    if (!m_isSurfacing) {
+        return Categories::data(index, role);
+    }
+
+    ScopesCategoryData* catData = m_surfaceCategories.at(index.row()).data();
+    OverviewResultsModel* results = index.row() == 0 ? m_favouriteScopes.data() : m_allScopes.data();
+
+    switch (role) {
+        case RoleCategoryId:
+            return catData->categoryId;
+        case RoleName:
+            return QVariant();
+        case RoleIcon:
+            return QVariant();
+        case RoleRawRendererTemplate:
+            return catData->rawTemplate;
+        case RoleRenderer:
+            return catData->rendererVar;
+        case RoleComponents:
+            return catData->componentsVar;
+        case RoleHeaderLink:
+            return QVariant();
+        case RoleResults:
+            return QVariant::fromValue(results);
+        case RoleCount:
+            return QVariant(results->rowCount());
+        default:
+            return QVariant();
+    }
+}
+
+} // namespace scopes_ng

=== added file 'src/Unity/overviewcategories.h'
--- src/Unity/overviewcategories.h	1970-01-01 00:00:00 +0000
+++ src/Unity/overviewcategories.h	2014-07-31 13:04:48 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michal Hruby <[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 NG_OVERVIEW_CATEGORIES_H
+#define NG_OVERVIEW_CATEGORIES_H
+
+#include <unity/scopes/ScopeMetadata.h>
+
+#include "categories.h"
+
+namespace scopes_ng
+{
+
+class ScopesCategoryData;
+class OverviewResultsModel;
+
+class Q_DECL_EXPORT OverviewCategories : public scopes_ng::Categories
+{
+    Q_OBJECT
+
+public:
+    explicit OverviewCategories(QObject* parent = 0);
+    virtual ~OverviewCategories();
+
+    void setSurfacingMode(bool isSurfacing);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    void setAllScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes);
+    void setFavouriteScopes(const QList<unity::scopes::ScopeMetadata::SPtr>& scopes);
+
+private:
+    bool m_isSurfacing;
+
+    QList<QSharedPointer<ScopesCategoryData>> m_surfaceCategories;
+    QScopedPointer<OverviewResultsModel> m_allScopes;
+    QScopedPointer<OverviewResultsModel> m_favouriteScopes;
+};
+
+} // namespace scopes_ng
+
+Q_DECLARE_METATYPE(scopes_ng::OverviewCategories*)
+
+#endif // NG_OVERVIEW_CATEGORIES_H

=== added file 'src/Unity/overviewresults.cpp'
--- src/Unity/overviewresults.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/overviewresults.cpp	2014-07-31 13:04:48 +0000
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michal Hruby <[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 "overviewresults.h"
+
+// local
+#include "resultsmodel.h"
+#include "utils.h"
+
+#include <unity/scopes/Result.h>
+
+namespace scopes_ng {
+
+using namespace unity;
+
+class FakeResult: public scopes::Result
+{
+public:
+    FakeResult(scopes::ScopeMetadata const& metadata): Result(map_for_meta(metadata)) {}
+
+private:
+    // HACK: we need to create a fake result understood by the scopes scope, so it can create a proper preview
+    static scopes::VariantMap map_for_meta(scopes::ScopeMetadata const& metadata)
+    {
+        scopes::VariantMap map;
+        scopes::VariantMap internal;
+        scopes::VariantMap attrs;
+
+        internal["origin"] = "scopes";
+        map["internal"] = internal;
+
+        attrs["title"] = metadata.display_name();
+        try {
+            attrs["art"] = metadata.art();
+        } catch (...) {}
+        try {
+            attrs["icon"] = metadata.icon();
+        } catch (...) {}
+        attrs["description"] = metadata.description();
+        attrs["uri"] = scopes::CannedQuery(metadata.scope_id()).to_uri();
+        map["attrs"] = attrs;
+
+        return map;
+    }
+};
+
+OverviewResultsModel::OverviewResultsModel(QObject* parent)
+ : unity::shell::scopes::ResultsModelInterface(parent)
+{
+}
+
+void OverviewResultsModel::setResults(const QList<unity::scopes::ScopeMetadata::SPtr>& results)
+{
+    beginResetModel();
+    m_results = results;
+    endResetModel();
+}
+
+QString OverviewResultsModel::categoryId() const
+{
+    return QString();
+}
+
+void OverviewResultsModel::setCategoryId(const QString& id)
+{
+    Q_UNUSED(id);
+}
+
+int OverviewResultsModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+
+    return m_results.count();
+}
+
+int OverviewResultsModel::count() const
+{
+    return m_results.count();
+}
+
+int OverviewResultsModel::scopeIndex(const QString& scopeId) const
+{
+    std::string id(scopeId.toStdString());
+
+    for (int i = 0; i < m_results.size(); i++) {
+        if (m_results.at(i)->scope_id() == id) return i;
+    }
+
+    return -1;
+}
+
+QHash<int, QByteArray> OverviewResultsModel::roleNames() const
+{
+    QHash<int, QByteArray> roles(unity::shell::scopes::ResultsModelInterface::roleNames());
+    roles.insert(ExtraRoles::RoleScopeId, "scopeId");
+
+    return roles;
+}
+
+QVariant
+OverviewResultsModel::data(const QModelIndex& index, int role) const
+{
+    scopes::ScopeMetadata* metadata = m_results.at(index.row()).get();
+
+    switch (role) {
+        case RoleUri: {
+            scopes::CannedQuery q(metadata->scope_id());
+            return QString::fromStdString(q.to_uri());
+        }
+        case RoleCategoryId:
+            return QVariant();
+        case RoleDndUri:
+            return data(index, RoleUri);
+        case RoleResult: {
+            scopes::Result::SPtr result(new FakeResult(*metadata));
+            return QVariant::fromValue(result);
+        }
+        case RoleTitle:
+            return QString::fromStdString(metadata->display_name());
+        case RoleArt: {
+            std::string art;
+            try {
+                art = metadata->icon();
+            } catch (...) {
+                try {
+                    art = metadata->art();
+                } catch (...) {
+                    // no icon, oh well
+                }
+            }
+            return QString::fromStdString(art);
+        }
+        case RoleSubtitle:
+            return QVariant();
+        case RoleMascot:
+            return QVariant();
+        case RoleEmblem:
+            return QVariant();
+        case RoleAttributes:
+            return QVariant();
+        case RoleSummary:
+            return QVariant();
+        case RoleBackground:
+            return QVariant();
+        case RoleOverlayColor: {
+            try {
+                std::string color;
+                auto attrs = metadata->appearance_attributes();
+                auto it = attrs.find("logo-overlay-color");
+                if (it != attrs.end()) {
+                    color = it->second.get_string();
+                    return QString::fromStdString(color);
+                }
+            } catch (...) {
+                // silently ignore
+            }
+            return QVariant();
+        }
+        case RoleScopeId:
+            return QString::fromStdString(metadata->scope_id());
+        default:
+            return QVariant();
+    }
+}
+
+} // namespace scopes_ng

=== added file 'src/Unity/overviewresults.h'
--- src/Unity/overviewresults.h	1970-01-01 00:00:00 +0000
+++ src/Unity/overviewresults.h	2014-07-31 13:04:48 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michal Hruby <[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 NG_OVERVIEW_RESULTS_H
+#define NG_OVERVIEW_RESULTS_H
+
+#include <unity/shell/scopes/ResultsModelInterface.h>
+#include <unity/scopes/ScopeMetadata.h>
+
+#include <QHash>
+
+namespace scopes_ng {
+
+class Q_DECL_EXPORT OverviewResultsModel : public unity::shell::scopes::ResultsModelInterface
+{
+    Q_OBJECT
+
+public:
+    enum ExtraRoles {
+        RoleScopeId = unity::shell::scopes::ResultsModelInterface::Roles::RoleBackground + 100
+    };
+
+    explicit OverviewResultsModel(QObject* parent = 0);
+
+    void setResults(const QList<unity::scopes::ScopeMetadata::SPtr>& results);
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+    int count() const override;
+
+    QString categoryId() const override;
+    void setCategoryId(QString const& id) override;
+
+    QHash<int, QByteArray> roleNames() const override;
+
+    Q_INVOKABLE int scopeIndex(const QString& scopeId) const;
+
+private:
+    QList<unity::scopes::ScopeMetadata::SPtr> m_results;
+};
+
+} // namespace scopes_ng
+
+#endif // NG_OVERVIEW_RESULTS_H

=== added file 'src/Unity/overviewscope.cpp'
--- src/Unity/overviewscope.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/overviewscope.cpp	2014-07-31 13:04:48 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michal Hruby <[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 "overviewscope.h"
+
+// local
+#include "overviewcategories.h"
+#include "scopes.h"
+#include "utils.h"
+
+// Qt
+#include <QScopedPointer>
+
+namespace scopes_ng
+{
+
+using namespace unity;
+
+OverviewScope::OverviewScope(QObject *parent) : scopes_ng::Scope(parent)
+{
+    m_categories.reset(new OverviewCategories(this));
+
+    QObject::connect(m_scopesInstance.data(), &Scopes::metadataRefreshed, this, &OverviewScope::metadataChanged);
+}
+
+OverviewScope::~OverviewScope()
+{
+}
+
+struct ScopeInfo {
+    scopes::ScopeMetadata::SPtr data;
+    QString name;
+
+    ScopeInfo(scopes::ScopeMetadata::SPtr const& data_):
+        data(data_), name(QString::fromStdString(data->display_name())) {}
+};
+
+bool operator<(ScopeInfo const& first, ScopeInfo const& second)
+{
+    return first.name.compare(second.name, Qt::CaseInsensitive) < 0;
+}
+
+void OverviewScope::metadataChanged()
+{
+    OverviewCategories* categories = qobject_cast<OverviewCategories*>(m_categories.data());
+    if (!categories) {
+        qWarning("Unable to cast m_categories to OverviewCategories");
+        return;
+    }
+
+    QMap<QString, scopes::ScopeMetadata::SPtr> allMetadata = m_scopesInstance->getAllMetadata();
+    QList<scopes::ScopeMetadata::SPtr> favourites;
+    Q_FOREACH(QString id, m_scopesInstance->getFavoriteIds()) {
+        auto it = allMetadata.find(id);
+        if (it != allMetadata.end()) {
+            favourites.append(it.value());
+        }
+    }
+
+    QList<ScopeInfo> scopes;
+    Q_FOREACH(scopes::ScopeMetadata::SPtr const& metadata, allMetadata.values()) {
+        if (metadata->invisible()) continue;
+        scopes.append(ScopeInfo(metadata));
+    }
+    qSort(scopes.begin(), scopes.end());
+
+    QList<scopes::ScopeMetadata::SPtr> allScopes;
+    Q_FOREACH(ScopeInfo const& info, scopes) {
+        allScopes << info.data;
+    }
+
+    // FIXME: filter invisible scopes?
+    categories->setAllScopes(allScopes);
+    categories->setFavouriteScopes(favourites);
+}
+
+QString OverviewScope::id() const
+{
+    return QString("scopes");
+}
+
+bool OverviewScope::visible() const
+{
+    return false;
+}
+
+scopes::ScopeProxy OverviewScope::proxy_for_result(scopes::Result::SPtr const& result) const
+{
+    try {
+        return result->target_scope_proxy();
+    } catch (...) {
+        // our fake results don't have a proxy associated, return the default one
+        return proxy();
+    }
+}
+
+void OverviewScope::dispatchSearch()
+{
+    OverviewCategories* categories = qobject_cast<OverviewCategories*>(m_categories.data());
+    if (!categories) {
+        qWarning("Unable to cast m_categories to OverviewCategories");
+        return;
+    }
+
+    if (searchQuery().isEmpty()) {
+        setSearchInProgress(true);
+        invalidateLastSearch();
+        categories->setSurfacingMode(true);
+        setSearchInProgress(false);
+    } else {
+        categories->setSurfacingMode(false);
+        Scope::dispatchSearch();
+    }
+}
+
+} // namespace scopes_ng

=== added file 'src/Unity/overviewscope.h'
--- src/Unity/overviewscope.h	1970-01-01 00:00:00 +0000
+++ src/Unity/overviewscope.h	2014-07-31 13:04:48 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michal Hruby <[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 NG_OVERVIEW_SCOPE_H
+#define NG_OVERVIEW_SCOPE_H
+
+#include "scope.h"
+
+namespace scopes_ng
+{
+
+class Q_DECL_EXPORT OverviewScope : public scopes_ng::Scope
+{
+    Q_OBJECT
+
+public:
+    explicit OverviewScope(QObject *parent = 0);
+    virtual ~OverviewScope();
+
+    /* getters */
+    QString id() const override;
+    bool visible() const override;
+
+    void dispatchSearch() override;
+
+    unity::scopes::ScopeProxy proxy_for_result(unity::scopes::Result::SPtr const& result) const override;
+
+private Q_SLOTS:
+    void metadataChanged();
+};
+
+} // namespace scopes_ng
+
+Q_DECLARE_METATYPE(scopes_ng::OverviewScope*)
+
+#endif // NG_OVERVIEW_SCOPE_H

=== modified file 'src/Unity/previewstack.cpp'
--- src/Unity/previewstack.cpp	2014-05-19 09:58:14 +0000
+++ src/Unity/previewstack.cpp	2014-07-31 13:04:48 +0000
@@ -112,7 +112,7 @@
     // TODO: figure out if the result can produce a preview without sending a request to the scope
     // if (m_previewedResult->has_early_preview()) { ... }
     try {
-        auto proxy = m_previewedResult->target_scope_proxy();
+        auto proxy = m_associatedScope ? m_associatedScope->proxy_for_result(m_previewedResult) : m_previewedResult->target_scope_proxy();
 
         QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : "phone");
         scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
@@ -153,7 +153,8 @@
     }
 
     try {
-        auto proxy = m_previewedResult->target_scope_proxy();
+        auto proxy = m_associatedScope ? m_associatedScope->proxy_for_result(m_previewedResult) : m_previewedResult->target_scope_proxy();
+
         QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : "phone");
         scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
         metadata.set_scope_data(qVariantToScopeVariant(data));

=== modified file 'src/Unity/resultsmodel.cpp'
--- src/Unity/resultsmodel.cpp	2014-07-24 15:21:23 +0000
+++ src/Unity/resultsmodel.cpp	2014-07-31 13:04:48 +0000
@@ -167,6 +167,14 @@
     return attributes;
 }
 
+QHash<int, QByteArray> ResultsModel::roleNames() const
+{
+    QHash<int, QByteArray> roles(unity::shell::scopes::ResultsModelInterface::roleNames());
+    roles.insert(ExtraRoles::RoleScopeId, "scopeId");
+
+    return roles;
+}
+
 QVariant
 ResultsModel::data(const QModelIndex& index, int role) const
 {
@@ -217,6 +225,18 @@
             }
             return backgroundUriToVariant(backgroundVariant.toString());
         }
+        case RoleOverlayColor:
+            return componentValue(result, "overlay-color");
+        case RoleScopeId:
+            if (result->uri().compare(0, 8, "scope://") == 0) {
+                try {
+                    scopes::CannedQuery q(scopes::CannedQuery::from_uri(result->uri()));
+                    return QString::fromStdString(q.scope_id());
+                } catch (...) {
+                    // silently ignore and return "undefined"
+                }
+            }
+            return QVariant();
         default:
             return QVariant();
     }

=== modified file 'src/Unity/resultsmodel.h'
--- src/Unity/resultsmodel.h	2014-07-24 15:21:23 +0000
+++ src/Unity/resultsmodel.h	2014-07-31 13:04:48 +0000
@@ -35,6 +35,10 @@
     Q_OBJECT
 
 public:
+    enum ExtraRoles {
+        RoleScopeId = unity::shell::scopes::ResultsModelInterface::Roles::RoleBackground + 100
+    };
+
     explicit ResultsModel(QObject* parent = 0);
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
@@ -52,6 +56,8 @@
     void setComponentsMapping(QHash<QString, QString> const& mapping);
     void setMaxAtrributesCount(int count);
 
+    QHash<int, QByteArray> roleNames() const override;
+
 private:
     QVariant componentValue(unity::scopes::CategorisedResult const* result, std::string const& fieldName) const;
     QVariant attributesValue(unity::scopes::CategorisedResult const* result) const;

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-07-25 15:30:02 +0000
+++ src/Unity/scope.cpp	2014-07-31 13:04:48 +0000
@@ -74,7 +74,7 @@
     , m_searchController(new CollectionController)
     , m_activationController(new CollectionController)
 {
-    m_categories = new Categories(this);
+    m_categories.reset(new Categories(this));
 
     m_settings = QGSettings::isSchemaInstalled("com.canonical.Unity.Lenses") ? new QGSettings("com.canonical.Unity.Lenses", QByteArray(), this) : nullptr;
     QObject::connect(m_settings, &QGSettings::changed, this, &Scope::internetFlagChanged);
@@ -216,13 +216,20 @@
     QString scopeId(QString::fromStdString(query.scope_id()));
     QString searchString(QString::fromStdString(query.query_string()));
     QString departmentId(QString::fromStdString(query.department_id()));
-    // figure out if this scope is already favourited
-    Scope* scope = m_scopesInstance->getScopeById(scopeId);
+
+    Scope* scope = nullptr;
+    if (scopeId == id()) {
+        scope = this;
+    } else {
+        // figure out if this scope is already favourited
+        scope = m_scopesInstance->getScopeById(scopeId);
+    }
+
     if (scope != nullptr) {
         // TODO: change filters?
         scope->setCurrentDepartmentId(departmentId);
         scope->setSearchQuery(searchString);
-        Q_EMIT gotoScope(scopeId);
+        if (scope != this) Q_EMIT gotoScope(scopeId);
     } else {
         // create temp dash page
         auto meta_sptr = m_scopesInstance->getCachedMetadata(scopeId);
@@ -405,7 +412,7 @@
     Q_FOREACH(scopes::Category::SCPtr const& category, categories) {
         ResultsModel* category_model = m_categories->lookupCategory(category->id());
         if (category_model == nullptr) {
-            category_model = new ResultsModel(m_categories);
+            category_model = new ResultsModel(m_categories.data());
             category_model->setCategoryId(QString::fromStdString(category->id()));
             category_model->addResults(category_results[category->id()]);
             m_categories->registerCategory(category, category_model);
@@ -418,6 +425,16 @@
     }
 }
 
+scopes::ScopeProxy Scope::proxy() const
+{
+    return m_proxy;
+}
+
+scopes::ScopeProxy Scope::proxy_for_result(scopes::Result::SPtr const& result) const
+{
+    return result->target_scope_proxy();
+}
+
 void Scope::invalidateLastSearch()
 {
     m_searchController->invalidate();
@@ -608,7 +625,16 @@
 
 QString Scope::searchHint() const
 {
-    return QString::fromStdString(m_scopeMetadata ? m_scopeMetadata->search_hint() : "");
+    std::string search_hint;
+    try {
+        if (m_scopeMetadata) {
+            search_hint = m_scopeMetadata->search_hint();
+        }
+    } catch (...) {
+        // throws if the value isn't set, safe to ignore
+    }
+
+    return QString::fromStdString(search_hint);
 }
 
 bool Scope::searchInProgress() const
@@ -638,7 +664,7 @@
 
 unity::shell::scopes::CategoriesInterface* Scope::categories() const
 {
-    return m_categories;
+    return m_categories.data();
 }
 
 unity::shell::scopes::SettingsModelInterface* Scope::settings() const
@@ -813,7 +839,7 @@
             scopes::ActivationListenerBase::SPtr listener(new ActivationReceiver(this, result));
             m_activationController->setListener(listener);
 
-            auto proxy = result->target_scope_proxy();
+            auto proxy = proxy_for_result(result);
             unity::scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), m_formFactor.toStdString());
             scopes::QueryCtrlProxy controller = proxy->activate(*(result.get()), metadata, listener);
             m_activationController->setController(controller);

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2014-07-20 17:14:37 +0000
+++ src/Unity/scope.h	2014-07-31 13:04:48 +0000
@@ -148,6 +148,7 @@
     void activateUri(QString const& uri);
 
     bool resultsDirty() const;
+    virtual unity::scopes::ScopeProxy proxy_for_result(unity::scopes::Result::SPtr const& result) const;
 
 public Q_SLOTS:
     void invalidateResults();
@@ -161,17 +162,24 @@
     void internetFlagChanged(QString const& key);
     void departmentModelDestroyed(QObject* obj);
 
+protected:
+    void setSearchInProgress(bool searchInProgress);
+    void invalidateLastSearch();
+    virtual void dispatchSearch();
+
+    unity::scopes::ScopeProxy proxy() const;
+
+    QScopedPointer<Categories> m_categories;
+    QPointer<Scopes> m_scopesInstance;
+
 private:
     void setScopesInstance(Scopes*);
     void startTtlTimer();
-    void setSearchInProgress(bool searchInProgress);
     void setCurrentDepartmentId(QString const& id);
     void processSearchChunk(PushEvent* pushEvent);
     void executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation);
 
     void processResultSet(QList<std::shared_ptr<unity::scopes::CategorisedResult>>& result_set);
-    void dispatchSearch();
-    void invalidateLastSearch();
 
     static unity::scopes::Department::SCPtr findDepartmentById(unity::scopes::Department::SCPtr const& root, std::string const& id);
     static unity::scopes::Department::SCPtr findUpdateNode(DepartmentNode* node, unity::scopes::Department::SCPtr const& scopeNode);
@@ -195,7 +203,6 @@
     unity::scopes::Department::SCPtr m_rootDepartment;
     unity::scopes::Department::SCPtr m_lastRootDepartment;
     QGSettings* m_settings;
-    Categories* m_categories;
     QScopedPointer<SettingsModel> m_settingsModel;
     QSharedPointer<DepartmentNode> m_departmentTree;
     QTimer m_aggregatorTimer;
@@ -205,7 +212,6 @@
     QSet<unity::shell::scopes::ScopeInterface*> m_tempScopes;
     QMultiMap<QString, Department*> m_departmentModels;
     QMap<Department*, QString> m_inverseDepartments;
-    QPointer<Scopes> m_scopesInstance;
     QMetaObject::Connection m_metadataConnection;
     LocationService::Ptr m_locationService;
 };

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-07-24 13:17:30 +0000
+++ src/Unity/scopes.cpp	2014-07-31 13:04:48 +0000
@@ -22,6 +22,7 @@
 
 // Local
 #include "scope.h"
+#include "overviewscope.h"
 #include "ubuntulocationservice.h"
 
 // Qt
@@ -39,6 +40,8 @@
 
 using namespace unity;
 
+#define SCOPES_SCOPE_ID "scopes"
+
 void ScopeListWorker::run()
 {
     try
@@ -90,6 +93,7 @@
 
 Scopes::Scopes(QObject *parent)
     : unity::shell::scopes::ScopesInterface(parent)
+    , m_overviewScope(nullptr)
     , m_listThread(nullptr)
     , m_loaded(false)
     , m_priv(new Priv())
@@ -107,6 +111,7 @@
 
     QDBusConnection::sessionBus().connect(QString(), QString("/com/canonical/unity/scopes"), QString("com.canonical.unity.scopes"), QString("InvalidateResults"), this, SLOT(invalidateScopeResults(QString)));
 
+    m_overviewScope = new OverviewScope(this);
     m_locationService.reset(new UbuntuLocationService());
 }
 
@@ -147,7 +152,7 @@
             new core::ScopedConnection(
                     m_scopesRuntime->registry()->set_list_update_callback(
                             std::bind(&Scopes::Priv::safeInvalidateScopeResults,
-                                      m_priv.get(), "scopes"))));
+                                      m_priv.get(), SCOPES_SCOPE_ID))));
 
     // FIXME: use a dconf setting for this
     QByteArray enabledScopes = qgetenv("UNITY_SCOPES_LIST");
@@ -174,6 +179,16 @@
         }
     }
 
+    // HACK! deal with the overview scope
+    {
+        auto it = scopes.find(SCOPES_SCOPE_ID);
+        if (it != scopes.end()) {
+            m_overviewScope->setScopeData(it->second);
+        } else {
+            qWarning("Unable to add overview scope, can't find with ID: \"%s\"", SCOPES_SCOPE_ID);
+        }
+    }
+
     // cache all the metadata
     for (auto it = scopes.begin(); it != scopes.end(); ++it) {
         m_cachedMetadata[QString::fromStdString(it->first)] = std::make_shared<unity::scopes::ScopeMetadata>(it->second);
@@ -183,6 +198,7 @@
 
     m_loaded = true;
     Q_EMIT loadedChanged();
+    Q_EMIT overviewScopeChanged();
     Q_EMIT metadataRefreshed();
 
     m_listThread = nullptr;
@@ -266,6 +282,22 @@
     return nullptr;
 }
 
+QStringList Scopes::getFavoriteIds() const
+{
+    QStringList ids;
+
+    Q_FOREACH(Scope* scope, m_scopes) {
+        ids << scope->id();
+    }
+
+    return ids;
+}
+
+QMap<QString, unity::scopes::ScopeMetadata::SPtr> Scopes::getAllMetadata() const
+{
+    return m_cachedMetadata;
+}
+
 scopes::ScopeMetadata::SPtr Scopes::getCachedMetadata(QString const& scopeId) const
 {
     auto it = m_cachedMetadata.constFind(scopeId);
@@ -290,6 +322,11 @@
     }
 }
 
+unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const
+{
+    return m_loaded ? m_overviewScope : nullptr;
+}
+
 bool Scopes::loaded() const
 {
     return m_loaded;

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2014-07-16 15:32:25 +0000
+++ src/Unity/scopes.h	2014-07-31 13:04:48 +0000
@@ -27,6 +27,7 @@
 // Qt
 #include <QList>
 #include <QThread>
+#include <QStringList>
 #include <QSharedPointer>
 
 #include <unity/scopes/Runtime.h>
@@ -55,9 +56,13 @@
 
     Scope* getScopeById(QString const& scopeId) const;
     unity::scopes::ScopeMetadata::SPtr getCachedMetadata(QString const& scopeId) const;
+    QMap<QString, unity::scopes::ScopeMetadata::SPtr> getAllMetadata() const;
+    QStringList getFavoriteIds() const;
+
     void refreshScopeMetadata();
 
     bool loaded() const override;
+    unity::shell::scopes::ScopeInterface* overviewScope() const override;
 
     LocationService::Ptr locationService() const;
 
@@ -76,6 +81,7 @@
 
     QList<Scope*> m_scopes;
     QMap<QString, unity::scopes::ScopeMetadata::SPtr> m_cachedMetadata;
+    Scope* m_overviewScope;
     QThread* m_listThread;
     bool m_loaded;
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-07-25 15:30:02 +0000
+++ tests/CMakeLists.txt	2014-07-31 13:04:48 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=1)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.3)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1>=0.2 REQUIRED)
@@ -57,11 +57,12 @@
 
 run_tests(
     departmentstest
+    locationtest
+    overviewtest
+    previewtest
     resultstest
-    previewtest
-    locationtest
+    settingstest
     utilstest
-    settingstest
     )
 
 qt5_use_modules(settingstestExec Sql)

=== modified file 'tests/data/CMakeLists.txt'
--- tests/data/CMakeLists.txt	2014-06-02 14:36:07 +0000
+++ tests/data/CMakeLists.txt	2014-07-31 13:04:48 +0000
@@ -1,6 +1,7 @@
 add_subdirectory(mock-scope)
 add_subdirectory(mock-scope-departments)
 add_subdirectory(mock-scope-ttl)
+add_subdirectory(scopes)
 
 configure_file(Runtime.ini.in Runtime.ini @ONLY)
 configure_file(Registry.ini.in Registry.ini @ONLY)

=== modified file 'tests/data/mock-scope-ttl/mock-scope-ttl.ini.in'
--- tests/data/mock-scope-ttl/mock-scope-ttl.ini.in	2014-05-15 08:21:45 +0000
+++ tests/data/mock-scope-ttl/mock-scope-ttl.ini.in	2014-07-31 13:04:48 +0000
@@ -1,9 +1,6 @@
 [ScopeConfig]
 DisplayName = mock-ttl.DisplayName
 Description = mock-ttl.Description
-Art = /mock-ttl.Art
 Icon = /mock-ttl.Icon
-SearchHint = mock-ttl.SearchHint
-HotKey = mock-ttl.HotKey
 Author = mock-ttl.Author
 ResultsTtlType = Small

=== modified file 'tests/data/mock-scope/mock-scope.cpp'
--- tests/data/mock-scope/mock-scope.cpp	2014-07-24 15:21:23 +0000
+++ tests/data/mock-scope/mock-scope.cpp	2014-07-31 13:04:48 +0000
@@ -143,7 +143,7 @@
             CategorisedResult res(cat);
             res.set_uri("test:perform-query");
             res.set_title("result for: \"" + query_ + "\"");
-            res["scope-id"] = "mock-scope";
+            res["scope-id"] = "mock-scope-ttl";
             res.set_intercept_activation();
             reply->push(res);
         }
@@ -163,7 +163,7 @@
             CategoryRenderer minimal_rndr(R"({"schema-version": 1, "components": {"title": "title"}})");
             auto cat = reply->register_category("cat1", "Category 1", "", minimal_rndr);
             CategorisedResult res(cat);
-            res.set_uri("scope://mock-scope?q=next-scope-uri");
+            res.set_uri("scope://mock-scope?q=next-scope-query");
             res.set_title("result for: \"" + query_ + "\"");
             reply->push(res);
         }

=== added directory 'tests/data/scopes'
=== added file 'tests/data/scopes/CMakeLists.txt'
--- tests/data/scopes/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/data/scopes/CMakeLists.txt	2014-07-31 13:04:48 +0000
@@ -0,0 +1,8 @@
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.0)
+
+include_directories(${SCOPESLIB_INCLUDE_DIRS})
+
+add_library(scopes MODULE scopes.cpp)
+target_link_libraries(scopes ${SCOPESLIB_LDFLAGS})
+
+configure_file(scopes.ini.in scopes.ini)

=== added file 'tests/data/scopes/scopes.cpp'
--- tests/data/scopes/scopes.cpp	1970-01-01 00:00:00 +0000
+++ tests/data/scopes/scopes.cpp	2014-07-31 13:04:48 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2013 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/>.
+ *
+ * Authors:
+ *  Michal Hruby <[e-mail]>
+ */
+
+#include <unity-scopes.h>
+
+#include <iostream>
+
+#define EXPORT __attribute__ ((visibility ("default")))
+
+using namespace std;
+using namespace unity::scopes;
+
+// Example scope A: replies synchronously to a query. (Replies are returned before returning from the run() method.)
+
+class MyQuery : public SearchQueryBase
+{
+public:
+    MyQuery(CannedQuery const& query, SearchMetadata const& metadata) :
+        SearchQueryBase(query, metadata),
+        query_(query.query_string())
+    {
+    }
+
+    ~MyQuery() noexcept
+    {
+    }
+
+    virtual void cancelled() override
+    {
+    }
+
+    virtual void run(SearchReplyProxy const& reply) override
+    {
+        CategoryRenderer minimal_rndr(R"({"schema-version": 1, "components": {"title": "title"}})");
+        auto cat = reply->register_category("cat1", "Category 1", "", minimal_rndr);
+        CategorisedResult res(cat);
+        res.set_uri("test:uri");
+        res.set_title("result for: \"" + query_ + "\"");
+        res.set_art("art");
+        res.set_dnd_uri("test:dnd_uri");
+        reply->push(res);
+    }
+
+private:
+    string query_;
+};
+
+class MyPreview : public PreviewQueryBase
+{
+public:
+    MyPreview(Result const& result, ActionMetadata const& metadata) :
+        PreviewQueryBase(result, metadata),
+        scope_data_(metadata.scope_data())
+    {
+    }
+
+    ~MyPreview() noexcept
+    {
+    }
+
+    virtual void cancelled() override
+    {
+    }
+
+    virtual void run(PreviewReplyProxy const& reply) override
+    {
+        PreviewWidgetList widgets;
+        PreviewWidget w1(R"({"id": "hdr", "type": "header", "components": {"title": "title", "subtitle": "uri"}})");
+        PreviewWidget w2(R"({"id": "img", "type": "image", "components": {"source": "art"}, "zoomable": false})");
+        widgets.push_back(w1);
+        widgets.push_back(w2);
+        reply->push(widgets);
+    }
+
+private:
+    Variant scope_data_;
+};
+
+class MyScope : public ScopeBase
+{
+public:
+    virtual SearchQueryBase::UPtr search(CannedQuery const& q, SearchMetadata const& metadata) override
+    {
+        SearchQueryBase::UPtr query(new MyQuery(q, metadata));
+        cout << "scope-A: created query: \"" << q.query_string() << "\"" << endl;
+        return query;
+    }
+
+    virtual PreviewQueryBase::UPtr preview(Result const& result, ActionMetadata const& metadata) override
+    {
+        PreviewQueryBase::UPtr query(new MyPreview(result, metadata));
+        cout << "scope-A: created preview query: \"" << result.uri() << "\"" << endl;
+        return query;
+    }
+};
+
+extern "C"
+{
+
+    EXPORT
+    unity::scopes::ScopeBase*
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_CREATE_FUNCTION()
+    {
+        return new MyScope;
+    }
+
+    EXPORT
+    void
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
+    {
+        delete scope_base;
+    }
+
+}

=== added file 'tests/data/scopes/scopes.ini.in'
--- tests/data/scopes/scopes.ini.in	1970-01-01 00:00:00 +0000
+++ tests/data/scopes/scopes.ini.in	2014-07-31 13:04:48 +0000
@@ -0,0 +1,8 @@
+[ScopeConfig]
+DisplayName = mock.scopes.DisplayName
+Description = mock.scopes.Description
+Art = /mock.Art
+Icon = /mock.Icon
+SearchHint = mock.SearchHint
+HotKey = mock.HotKey
+Author = mock.Author

=== added file 'tests/overviewtest.cpp'
--- tests/overviewtest.cpp	1970-01-01 00:00:00 +0000
+++ tests/overviewtest.cpp	2014-07-31 13:04:48 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2013-2014 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/>.
+ *
+ * Authors:
+ *  Michal Hruby <[e-mail]>
+ */
+
+#include <QObject>
+#include <QTest>
+#include <QJsonValue>
+#include <QJsonObject>
+#include <QThread>
+#include <QScopedPointer>
+#include <QSignalSpy>
+#include <QVariantList>
+
+#include <scopes.h>
+#include <scope.h>
+#include <categories.h>
+#include <overviewresults.h>
+#include <previewmodel.h>
+#include <previewstack.h>
+#include <previewwidgetmodel.h>
+
+#include "registry-spawner.h"
+#include "test-utils.h"
+
+using namespace scopes_ng;
+
+class OverviewTest : public QObject
+{
+    Q_OBJECT
+private:
+    QScopedPointer<Scopes> m_scopes;
+    Scope* m_scope;
+    QScopedPointer<RegistrySpawner> m_registry;
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        m_registry.reset(new RegistrySpawner);
+    }
+
+    void cleanupTestCase()
+    {
+        m_registry.reset();
+    }
+
+    void init()
+    {
+        m_scopes.reset(new Scopes(nullptr));
+        // no scopes on startup
+        QCOMPARE(m_scopes->rowCount(), 0);
+        QCOMPARE(m_scopes->loaded(), false);
+        QSignalSpy spy(m_scopes.data(), SIGNAL(loadedChanged()));
+        // wait till the registry spawns
+        QVERIFY(spy.wait());
+        QCOMPARE(m_scopes->loaded(), true);
+
+        // get scope proxy
+        m_scope = qobject_cast<scopes_ng::Scope*>(m_scopes->overviewScope());
+        QVERIFY(m_scope != nullptr);
+        m_scope->setActive(true);
+    }
+
+    void cleanup()
+    {
+        m_scopes.reset();
+        m_scope = nullptr;
+    }
+
+    void testScopeProperties()
+    {
+        QCOMPARE(m_scope->id(), QString("scopes"));
+        QCOMPARE(m_scope->name(), QString("mock.scopes.DisplayName"));
+        QCOMPARE(m_scope->iconHint(), QString("/mock.Icon"));
+        QCOMPARE(m_scope->description(), QString("mock.scopes.Description"));
+        QCOMPARE(m_scope->searchHint(), QString("mock.SearchHint"));
+        QCOMPARE(m_scope->shortcut(), QString("mock.HotKey"));
+        QCOMPARE(m_scope->searchQuery(), QString());
+
+        QCOMPARE(m_scope->isActive(), true);
+        m_scope->setActive(false);
+        QCOMPARE(m_scope->isActive(), false);
+    }
+
+    void testSurfacingQuery()
+    {
+        performSearch(m_scope, QString(""));
+
+        // ensure categories have > 0 rows
+        auto categories = m_scope->categories();
+        QVERIFY(categories->rowCount() > 0);
+        QCOMPARE(categories->data(categories->index(0), Categories::Roles::RoleCategoryId), QVariant(QString("favorites")));
+        QCOMPARE(categories->data(categories->index(1), Categories::Roles::RoleCategoryId), QVariant(QString("all")));
+
+        QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
+        QVERIFY(results_var.canConvert<OverviewResultsModel*>());
+        OverviewResultsModel* results = results_var.value<OverviewResultsModel*>();
+        QVERIFY(results->rowCount() > 0);
+    }
+
+    void testPreview()
+    {
+        performSearch(m_scope, QString(""));
+
+        // get a result from the model
+        auto categories = m_scope->categories();
+        QVERIFY(categories->rowCount() > 0);
+        QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
+        QVERIFY(results_var.canConvert<OverviewResultsModel*>());
+        OverviewResultsModel* results = results_var.value<OverviewResultsModel*>();
+        auto result_var = results->data(results->index(0), ResultsModel::RoleResult);
+        QCOMPARE(result_var.isNull(), false);
+        auto result = result_var.value<std::shared_ptr<unity::scopes::Result>>();
+        QVERIFY(result != nullptr);
+
+        // and try to preview it
+        QScopedPointer<PreviewStack> preview_stack(static_cast<PreviewStack*>(m_scope->preview(QVariant::fromValue(result))));
+        QCOMPARE(preview_stack->rowCount(), 1);
+        QCOMPARE(preview_stack->widgetColumnCount(), 1);
+        auto preview_var = preview_stack->data(preview_stack->index(0), PreviewStack::RolePreviewModel);
+        auto preview_model = preview_stack->getPreviewModel(0);
+        QCOMPARE(preview_model, preview_var.value<scopes_ng::PreviewModel*>());
+        QCOMPARE(preview_model->widgetColumnCount(), 1);
+        QTRY_COMPARE(preview_model->loaded(), true);
+
+        auto preview_widgets = preview_model->data(preview_model->index(0), PreviewModel::RoleColumnModel).value<scopes_ng::PreviewWidgetModel*>();
+        QVERIFY(!preview_widgets->roleNames().isEmpty());
+        QCOMPARE(preview_widgets->rowCount(), 2);
+    }
+
+};
+
+QTEST_GUILESS_MAIN(OverviewTest)
+#include <overviewtest.moc>

=== modified file 'tests/previewtest.cpp'
--- tests/previewtest.cpp	2014-07-18 16:35:52 +0000
+++ tests/previewtest.cpp	2014-07-31 13:04:48 +0000
@@ -66,8 +66,8 @@
         // wait till the registry spawns
         QVERIFY(spy.wait());
         QCOMPARE(m_scopes->loaded(), true);
-        // should have one scope now
-        QCOMPARE(m_scopes->rowCount(), 3);
+        // should have at least one scope now
+        QCOMPARE(m_scopes->rowCount(), 4);
 
         QVariant scope_var = m_scopes->data(m_scopes->index(0), Scopes::Roles::RoleScope);
         QVERIFY(scope_var.canConvert<Scope*>());

=== modified file 'tests/resultstest.cpp'
--- tests/resultstest.cpp	2014-07-18 16:35:52 +0000
+++ tests/resultstest.cpp	2014-07-31 13:04:48 +0000
@@ -111,8 +111,8 @@
         // wait till the registry spawns
         QVERIFY(spy.wait());
         QCOMPARE(m_scopes->loaded(), true);
-        // should have one scope now
-        QCOMPARE(m_scopes->rowCount(), 3);
+        // should have at least one scope now
+        QCOMPARE(m_scopes->rowCount(), 4);
 
         // get scope proxy
         m_scope = qobject_cast<scopes_ng::Scope*>(m_scopes->getScope(QString("mock-scope")));
@@ -192,6 +192,15 @@
         QCOMPARE(m_scope->isActive(), true);
         m_scope->setActive(false);
         QCOMPARE(m_scope->isActive(), false);
+
+        QCOMPARE(m_scope_ttl->id(), QString("mock-scope-ttl"));
+        QCOMPARE(m_scope_ttl->name(), QString("mock-ttl.DisplayName"));
+        QCOMPARE(m_scope_ttl->iconHint(), QString("/mock-ttl.Icon"));
+        QCOMPARE(m_scope_ttl->description(), QString("mock-ttl.Description"));
+        QCOMPARE(m_scope_ttl->searchHint(), QString());
+        QCOMPARE(m_scope_ttl->shortcut(), QString());
+        QCOMPARE(m_scope_ttl->visible(), true);
+        QCOMPARE(m_scope_ttl->searchQuery(), QString());
     }
 
     void testCategoryQuery()
@@ -649,13 +658,14 @@
         unity::scopes::Result::SPtr result;
         QVERIFY(getFirstResult(m_scope, result));
 
-        QSignalSpy spy(m_scope, SIGNAL(gotoScope(QString)));
+        QSignalSpy spy(m_scope, SIGNAL(searchQueryChanged()));
         m_scope->activate(QVariant::fromValue(result));
         // this is likely to be invoked synchronously
         if (spy.count() == 0) {
             QVERIFY(spy.wait());
         }
         QVERIFY(spy.count() > 0);
+        QCOMPARE(m_scope->searchQuery(), QString("next-scope-query"));
     }
 
 };

=== modified file 'tests/test-utils.h'
--- tests/test-utils.h	2014-05-22 08:03:59 +0000
+++ tests/test-utils.h	2014-07-31 13:04:48 +0000
@@ -64,12 +64,14 @@
 void performSearch(Scope* scope, QString const& searchString)
 {
     QCOMPARE(scope->searchInProgress(), false);
+    QSignalSpy spy(scope, SIGNAL(searchInProgressChanged()));
     // perform a search
     scope->setSearchQuery(searchString);
-    QCOMPARE(scope->searchInProgress(), true);
-    // wait for the search to finish
-    QSignalSpy spy(scope, SIGNAL(searchInProgressChanged()));
-    QVERIFY(spy.wait());
+    QVERIFY(scope->searchInProgress() || spy.count() > 1);
+    if (scope->searchInProgress()) {
+        // wait for the search to finish
+        QVERIFY(spy.wait());
+    }
     QCOMPARE(scope->searchInProgress(), false);
 }