Merge lp:~stolowski/unity-scopes-shell/single-preview into lp:unity-scopes-shell

[Paweł Stołowski]

Removed preview stack. Return single preview model from Scope.

Removed preview stack. Return single preview model from Scope.

The corresponding unity api change: https://code.launchpad.net/~stolowski/unity-api/single-preview/+merge/286359

[lp:~stolowski/unity-scopes-shell/single-preview]

289. By Paweł Stołowski on 2016-02-17

Merged trunk

290. By Paweł Stołowski on 2016-02-17

Require new API

291. By Paweł Stołowski on 2016-02-18

Updated scope harness symbols file

[Albert Astals Cid (aacid)]

bring back the top warning to debian/control ?

review: Needs Fixing

[Albert Astals Cid (aacid)]

Looks good otherwise

[lp:~stolowski/unity-scopes-shell/single-preview]

292. By Paweł Stołowski on 2016-02-18

Reverted accidental change to generated debian/control file

[Paweł Stołowski (stolowski)]

> bring back the top warning to debian/control ?

Ah, right, this file is generated, I shouldn't have commited it. Fixed, thanks for spotting.

[lp:~stolowski/unity-scopes-shell/single-preview]

293. By Paweł Stołowski on 2016-02-18

Merged activation-progress

294. By Paweł Stołowski on 2016-02-26

Debug message when preview model gets destroyed

Unmerged revisions

285. By Launchpad Translations on behalf of unity-team on 2016-02-10

Launchpad automatic translations update.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-30 09:23:32 +0000
+++ CMakeLists.txt	2016-02-18 15:46:36 +0000
@@ -51,7 +51,7 @@
 find_package(Boost COMPONENTS regex REQUIRED)
 
 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=1.0.1)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=9)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
 
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)

=== modified file 'debian/HARNESS_VERSION'
--- debian/HARNESS_VERSION	2015-09-17 10:10:40 +0000
+++ debian/HARNESS_VERSION	2016-02-18 15:46:36 +0000
@@ -1,1 +1,1 @@
-1.1.0
+2.1.0

=== modified file 'debian/control.in'
--- debian/control.in	2015-12-15 15:22:10 +0000
+++ debian/control.in	2016-02-18 15:46:36 +0000
@@ -8,7 +8,7 @@
                dh-python,
                libboost-python-dev,
                libboost-regex-dev,
-               libunity-api-dev (>= 7.105),
+               libunity-api-dev (>= 7.107),
                libunity-scopes-dev (>= 1.0.1~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
@@ -50,6 +50,7 @@
           unity-scopes-impl-7,
           unity-scopes-impl-8,
           unity-scopes-impl-9,
+          unity-scopes-impl-10,
 Breaks: unity8-private (<< 7.84),
         unity8 (<< 8.11)
 Replaces: unity8-private (<< 7.84)

=== modified file 'debian/libscope-harness.symbols.in'
--- debian/libscope-harness.symbols.in	2015-11-11 09:31:48 +0000
+++ debian/libscope-harness.symbols.in	2016-02-18 15:46:36 +0000
@@ -1,4 +1,5 @@
 libscope-harness.so.@HARNESS_SO_VERSION@ libscope-harness@HARNESS_SO_VERSION@ #MINVER#
+ (c++)"unity::scopeharness::view::PreviewView::preview(std::shared_ptr<unity::shell::scopes::PreviewModelInterface>)@Base" 0replaceme
  (c++)"typeinfo for unity::scopeharness::registry::CustomRegistry@Base" 0.5.4+15.04.20150311.3
  (c++)"typeinfo for unity::scopeharness::registry::PreExistingRegistry@Base" 0.5.4+15.04.20150311.3
  (c++)"typeinfo for unity::scopeharness::registry::Registry@Base" 0.5.4+15.04.20150311.3
@@ -264,7 +265,6 @@
  (c++)"unity::scopeharness::TestUtils::getFavoriteScopes()@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::getFirstResult(unity::shell::scopes::CategoriesInterface*, std::shared_ptr<unity::scopes::Result>&)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::performSearch(QSharedPointer<unity::shell::scopes::ScopeInterface>, QString const&)@Base" 0.5.4+15.04.20150311.3
- (c++)"unity::scopeharness::TestUtils::previewForFirstResult(QSharedPointer<scopes_ng::Scope>, QString const&, QScopedPointer<scopes_ng::PreviewStack, QScopedPointerDeleter<scopes_ng::PreviewStack> >&)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::refreshSearch(QSharedPointer<scopes_ng::Scope>)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::setFavouriteScopes(QStringList const&)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::throwIf(bool, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
@@ -273,7 +273,6 @@
  (c++)"unity::scopeharness::TestUtils::waitForSearchFinish(QSharedPointer<unity::shell::scopes::ScopeInterface>)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::AbstractView::~AbstractView()@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::PreviewView::columnCount() const@Base" 0.5.4+15.04.20150311.3
- (c++)"unity::scopeharness::view::PreviewView::preview(std::shared_ptr<unity::shell::scopes::PreviewStackInterface>)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::PreviewView::~PreviewView()@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::PreviewView::PreviewView()@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::PreviewView::refresh()@Base" 0.5.4+15.04.20150311.3

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2015-10-21 10:47:17 +0000
+++ po/POTFILES.in	2016-02-18 15:46:36 +0000
@@ -14,6 +14,7 @@
 tests/data/mock-scope-departments-flipflop/mock-scope-departments-flipflop.cpp
 tests/data/mock-scope/mock-scope.cpp
 tests/data/mock-scope-double-nav/mock-scope-double-nav.cpp
+tests/data/mock-scope-manyresults/mock-scope-manyresults.cpp
 tests/settingstest.cpp
 src/scope-harness/registry/system-registry.cpp
 src/scope-harness/registry/pre-existing-registry.cpp
@@ -72,11 +73,11 @@
 src/Unity/scopes.cpp
 src/Unity/settingsmodel.cpp
 src/Unity/utils.cpp
+src/Unity/resultsmap.cpp
 src/Unity/locationservice.cpp
 src/Unity/ubuntulocationservice.cpp
 src/Unity/iconutils.cpp
 src/Unity/department.cpp
-src/Unity/previewstack.cpp
 src/Unity/categories.cpp
 src/Unity/overviewresults.cpp
 src/Unity/resultsmodel.cpp
@@ -125,7 +126,6 @@
 src/Unity/plugin.h
 src/Unity/department.h
 src/Unity/scope.h
-src/Unity/previewstack.h
 src/Unity/logintoaccount.h
 src/Unity/overviewcategories.h
 src/Unity/locationservice.h
@@ -133,6 +133,7 @@
 src/Unity/settingsmodel.h
 src/Unity/resultsmodel.h
 src/Unity/geoip.h
+src/Unity/resultsmap.h
 src/Unity/collectors.h
 src/Unity/previewwidgetmodel.h
 src/Unity/categories.h

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2015-10-21 10:47:17 +0000
+++ src/Unity/CMakeLists.txt	2016-02-18 15:46:36 +0000
@@ -27,7 +27,6 @@
     overviewresults.cpp
     overviewscope.cpp
     previewmodel.cpp
-    previewstack.cpp
     previewwidgetmodel.cpp
     resultsmap.cpp
     resultsmodel.cpp
@@ -43,7 +42,6 @@
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/NavigationInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h
-    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewStackInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewWidgetModelInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ResultsModelInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopeInterface.h

=== modified file 'src/Unity/collectors.h'
--- src/Unity/collectors.h	2015-10-05 12:29:55 +0000
+++ src/Unity/collectors.h	2016-02-18 15:46:36 +0000
@@ -71,7 +71,7 @@
 public:
     static const QEvent::Type eventType;
 
-    enum Type { SEARCH, PREVIEW, ACTIVATION };
+    enum Type { SEARCH = QEvent::User, PREVIEW, ACTIVATION };
 
     PushEvent(Type event_type, const std::shared_ptr<CollectorBase>& collector);
     Type type();

=== modified file 'src/Unity/plugin.cpp'
--- src/Unity/plugin.cpp	2015-10-28 08:41:55 +0000
+++ src/Unity/plugin.cpp	2016-02-18 15:46:36 +0000
@@ -29,7 +29,6 @@
 #include "categories.h"
 #include "department.h"
 #include "resultsmodel.h"
-#include "previewstack.h"
 #include "previewmodel.h"
 #include "previewwidgetmodel.h"
 #include "settingsmodel.h"
@@ -48,9 +47,8 @@
     qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", QStringLiteral("Can't create Categories object in QML. Get them from Scope instance."));
     qmlRegisterUncreatableType<unity::shell::scopes::SettingsModelInterface>(uri, 0, 2, "Settings", QStringLiteral("Can't create Settings object in QML. Get them from Scope instance."));
     qmlRegisterUncreatableType<scopes_ng::ResultsModel>(uri, 0, 2, "ResultsModel", QStringLiteral("Can't create new ResultsModel in QML. Get them from Categories instance."));
-    qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", QStringLiteral("Can't create new PreviewModel in QML. Get them from PreviewStack instance."));
+    qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", QStringLiteral("Can't create new PreviewModel in QML. Get them from Scope instance."));
     qmlRegisterUncreatableType<scopes_ng::PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", QStringLiteral("Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance."));
-    qmlRegisterUncreatableType<unity::shell::scopes::PreviewStackInterface>(uri, 0, 2, "PreviewStack", QStringLiteral("Can't create new PreviewStack in QML. Get them from Scope instance."));
 }
 
 void UnityPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/Unity/previewmodel.cpp'
--- src/Unity/previewmodel.cpp	2015-09-28 08:41:08 +0000
+++ src/Unity/previewmodel.cpp	2016-02-18 15:46:36 +0000
@@ -27,12 +27,16 @@
 #include "previewwidgetmodel.h"
 #include "resultsmodel.h"
 #include "utils.h"
+#include "logintoaccount.h"
 
 // Qt
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 
+#include <unity/scopes/Scope.h>
+#include <unity/scopes/ActionMetadata.h>
+
 namespace scopes_ng
 {
 
@@ -45,11 +49,24 @@
     m_delayedClear(false),
     m_widgetColumnCount(1)
 {
+    connect(this, &PreviewModel::triggered, this, &PreviewModel::widgetTriggered);
+
     // we have one column by default
     PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
     m_previewWidgetModels.append(columnModel);
 }
 
+PreviewModel::~PreviewModel()
+{
+    if (m_listener) {
+        m_listener->invalidate();
+    }
+
+    if (m_lastActivation) {
+        m_lastActivation->invalidate();
+    }
+}
+
 void PreviewModel::setResult(std::shared_ptr<scopes::Result> const& result)
 {
     m_previewedResult = result;
@@ -64,6 +81,9 @@
             case PushEvent::PREVIEW:
                 processPreviewChunk(pushEvent);
                 return true;
+            case PushEvent::ACTIVATION:
+                processActionResponse(pushEvent);
+                return true;
             default:
                 qWarning("PreviewModel: Unhandled PushEvent type");
                 break;
@@ -73,6 +93,18 @@
     return unity::shell::scopes::PreviewModelInterface::event(ev);
 }
 
+void PreviewModel::setAssociatedScope(scopes_ng::Scope* scope, QUuid const& session_id, QString const& userAgent)
+{
+    m_associatedScope = scope;
+    m_session_id = session_id;
+    m_userAgent = userAgent;
+}
+
+scopes_ng::Scope* PreviewModel::associatedScope() const
+{
+    return m_associatedScope;
+}
+
 void PreviewModel::processPreviewChunk(PushEvent* pushEvent)
 {
     CollectorBase::Status status;
@@ -178,6 +210,26 @@
     return m_loaded;
 }
 
+void PreviewModel::loadForResult(scopes::Result::SPtr const& result)
+{
+    m_previewedResult = result;
+    if (m_listener) {
+        m_listener->invalidate(); // TODO: is this needed?
+    }
+
+    dispatchPreview();
+}
+
+unity::scopes::Result::SPtr PreviewModel::previewedResult() const
+{
+    return m_previewedResult;
+}
+
+void PreviewModel::update(unity::scopes::PreviewWidgetList const& widgets)
+{
+    updateWidgetDefinitions(widgets);
+}
+
 bool PreviewModel::processingAction() const
 {
     return m_processingAction;
@@ -439,4 +491,151 @@
     }
 }
 
+void PreviewModel::dispatchPreview(scopes::Variant const& extra_data)
+{
+    // 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_associatedScope ? m_associatedScope->proxy_for_result(m_previewedResult) : m_previewedResult->target_scope_proxy();
+
+        QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : QStringLiteral("phone"));
+        scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
+        if (!extra_data.is_null()) {
+            metadata.set_scope_data(extra_data);
+        }
+        if (!m_session_id.isNull()) {
+            metadata["session-id"] = uuidToString(m_session_id).toStdString();
+        }
+        if (!m_userAgent.isEmpty()) {
+            metadata["user-agent"] = m_userAgent.toStdString();
+        }
+
+        std::shared_ptr<PreviewDataReceiver> listener(new PreviewDataReceiver(this));
+        // invalidate previous listener (if any); TODO: is this needed?
+        if (m_listener) {
+            m_listener->invalidate();
+        }
+        m_listener = listener;
+
+        m_lastPreviewQuery = proxy->preview(*(m_previewedResult.get()), metadata, listener);
+    } catch (std::exception& e) {
+        qWarning("Caught an error from preview(): %s", e.what());
+    } catch (...) {
+        qWarning("Caught an error from preview()");
+    }
+}
+
+void PreviewModel::widgetTriggered(QString const& widgetId, QString const& actionId, QVariantMap const& data)
+{
+    auto action = [this, widgetId, actionId, data]() {
+        try {
+            auto proxy = m_associatedScope ? m_associatedScope->proxy_for_result(m_previewedResult) : m_previewedResult->target_scope_proxy();
+
+            QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : QStringLiteral("phone"));
+            scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
+            metadata.set_scope_data(qVariantToScopeVariant(data));
+
+            if (m_lastActivation) {
+                m_lastActivation->invalidate();
+            }
+            std::shared_ptr<ActivationReceiver> listener(new ActivationReceiver(this, m_previewedResult));
+            m_lastActivation = listener;
+
+            setProcessingAction(true);
+
+            // FIXME: don't block
+            proxy->perform_action(*(m_previewedResult.get()), metadata, widgetId.toStdString(), actionId.toStdString(), listener);
+        } catch (std::exception& e) {
+            qWarning("Caught an error from perform_action(%s, %s): %s", widgetId.toStdString().c_str(), actionId.toStdString().c_str(), e.what());
+        } catch (...) {
+            qWarning("Caught an error from perform_action()");
+        }
+    };
+
+    PreviewWidgetData* widgetData = getWidgetData(widgetId);
+    if (widgetData != nullptr) {
+        QString wtype = widgetData->type;
+        auto uriAction = [this, wtype, data, action]() {
+            if ((wtype == QLatin1String("actions") || wtype == QLatin1String("icon-actions")) && data.contains(QStringLiteral("uri"))) {
+                if (m_associatedScope) {
+                    m_associatedScope->activateUri(data.value(QStringLiteral("uri")).toString());
+                    return;
+                }
+            }
+            action();
+        };
+
+        if (m_associatedScope && widgetData->data.contains(QStringLiteral("online_account_details")))
+        {
+            QVariantMap details = widgetData->data.value(QStringLiteral("online_account_details")).toMap();
+            if (details.contains(QStringLiteral("service_name")) &&
+                details.contains(QStringLiteral("service_type")) &&
+                details.contains(QStringLiteral("provider_name")) &&
+                details.contains(QStringLiteral("login_passed_action")) &&
+                details.contains(QStringLiteral("login_failed_action")))
+            {
+                LoginToAccount *login = new LoginToAccount(details.contains(QStringLiteral("scope_id")) ? details.value(QStringLiteral("scope_id")).toString() : QLatin1String(""),
+                                                            details.value(QStringLiteral("service_name")).toString(),
+                                                            details.value(QStringLiteral("service_type")).toString(),
+                                                            details.value(QStringLiteral("provider_name")).toString(),
+                                                            details.value(QStringLiteral("login_passed_action")).toInt(),
+                                                            details.value(QStringLiteral("login_failed_action")).toInt(),
+                                                            this);
+                connect(login, SIGNAL(searchInProgress(bool)), m_associatedScope, SLOT(setSearchInProgress(bool)));
+                connect(login, &LoginToAccount::finished, [this, login, uriAction](bool, int action_code_index) {
+                    if (action_code_index >= 0 && action_code_index <= scopes::OnlineAccountClient::LastActionCode_)
+                    {
+                        scopes::OnlineAccountClient::PostLoginAction action_code = static_cast<scopes::OnlineAccountClient::PostLoginAction>(action_code_index);
+                        switch (action_code)
+                        {
+                            case scopes::OnlineAccountClient::DoNothing:
+                                return;
+                            case scopes::OnlineAccountClient::InvalidateResults:
+                                m_associatedScope->invalidateResults();
+                                return;
+                            default:
+                                break;
+                        }
+                    }
+                    uriAction();
+                    login->deleteLater();
+                });
+                login->loginToAccount();
+                return; // main execution ends here
+            }
+        } else {
+            uriAction();
+        }
+    } else {
+        qWarning("Action triggered for unknown widget \"%s\"", widgetId.toStdString().c_str());
+    }
+}
+
+void PreviewModel::processActionResponse(PushEvent* pushEvent)
+{
+    std::shared_ptr<scopes::ActivationResponse> response;
+    scopes::Result::SPtr result;
+    QString categoryId;
+    pushEvent->collectActivationResponse(response, result, categoryId);
+    if (!response) return;
+
+    switch (response->status()) {
+        case scopes::ActivationResponse::ShowPreview:
+            // replace current preview
+            setDelayedClear();
+            // the preview is marked as processing action, leave the flag on until the preview is updated
+            dispatchPreview(scopes::Variant(response->scope_data()));
+            break;
+        // TODO: case to nest preview (once such API is available)
+        default:
+            if (m_associatedScope) {
+                m_associatedScope->handleActivation(response, result);
+            }
+
+            setProcessingAction(false);
+            break;
+    }
+}
+
+
 } // namespace scopes_ng

=== modified file 'src/Unity/previewmodel.h'
--- src/Unity/previewmodel.h	2015-08-14 12:29:16 +0000
+++ src/Unity/previewmodel.h	2016-02-18 15:46:36 +0000
@@ -29,11 +29,14 @@
 #include <QMultiMap>
 #include <QStringList>
 #include <QPointer>
+#include <QUuid>
 
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/Result.h>
 #include <unity/scopes/ColumnLayout.h>
 
+#include "collectors.h"
+
 namespace scopes_ng
 {
 
@@ -60,6 +63,7 @@
 
 public:
     explicit PreviewModel(QObject* parent = 0);
+    ~PreviewModel();
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
@@ -80,7 +84,18 @@
 
     void updateWidgetDefinitions(unity::scopes::PreviewWidgetList const&);
 
+    void loadForResult(unity::scopes::Result::SPtr const&);
+    void update(unity::scopes::PreviewWidgetList const&);
+
+    void setAssociatedScope(scopes_ng::Scope*, QUuid const&, QString const&);
+    scopes_ng::Scope* associatedScope() const;
+    unity::scopes::Result::SPtr previewedResult() const;
+
+private Q_SLOTS:
+    void widgetTriggered(QString const&, QString const&, QVariantMap const&);
+
 private:
+    void processActionResponse(PushEvent* pushEvent);
     void addWidgetDefinitions(unity::scopes::PreviewWidgetList const&);
     void processWidgetDefinitions(unity::scopes::PreviewWidgetList const&, std::function<void(QSharedPointer<PreviewWidgetData>)> const& processFunc);
     void processPreviewChunk(PushEvent* pushEvent);
@@ -89,6 +104,7 @@
     PreviewWidgetModel* createExpandableWidgetModel(unity::scopes::PreviewWidget const&, PreviewWidgetData &);
     void addWidgetToColumnModel(QSharedPointer<PreviewWidgetData> const&);
     void processComponents(QHash<QString, QString> const& components, QVariantMap& out_attributes);
+    void dispatchPreview(unity::scopes::Variant const& extra_data = unity::scopes::Variant());
 
     bool m_loaded;
     bool m_processingAction;
@@ -100,7 +116,13 @@
     QList<QSharedPointer<PreviewWidgetData>> m_previewWidgets;
     QMultiMap<QString, PreviewWidgetData*> m_dataToWidgetMap;
 
+    unity::scopes::QueryCtrlProxy m_lastPreviewQuery;
+    QPointer<scopes_ng::Scope> m_associatedScope;
+    QUuid m_session_id;
+    QString m_userAgent;
     std::shared_ptr<unity::scopes::Result> m_previewedResult;
+    std::shared_ptr<ScopeDataReceiverBase> m_listener;
+    std::shared_ptr<ScopeDataReceiverBase> m_lastActivation;
 };
 
 } // namespace scopes_ng

=== removed file 'src/Unity/previewstack.cpp'
--- src/Unity/previewstack.cpp	2015-10-21 10:47:17 +0000
+++ src/Unity/previewstack.cpp	1970-01-01 00:00:00 +0000
@@ -1,338 +0,0 @@
-/*
- * Copyright (C) 2014 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 "previewstack.h"
-
-// local
-#include "previewmodel.h"
-#include "scope.h"
-#include "utils.h"
-#include "logintoaccount.h"
-
-// Qt
-#include <QLocale>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QUuid>
-#include <QPointer>
-
-#include <unity/scopes/ActionMetadata.h>
-#include <unity/scopes/Scope.h>
-
-namespace scopes_ng
-{
-
-using namespace unity;
-
-PreviewStack::PreviewStack(QObject* parent)
- : unity::shell::scopes::PreviewStackInterface(parent)
- , m_widgetColumnCount(1), m_activePreview(nullptr)
-{
-}
-
-PreviewStack::~PreviewStack()
-{
-    for (auto it = m_listeners.begin(); it != m_listeners.end(); ++it) {
-        auto listener = it.value().lock();
-        if (listener) listener->invalidate();
-    }
-
-    if (m_lastActivation) {
-        m_lastActivation->invalidate();
-    }
-}
-
-bool PreviewStack::event(QEvent* ev)
-{
-    if (ev->type() == PushEvent::eventType) {
-        PushEvent* pushEvent = static_cast<PushEvent*>(ev);
-
-        switch (pushEvent->type()) {
-            case PushEvent::ACTIVATION:
-                processActionResponse(pushEvent);
-                return true;
-            default:
-                qWarning("PreviewStack: Unhandled PushEvent type");
-                break;
-        }
-    }
-
-    return unity::shell::scopes::PreviewStackInterface::event(ev);
-}
-
-void PreviewStack::setAssociatedScope(scopes_ng::Scope* scope, QUuid const& session_id, QString const& userAgent)
-{
-    m_associatedScope = scope;
-    m_session_id = session_id;
-    m_userAgent = userAgent;
-}
-
-scopes_ng::Scope* PreviewStack::associatedScope() const
-{
-    return m_associatedScope;
-}
-
-void PreviewStack::loadForResult(scopes::Result::SPtr const& result)
-{
-    m_previewedResult = result;
-
-    beginResetModel();
-
-    // invalidate all listeners
-    for (auto it = m_listeners.begin(); it != m_listeners.end(); ++it) {
-        auto listener = it.value().lock();
-        if (listener) listener->invalidate();
-    }
-    // clear any previews
-    while (!m_previews.empty()) {
-        delete m_previews.takeFirst();
-    }
-    // create active preview
-    m_activePreview = new PreviewModel(this);
-    m_activePreview->setResult(m_previewedResult);
-    connect(m_activePreview, &PreviewModel::triggered, this, &PreviewStack::widgetTriggered);
-    m_previews.append(m_activePreview);
-
-    endResetModel();
-
-    dispatchPreview();
-}
-
-void PreviewStack::update(unity::scopes::PreviewWidgetList const& widgets)
-{
-    if (m_activePreview == nullptr) {
-        return;
-    }
-    m_activePreview->updateWidgetDefinitions(widgets);
-}
-
-void PreviewStack::dispatchPreview(scopes::Variant const& extra_data)
-{
-    // 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_associatedScope ? m_associatedScope->proxy_for_result(m_previewedResult) : m_previewedResult->target_scope_proxy();
-
-        QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : QStringLiteral("phone"));
-        scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
-        if (!extra_data.is_null()) {
-            metadata.set_scope_data(extra_data);
-        }
-        if (!m_session_id.isNull()) {
-            metadata["session-id"] = uuidToString(m_session_id).toStdString();
-        }
-        if (!m_userAgent.isEmpty()) {
-            metadata["user-agent"] = m_userAgent.toStdString();
-        }
-
-        std::shared_ptr<PreviewDataReceiver> listener(new PreviewDataReceiver(m_activePreview));
-        std::weak_ptr<ScopeDataReceiverBase> wl(listener);
-        // invalidate previous listener (if any)
-        auto prev_listener = m_listeners.take(m_activePreview).lock();
-        if (prev_listener) prev_listener->invalidate();
-        m_listeners[m_activePreview] = wl;
-
-        m_lastPreviewQuery = proxy->preview(*(m_previewedResult.get()), metadata, listener);
-    } catch (std::exception& e) {
-        qWarning("Caught an error from preview(): %s", e.what());
-    } catch (...) {
-        qWarning("Caught an error from preview()");
-    }
-}
-
-void PreviewStack::widgetTriggered(QString const& widgetId, QString const& actionId, QVariantMap const& data)
-{
-    auto action = [this, widgetId, actionId, data]() {
-        try {
-            auto proxy = m_associatedScope ? m_associatedScope->proxy_for_result(m_previewedResult) : m_previewedResult->target_scope_proxy();
-
-            QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : QStringLiteral("phone"));
-            scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
-            metadata.set_scope_data(qVariantToScopeVariant(data));
-
-            if (m_lastActivation) {
-                m_lastActivation->invalidate();
-            }
-            std::shared_ptr<ActivationReceiver> listener(new ActivationReceiver(this, m_previewedResult));
-            m_lastActivation = listener;
-
-            // should be always coming from active preview
-            if (m_activePreview) {
-                m_activePreview->setProcessingAction(true);
-            }
-
-            // FIXME: don't block
-            proxy->perform_action(*(m_previewedResult.get()), metadata, widgetId.toStdString(), actionId.toStdString(), listener);
-        } catch (std::exception& e) {
-            qWarning("Caught an error from perform_action(%s, %s): %s", widgetId.toStdString().c_str(), actionId.toStdString().c_str(), e.what());
-        } catch (...) {
-            qWarning("Caught an error from perform_action()");
-        }
-    };
-
-    PreviewModel* previewModel = qobject_cast<scopes_ng::PreviewModel*>(sender());
-    if (previewModel != nullptr) {
-        PreviewWidgetData* widgetData = previewModel->getWidgetData(widgetId);
-        if (widgetData != nullptr) {
-            QString wtype = widgetData->type;
-            auto uriAction = [this, wtype, data, action]() {
-                if ((wtype == QLatin1String("actions") || wtype == QLatin1String("icon-actions")) && data.contains(QStringLiteral("uri"))) {
-                    if (m_associatedScope) {
-                        m_associatedScope->activateUri(data.value(QStringLiteral("uri")).toString());
-                        return;
-                    }
-                }
-                action();
-            };
-
-            if (m_associatedScope && widgetData->data.contains(QStringLiteral("online_account_details")))
-            {
-                QVariantMap details = widgetData->data.value(QStringLiteral("online_account_details")).toMap();
-                if (details.contains(QStringLiteral("service_name")) &&
-                    details.contains(QStringLiteral("service_type")) &&
-                    details.contains(QStringLiteral("provider_name")) &&
-                    details.contains(QStringLiteral("login_passed_action")) &&
-                    details.contains(QStringLiteral("login_failed_action")))
-                {
-                    LoginToAccount *login = new LoginToAccount(details.contains(QStringLiteral("scope_id")) ? details.value(QStringLiteral("scope_id")).toString() : QLatin1String(""),
-                                                               details.value(QStringLiteral("service_name")).toString(),
-                                                               details.value(QStringLiteral("service_type")).toString(),
-                                                               details.value(QStringLiteral("provider_name")).toString(),
-                                                               details.value(QStringLiteral("login_passed_action")).toInt(),
-                                                               details.value(QStringLiteral("login_failed_action")).toInt(),
-                                                               this);
-                    connect(login, SIGNAL(searchInProgress(bool)), m_associatedScope, SLOT(setSearchInProgress(bool)));
-                    connect(login, &LoginToAccount::finished, [this, login, uriAction](bool, int action_code_index) {
-                        if (action_code_index >= 0 && action_code_index <= scopes::OnlineAccountClient::LastActionCode_)
-                        {
-                            scopes::OnlineAccountClient::PostLoginAction action_code = static_cast<scopes::OnlineAccountClient::PostLoginAction>(action_code_index);
-                            switch (action_code)
-                            {
-                                case scopes::OnlineAccountClient::DoNothing:
-                                    return;
-                                case scopes::OnlineAccountClient::InvalidateResults:
-                                    m_associatedScope->invalidateResults();
-                                    return;
-                                default:
-                                    break;
-                            }
-                        }
-                        uriAction();
-                        login->deleteLater();
-                    });
-                    login->loginToAccount();
-                    return; // main execution ends here
-                }
-            } else {
-                uriAction();
-            }
-        } else {
-            qWarning("Action triggered for unknown widget \"%s\"", widgetId.toStdString().c_str());
-        }
-    } else {
-        action();
-    }
-}
-
-void PreviewStack::processActionResponse(PushEvent* pushEvent)
-{
-    std::shared_ptr<scopes::ActivationResponse> response;
-    scopes::Result::SPtr result;
-    QString categoryId;
-    pushEvent->collectActivationResponse(response, result, categoryId);
-    if (!response) return;
-
-    switch (response->status()) {
-        case scopes::ActivationResponse::ShowPreview:
-            // replace current preview
-            m_activePreview->setDelayedClear();
-            // the preview is marked as processing action, leave the flag on until the preview is updated
-            dispatchPreview(scopes::Variant(response->scope_data()));
-            break;
-        // TODO: case to nest preview (once such API is available)
-        default:
-            if (m_associatedScope) {
-                m_associatedScope->handleActivation(response, result);
-            }
-
-            if (m_activePreview) {
-                m_activePreview->setProcessingAction(false);
-            }
-            break;
-    }
-}
-
-void PreviewStack::setWidgetColumnCount(int columnCount)
-{
-    if (m_widgetColumnCount != columnCount) {
-        m_widgetColumnCount = columnCount;
-        // set on all previews
-        for (int i = 0; i < m_previews.size(); i++) {
-            m_previews[i]->setWidgetColumnCount(columnCount);
-        }
-        Q_EMIT widgetColumnCountChanged();
-    }
-}
-
-int PreviewStack::widgetColumnCount() const
-{
-    return m_widgetColumnCount;
-}
-
-int PreviewStack::rowCount(const QModelIndex&) const
-{
-    return m_previews.size();
-}
-
-unity::scopes::Result::SPtr PreviewStack::previewedResult() const
-{
-    return m_previewedResult;
-}
-
-unity::shell::scopes::PreviewModelInterface* PreviewStack::getPreviewModel(int index) const
-{
-    if (index >= m_previews.size()) {
-        return nullptr;
-    }
-
-    return m_previews.at(index);
-}
-
-QVariant PreviewStack::data(const QModelIndex& index, int role) const
-{
-    int row = index.row();
-    if (row >= m_previews.size())
-    {
-        qWarning() << "PreviewStack::data - invalid index" << row << "size"
-                << m_previews.size();
-        return QVariant();
-    }
-
-    switch (role) {
-        case RolePreviewModel:
-            return QVariant::fromValue(m_previews.at(index.row()));
-        default:
-            return QVariant();
-    }
-}
-
-} // namespace scopes_ng

=== removed file 'src/Unity/previewstack.h'
--- src/Unity/previewstack.h	2015-08-14 12:29:16 +0000
+++ src/Unity/previewstack.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2014 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/>.
- */
-
-
-#ifndef NG_PREVIEW_STACK_H
-#define NG_PREVIEW_STACK_H
-
-#include <unity/shell/scopes/PreviewStackInterface.h>
-
-#include <QSet>
-#include <QSharedPointer>
-#include <QMultiMap>
-#include <QPointer>
-#include <QUuid>
-
-#include <unity/scopes/PreviewWidget.h>
-#include <unity/scopes/Result.h>
-
-#include "collectors.h"
-
-namespace scopes_ng
-{
-
-class PreviewModel;
-class Scope;
-
-class Q_DECL_EXPORT PreviewStack : public unity::shell::scopes::PreviewStackInterface
-{
-    Q_OBJECT
-
-public:
-    explicit PreviewStack(QObject* parent = 0);
-    virtual ~PreviewStack();
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-
-    virtual bool event(QEvent* ev) override;
-
-    Q_INVOKABLE unity::shell::scopes::PreviewModelInterface* getPreviewModel(int index) const override;
-
-    void loadForResult(unity::scopes::Result::SPtr const&);
-    void update(unity::scopes::PreviewWidgetList const&);
-
-    void setWidgetColumnCount(int columnCount) override;
-    int widgetColumnCount() const override;
-    void setAssociatedScope(scopes_ng::Scope*, QUuid const&, QString const&);
-    scopes_ng::Scope* associatedScope() const;
-    unity::scopes::Result::SPtr previewedResult() const;
-
-private Q_SLOTS:
-    void widgetTriggered(QString const&, QString const&, QVariantMap const&);
-
-private:
-    void processActionResponse(PushEvent* pushEvent);
-
-    void dispatchPreview(unity::scopes::Variant const& extra_data = unity::scopes::Variant());
-
-    int m_widgetColumnCount;
-    QList<PreviewModel*> m_previews;
-    PreviewModel* m_activePreview;
-    QPointer<scopes_ng::Scope> m_associatedScope;
-
-    unity::scopes::QueryCtrlProxy m_lastPreviewQuery;
-    QMap<PreviewModel*, std::weak_ptr<ScopeDataReceiverBase>> m_listeners;
-    std::shared_ptr<ScopeDataReceiverBase> m_lastActivation;
-
-    unity::scopes::Result::SPtr m_previewedResult;
-    QUuid m_session_id;
-    QString m_userAgent;
-};
-
-} // namespace scopes_ng
-
-Q_DECLARE_METATYPE(scopes_ng::PreviewStack*)
-
-#endif // NG_PREVIEW_STACK_H

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-11-30 09:23:32 +0000
+++ src/Unity/scope.cpp	2016-02-18 15:46:36 +0000
@@ -23,7 +23,7 @@
 // local
 #include "categories.h"
 #include "collectors.h"
-#include "previewstack.h"
+#include "previewmodel.h"
 #include "locationservice.h"
 #include "utils.h"
 #include "scopes.h"
@@ -83,6 +83,7 @@
     , m_formFactor(QStringLiteral("phone"))
     , m_isActive(false)
     , m_searchInProgress(false)
+    , m_activationInProgress(false)
     , m_resultsDirty(false)
     , m_delayedSearchProcessing(false)
     , m_hasNavigation(false)
@@ -207,6 +208,8 @@
 
 void Scope::handleActivation(std::shared_ptr<scopes::ActivationResponse> const& response, scopes::Result::SPtr const& result, QString const& categoryId)
 {
+    setActivationInProgress(false);
+
     switch (response->status()) {
         case scopes::ActivationResponse::NotHandled:
             activateUri(QString::fromStdString(result->uri()));
@@ -270,15 +273,15 @@
 
 void Scope::handlePreviewUpdate(unity::scopes::Result::SPtr const& result, unity::scopes::PreviewWidgetList const& widgets)
 {
-    for (auto stack: m_previewStacks) {
-        auto previewedResult = stack->previewedResult();
+    for (auto model: m_previewModels) {
+        auto previewedResult = model->previewedResult();
 
         if (result == nullptr) {
             qWarning() << "handlePreviewUpdate: result is null";
             return;
         }
         if (previewedResult != nullptr && *result == *previewedResult) {
-            stack->update(widgets);
+            model->update(widgets);
         }
     }
 }
@@ -675,6 +678,14 @@
     }
 }
 
+void Scope::setActivationInProgress(bool activationInProgress)
+{
+    if (m_activationInProgress != activationInProgress) {
+        m_activationInProgress = activationInProgress;
+        Q_EMIT activationInProgressChanged();
+    }
+}
+
 void Scope::setStatus(shell::scopes::ScopeInterface::Status status)
 {
     if (m_status != status) {
@@ -864,6 +875,11 @@
     return m_searchInProgress;
 }
 
+bool Scope::activationInProgress() const
+{
+    return m_activationInProgress;
+}
+
 unity::shell::scopes::ScopeInterface::Status Scope::status() const
 {
     return m_status;
@@ -1008,12 +1024,12 @@
     m_inverseDepartments.erase(it);
 }
 
-void Scope::previewStackDestroyed(QObject *obj)
+void Scope::previewModelDestroyed(QObject *obj)
 {
-    for (auto it = m_previewStacks.begin(); it != m_previewStacks.end(); it++)
+    for (auto it = m_previewModels.begin(); it != m_previewModels.end(); it++)
     {
         if (*it == obj) {
-            m_previewStacks.erase(it);
+            m_previewModels.erase(it);
             break;
         }
     }
@@ -1205,13 +1221,17 @@
                 scopes::ActivationListenerBase::SPtr listener(new ActivationReceiver(this, result));
                 m_activationController->setListener(listener);
 
+                setActivationInProgress(true);
+
                 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);
             } catch (std::exception& e) {
+                setActivationInProgress(false);
                 qWarning("Caught an error from activate(): %s", e.what());
             } catch (...) {
+                setActivationInProgress(false);
                 qWarning("Caught an error from activate()");
             }
         }
@@ -1282,7 +1302,7 @@
     }
 }
 
-unity::shell::scopes::PreviewStackInterface* Scope::preview(QVariant const& result_var, QString const& categoryId)
+unity::shell::scopes::PreviewModelInterface* Scope::preview(QVariant const& result_var, QString const& categoryId)
 {
     if (!result_var.canConvert<std::shared_ptr<scopes::Result>>()) {
         qWarning("Cannot preview, unable to convert %s to Result", result_var.typeName());
@@ -1300,12 +1320,12 @@
         return nullptr;
     }
 
-    PreviewStack* stack = new PreviewStack(nullptr);
-    QObject::connect(stack, &QObject::destroyed, this, &Scope::previewStackDestroyed);
-    m_previewStacks.append(stack);
-    stack->setAssociatedScope(this, m_session_id, m_scopesInstance->userAgentString());
-    stack->loadForResult(result);
-    return stack;
+    PreviewModel* previewModel = new PreviewModel(nullptr);
+    QObject::connect(previewModel, &QObject::destroyed, this, &Scope::previewModelDestroyed);
+    m_previewModels.append(previewModel);
+    previewModel->setAssociatedScope(this, m_session_id, m_scopesInstance->userAgentString());
+    previewModel->loadForResult(result);
+    return previewModel;
 }
 
 void Scope::cancelActivation()

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2015-11-30 09:23:32 +0000
+++ src/Unity/scope.h	2016-02-18 15:46:36 +0000
@@ -48,7 +48,7 @@
 
 class Categories;
 class PushEvent;
-class PreviewStack;
+class PreviewModel;
 class LocationService;
 class SettingsModel;
 class Scopes;
@@ -125,6 +125,7 @@
     bool favorite() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    bool activationInProgress() const override;
     unity::shell::scopes::ScopeInterface::Status status() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     unity::shell::scopes::SettingsModelInterface* settings() const override;
@@ -148,7 +149,7 @@
     void setFavorite(const bool) override;
 
     Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;
-    Q_INVOKABLE unity::shell::scopes::PreviewStackInterface* preview(QVariant const& result, QString const& categoryId) override;
+    Q_INVOKABLE unity::shell::scopes::PreviewModelInterface* preview(QVariant const& result, QString const& categoryId) override;
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
     Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& id) override;
@@ -177,6 +178,7 @@
     void invalidateResults();
     virtual void dispatchSearch();
     void setSearchInProgress(bool searchInProgress);
+    void setActivationInProgress(bool activationInProgress);
 
 Q_SIGNALS:
     void resultsDirtyChanged();
@@ -189,7 +191,7 @@
     void flushUpdates(bool finalize = false);
     void metadataRefreshed();
     void departmentModelDestroyed(QObject* obj);
-    void previewStackDestroyed(QObject *obj);
+    void previewModelDestroyed(QObject *obj);
 
 protected:
     explicit Scope(scopes_ng::Scopes* parent);
@@ -230,6 +232,7 @@
     std::unique_ptr<unity::scopes::Variant> m_queryUserData;
     bool m_isActive;
     bool m_searchInProgress;
+    bool m_activationInProgress;
     bool m_resultsDirty;
     bool m_delayedSearchProcessing;
     bool m_hasNavigation;
@@ -264,7 +267,7 @@
     QSharedPointer<LocationService> m_locationService;
     QSharedPointer<LocationService::Token> m_locationToken;
     QNetworkConfigurationManager m_network_manager;
-    QList<PreviewStack*> m_previewStacks;
+    QList<PreviewModel*> m_previewModels;
 };
 
 } // namespace scopes_ng

=== modified file 'src/scope-harness/internal/preview-widget-arguments.h'
--- src/scope-harness/internal/preview-widget-arguments.h	2015-04-24 13:06:14 +0000
+++ src/scope-harness/internal/preview-widget-arguments.h	2016-02-18 15:46:36 +0000
@@ -31,7 +31,6 @@
 {
     class PreviewWidgetModelInterface;
     class PreviewModelInterface;
-    class PreviewStackInterface;
 }
 }
 namespace scopeharness
@@ -54,8 +53,6 @@
     std::shared_ptr<view::ResultsView> resultsView;
 
     std::shared_ptr<view::PreviewView> previewView;
-
-    std::shared_ptr<unity::shell::scopes::PreviewStackInterface> previewStack;
 };
 }
 }

=== modified file 'src/scope-harness/preview/preview-widget.cpp'
--- src/scope-harness/preview/preview-widget.cpp	2015-08-20 07:32:49 +0000
+++ src/scope-harness/preview/preview-widget.cpp	2016-02-18 15:46:36 +0000
@@ -23,11 +23,12 @@
 #include <scope-harness/view/results-view.h>
 #include <scope-harness/test-utils.h>
 
+#include <Unity/previewmodel.h>
+
 #include <unity/shell/scopes/PreviewModelInterface.h>
 #include <unity/shell/scopes/PreviewWidgetModelInterface.h>
 
 #include <Unity/utils.h>
-#include <Unity/previewstack.h>
 
 #include <QDebug>
 #include <QSignalSpy>
@@ -57,8 +58,6 @@
     weak_ptr<view::ResultsView> m_resultsView;
 
     weak_ptr<view::PreviewView> m_previewView;
-
-    std::shared_ptr<unity::shell::scopes::PreviewStackInterface> m_previewStack;
 };
 
 PreviewWidget::PreviewWidget(const internal::PreviewWidgetArguments& arguments) :
@@ -69,7 +68,6 @@
     p->m_index = arguments.index;
     p->m_resultsView = arguments.resultsView;
     p->m_previewView = arguments.previewView;
-    p->m_previewStack = arguments.previewStack;
 }
 
 
@@ -91,7 +89,6 @@
     p->m_index = other.p->m_index;
     p->m_resultsView = other.p->m_resultsView;
     p->m_previewView = other.p->m_previewView;
-    p->m_previewStack = other.p->m_previewStack;
     return *this;
 }
 
@@ -127,9 +124,8 @@
 
 view::AbstractView::SPtr PreviewWidget::trigger(const string& name, const sc::Variant& v)
 {
-    auto ps = std::dynamic_pointer_cast<ng::PreviewStack>(p->m_previewStack);
-    TestUtils::throwIfNot(bool(ps), "No preview stack");
-    TestUtils::throwIfNot(bool(ps->associatedScope()), "Preview stack has no associated scope");
+    auto ps = dynamic_cast<ng::PreviewModel*>(p->m_previewModel);
+    TestUtils::throwIfNot(bool(ps->associatedScope()), "Preview model has no associated scope");
     QSignalSpy showDashSpy(ps->associatedScope(), SIGNAL(showDash()));
 
     QVariant widgetData;
@@ -153,7 +149,7 @@
         widgetData = ng::scopeVariantToQVariant(v);
     }
 
-    Q_EMIT p->m_previewModel->triggered(
+    Q_EMIT ps->triggered(
             QString::fromStdString(id()), QString::fromStdString(name),
             widgetData.toMap());
 

=== modified file 'src/scope-harness/results/result.cpp'
--- src/scope-harness/results/result.cpp	2015-11-30 09:23:32 +0000
+++ src/scope-harness/results/result.cpp	2016-02-18 15:46:36 +0000
@@ -23,9 +23,9 @@
 #include <scope-harness/view/results-view.h>
 
 #include <Unity/resultsmodel.h>
-#include <Unity/previewstack.h>
 #include <Unity/scope.h>
 #include <Unity/utils.h>
+#include <Unity/previewmodel.h>
 
 #include <QObject>
 #include <QSignalSpy>
@@ -137,7 +137,7 @@
                     // TODO set scope inactive?
                     auto result = m_resultsModel->data(
                             m_index, ss::ResultsModelInterface::Roles::RoleResult);
-                    shared_ptr<ss::PreviewStackInterface> preview(
+                    shared_ptr<ss::PreviewModelInterface> preview(
                             m_scope->preview(result, m_resultsModel->categoryId()));
                     previewView->preview(preview);
                     view = previewView;
@@ -161,7 +161,7 @@
                         auto result = m_resultsModel->data(
                                 m_index,
                                 ss::ResultsModelInterface::Roles::RoleResult);
-                        shared_ptr<ss::PreviewStackInterface> preview(
+                        shared_ptr<ss::PreviewModelInterface> preview(
                                 m_scope->preview(result, m_resultsModel->categoryId()));
                         previewView->preview(preview);
                         view = previewView;
@@ -379,7 +379,7 @@
             }
 
             auto previewView = p->m_previewView.lock();
-            shared_ptr<ss::PreviewStackInterface> preview(p->m_scope->preview(result_var, p->m_resultsModel->categoryId()));
+            shared_ptr<ss::PreviewModelInterface> preview(p->m_scope->preview(result_var, p->m_resultsModel->categoryId()));
             previewView->preview(preview);
             return previewView;
         }
@@ -418,7 +418,7 @@
                 return nullptr; // nothing happens for scope:// uris
             }
             auto previewView = p->m_previewView.lock();
-            shared_ptr<ss::PreviewStackInterface> preview(p->m_scope->preview(result_var, p->m_resultsModel->categoryId()));
+            shared_ptr<ss::PreviewModelInterface> preview(p->m_scope->preview(result_var, p->m_resultsModel->categoryId()));
             previewView->preview(preview);
             return previewView;
         }

=== modified file 'src/scope-harness/test-utils.cpp'
--- src/scope-harness/test-utils.cpp	2015-10-27 09:14:07 +0000
+++ src/scope-harness/test-utils.cpp	2016-02-18 15:46:36 +0000
@@ -33,7 +33,6 @@
 #include <Unity/scope.h>
 #include <Unity/categories.h>
 #include <Unity/resultsmodel.h>
-#include <Unity/previewstack.h>
 
 namespace sc = unity::scopes;
 namespace ng = scopes_ng;
@@ -136,18 +135,6 @@
     QCOMPARE(scope->searchInProgress(), false);
 }
 
-bool TestUtils::previewForFirstResult(ng::Scope::Ptr scope, QString const& searchString, QScopedPointer<ng::PreviewStack>& preview_stack)
-{
-    performSearch(scope, searchString);
-
-    unity::scopes::Result::SPtr result;
-    if (!getFirstResult(scope->categories(), result))
-        return false;
-    preview_stack.reset(static_cast<ng::PreviewStack*>(scope->preview(QVariant::fromValue(result), ""))); //FIXME
-
-    return true;
-}
-
 void TestUtils::setFavouriteScopes(const QStringList& cannedQueries)
 {
     setenv("GSETTINGS_BACKEND", "memory", 1);

=== modified file 'src/scope-harness/test-utils.h'
--- src/scope-harness/test-utils.h	2015-03-10 11:23:01 +0000
+++ src/scope-harness/test-utils.h	2016-02-18 15:46:36 +0000
@@ -57,9 +57,6 @@
 static void waitForSearchFinish(QSharedPointer<shell::scopes::ScopeInterface> scope);
 
 Q_DECL_EXPORT
-static bool previewForFirstResult(scopes_ng::Scope::Ptr scope, QString const& searchString, QScopedPointer<scopes_ng::PreviewStack>& preview_stack);
-
-Q_DECL_EXPORT
 static void setFavouriteScopes(const QStringList& cannedQueries);
 
 Q_DECL_EXPORT

=== modified file 'src/scope-harness/view/preview-view.cpp'
--- src/scope-harness/view/preview-view.cpp	2015-04-24 13:06:14 +0000
+++ src/scope-harness/view/preview-view.cpp	2016-02-18 15:46:36 +0000
@@ -23,7 +23,6 @@
 #include <scope-harness/test-utils.h>
 
 #include <unity/shell/scopes/PreviewModelInterface.h>
-#include <unity/shell/scopes/PreviewStackInterface.h>
 #include <unity/shell/scopes/PreviewWidgetModelInterface.h>
 
 
@@ -53,7 +52,7 @@
         {
             previewWidgets.emplace_back(
                     preview::PreviewWidget(internal::PreviewWidgetArguments
-                    { previewWidgetModel, previewWidgetModel->index(row), previewModel, m_resultsView.lock(), previewView, m_previewStack}));
+                    { previewWidgetModel, previewWidgetModel->index(row), previewModel, m_resultsView.lock(), previewView }));
         }
 
         return preview::PreviewWidgetList(internal::PreviewWidgetListArguments{previewWidgets});
@@ -82,24 +81,23 @@
         return previewModels;
     }
 
-    void setPreviewModel(shared_ptr<ss::PreviewStackInterface> previewStack, PreviewView::SPtr previewView)
+    void setPreviewModel(shared_ptr<ss::PreviewModelInterface> previewModel, PreviewView::SPtr previewView)
     {
-        m_previewStack = previewStack;
+        m_previewModel = previewModel;
         updateModels(previewView);
     }
 
     void updateModels(PreviewView::SPtr previewView)
     {
-        auto previewModel = m_previewStack->getPreviewModel(0);
-        m_previewModels = iteratePreviewModel(previewModel, previewView);
+        m_previewModels = iteratePreviewModel(m_previewModel.get(), previewView);
     }
 
-    void checkPreviewStack()
+    void checkPreviewModel()
     {
-        TestUtils::throwIfNot(bool(m_previewStack), "");
+        TestUtils::throwIfNot(bool(m_previewModel), "");
     }
 
-    shared_ptr<ss::PreviewStackInterface> m_previewStack;
+    shared_ptr<ss::PreviewModelInterface> m_previewModel;
 
     vector<preview::PreviewWidgetList> m_previewModels;
 
@@ -116,17 +114,17 @@
     p->m_resultsView = resultsView;
 }
 
-void PreviewView::preview(shared_ptr<ss::PreviewStackInterface> previewStack)
+void PreviewView::preview(shared_ptr<ss::PreviewModelInterface> previewModel)
 {
-    p->setPreviewModel(previewStack,
+    p->setPreviewModel(previewModel,
                        dynamic_pointer_cast<PreviewView>(shared_from_this()));
 }
 
 void PreviewView::setColumnCount(unsigned int count)
 {
-    p->checkPreviewStack();
+    p->checkPreviewModel();
 
-    p->m_previewStack->setWidgetColumnCount(count);
+    p->m_previewModel->setWidgetColumnCount(count);
     // TODO Wait?
     refresh();
 }
@@ -138,21 +136,21 @@
 
 unsigned int PreviewView::columnCount() const
 {
-    p->checkPreviewStack();
+    p->checkPreviewModel();
 
-    return p->m_previewStack->widgetColumnCount();
+    return p->m_previewModel->widgetColumnCount();
 }
 
 vector<preview::PreviewWidgetList> PreviewView::widgets()
 {
-    p->checkPreviewStack();
+    p->checkPreviewModel();
 
     return p->m_previewModels;
 }
 
 preview::PreviewWidgetList PreviewView::widgetsInColumn(size_t column)
 {
-    p->checkPreviewStack();
+    p->checkPreviewModel();
 
     return p->m_previewModels.at(column);
 }

=== modified file 'src/scope-harness/view/preview-view.h'
--- src/scope-harness/view/preview-view.h	2015-03-10 11:23:01 +0000
+++ src/scope-harness/view/preview-view.h	2016-02-18 15:46:36 +0000
@@ -27,7 +27,7 @@
 {
 namespace scopes
 {
-class PreviewStackInterface;
+class PreviewModelInterface;
 }
 }
 namespace scopeharness
@@ -74,7 +74,7 @@
     friend ScopeHarness;
     friend preview::PreviewWidget;
 
-    void preview(std::shared_ptr<shell::scopes::PreviewStackInterface> previewStack);
+    void preview(std::shared_ptr<shell::scopes::PreviewModelInterface> previewModel);
 
     void setResultsView(std::shared_ptr<ResultsView> resultsView);
 

=== modified file 'tests/overviewtest.cpp'
--- tests/overviewtest.cpp	2016-02-04 15:41:08 +0000
+++ tests/overviewtest.cpp	2016-02-18 15:46:36 +0000
@@ -31,7 +31,6 @@
 #include <categories.h>
 #include <overviewresults.h>
 #include <previewmodel.h>
-#include <previewstack.h>
 #include <previewwidgetmodel.h>
 
 #include <scope-harness/registry/pre-existing-registry.h>

=== modified file 'tests/previewtest.cpp'
--- tests/previewtest.cpp	2015-08-14 12:29:16 +0000
+++ tests/previewtest.cpp	2016-02-18 15:46:36 +0000
@@ -29,7 +29,6 @@
 #include <categories.h>
 #include <resultsmodel.h>
 #include <previewmodel.h>
-#include <previewstack.h>
 #include <previewwidgetmodel.h>
 
 #include <scope-harness/matcher/category-matcher.h>