Merge lp:~cimi/unity8/bug-1541967 into lp:unity8

[Andrea Cimitan]

Make the PreviewListView not interactive so it doesn't scroll

Make the previews not scrollable

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
y

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2173
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/289/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/409/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/432
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/450
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/450
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/446
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/446/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/446/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/446
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/446/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/446/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/446
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/446/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/446/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/289/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Any reason that we don't fix this properly?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2173
http://jenkins.qa.ubuntu.com/job/unity8-ci/7231/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6377
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/646/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1936
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/639/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1831
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/638/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/637/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4890
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27387
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/644/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7231/rebuild

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

> Any reason that we don't fix this properly?

Proper fix will be possible once I refactor shell plugin and scope interfaces to only expose one preview. WIP.

[Andrea Cimitan (cimi)]

still have to fix the tests and test it with the silo before is ready for review. comments still welcome

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2176
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/424/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/576/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/599
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/617
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/617
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/613/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/613/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/613/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/613/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/613/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/613/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/424/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2175
http://jenkins.qa.ubuntu.com/job/unity8-ci/7359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/774/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2064/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/767/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1959/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1959/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/765/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6568/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/772/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7359/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

> still have to fix the tests and test it with the silo before is ready for
> review. comments still welcome
test fixed, I need to bump debian stuff and test with the silo yet

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2179
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/428/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/582/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/605
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/623
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/623
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/619/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/619/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/619/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/619/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/619/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/619/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/428/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2179
http://jenkins.qa.ubuntu.com/job/unity8-ci/7362/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6560/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/777/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2067/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/770/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1962/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1962/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/769/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/768/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6571/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/775/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7362/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2180
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/429/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/583/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/606
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/624
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/624
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/620/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/620/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/620/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/620/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/620/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/620/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/429/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity8/bug-1541967]

2204. By Andrea Cimitan on 2016-02-19

merged

2205. By Andrea Cimitan on 2016-02-19

Merged the other way around

Unmerged revisions

2205. By Andrea Cimitan on 2016-02-19

Merged the other way around

2204. By Andrea Cimitan on 2016-02-19

merged

2203. By Launchpad Translations on behalf of unity-team on 2016-02-19

Launchpad automatic translations update.

2202. By Launchpad Translations on behalf of unity-team on 2016-02-18

Launchpad automatic translations update.

2201. By Launchpad Translations on behalf of unity-team on 2016-02-17

Launchpad automatic translations update.

2200. By Launchpad Translations on behalf of unity-team on 2016-02-16

Launchpad automatic translations update.

=== modified file 'debian/control'
--- debian/control	2016-02-12 00:12:30 +0000
+++ debian/control	2016-02-19 10:15:29 +0000
@@ -29,7 +29,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.106),
+               libunity-api-dev (>= 7.107),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!armhf],
@@ -134,7 +134,7 @@
          unity-application-impl-13,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
-         unity-scopes-impl-9,
+         unity-scopes-impl-11,
          unity8-fake-env | unity-application-impl,
          ${misc:Depends},
 Breaks: unity8 (<< 7.86),

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-02-04 13:36:51 +0000
+++ qml/Dash/GenericScopeView.qml	2016-02-19 10:15:29 +0000
@@ -47,7 +47,7 @@
         style: scope ? scope.customizations : {}
     }
 
-    readonly property bool processing: scope ? scope.searchInProgress || subPageLoader.processing : false
+    readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress || subPageLoader.processing) : false
 
     signal backClicked()
 
@@ -73,49 +73,30 @@
     }
 
     property var maybePreviewResult;
-    property int maybePreviewIndex;
-    property var maybePreviewResultsModel;
-    property int maybePreviewLimitedCategoryItemCount;
     property string maybePreviewCategoryId;
 
     function clearMaybePreviewData() {
         scopeView.maybePreviewResult = undefined;
-        scopeView.maybePreviewIndex = -1;
-        scopeView.maybePreviewResultsModel = undefined;
-        scopeView.maybePreviewLimitedCategoryItemCount = -1;
         scopeView.maybePreviewCategoryId = "";
     }
 
-    function itemClicked(index, result, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {
+    function itemClicked(result, categoryId) {
         scopeView.maybePreviewResult = result;
-        scopeView.maybePreviewIndex = index;
-        scopeView.maybePreviewResultsModel = resultsModel;
-        scopeView.maybePreviewLimitedCategoryItemCount = limitedCategoryItemCount;
         scopeView.maybePreviewCategoryId = categoryId;
 
         scope.activate(result, categoryId);
     }
 
-    function itemPressedAndHeld(index, result, resultsModel, limitedCategoryItemCount, categoryId) {
+    function itemPressedAndHeld(result, categoryId) {
         clearMaybePreviewData();
 
-        openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId);
+        openPreview(result, categoryId);
     }
 
-    function openPreview(result, index, resultsModel, limitedCategoryItemCount, categoryId) {
-        var previewStack = scope.preview(result, categoryId);
-        if (previewStack) {
-            if (limitedCategoryItemCount > 0) {
-                previewLimitModel.model = resultsModel;
-                previewLimitModel.limit = limitedCategoryItemCount;
-                subPageLoader.model = previewLimitModel;
-            } else {
-                subPageLoader.model = resultsModel;
-            }
-            subPageLoader.initialIndex = -1;
-            subPageLoader.initialIndex = index;
-            subPageLoader.categoryId = categoryId;
-            subPageLoader.previewStack = previewStack;
+    function openPreview(result, categoryId) {
+        var previewModel = scope.preview(result, categoryId);
+        if (previewModel) {
+            subPageLoader.previewModel = previewModel;
             subPageLoader.openSubPage("preview");
         }
     }
@@ -166,9 +147,6 @@
         onPreviewRequested: { // (QVariant const& result)
             if (result === scopeView.maybePreviewResult) {
                 openPreview(result,
-                            scopeView.maybePreviewIndex,
-                            scopeView.maybePreviewResultsModel,
-                            scopeView.maybePreviewLimitedCategoryItemCount,
                             scopeView.maybePreviewCategoryId);
 
                 clearMaybePreviewData();
@@ -400,11 +378,11 @@
                 Connections {
                     target: rendererLoader.item
                     onClicked: { // (int index, var result, var item, var itemModel)
-                        scopeView.itemClicked(index, result, itemModel, target.model, categoryItemCount(), baseItem.category);
+                        scopeView.itemClicked(result, baseItem.category);
                     }
 
                     onPressAndHold: { // (int index, var result, var itemModel)
-                        scopeView.itemPressedAndHeld(index, result, target.model, categoryItemCount(), baseItem.category);
+                        scopeView.itemPressedAndHeld(result, baseItem.category);
                     }
 
                     function categoryItemCount() {
@@ -779,13 +757,10 @@
         property var scope: scopeView.scope
         property var scopeStyle: scopeView.scopeStyle
         property int initialIndex: -1
-        property var previewStack;
-        property string categoryId
-        property var model: null
+        property var previewModel;
 
         readonly property bool processing: item && item.processing || false
         readonly property int count: item && item.count || 0
-        readonly property int currentIndex: item && item.currentIndex || 0
         readonly property var currentItem: item && item.currentItem || null
 
         property string subPage: ""
@@ -800,7 +775,7 @@
         }
 
         source: switch(subPage) {
-            case "preview": return "PreviewListView.qml";
+            case "preview": return "PreviewView.qml";
             case "settings": return "ScopeSettingsPage.qml";
             default: return "";
         }
@@ -810,11 +785,8 @@
             item.scopeStyle = Qt.binding(function() { return subPageLoader.scopeStyle; } )
             if (subPage == "preview") {
                 item.open = Qt.binding(function() { return subPageLoader.open; } )
-                item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )
-                item.model = Qt.binding(function() { return subPageLoader.model; } )
-                item.categoryId = Qt.binding(function() { return subPageLoader.categoryId; } )
-                item.initialIndexPreviewStack = subPageLoader.previewStack;
-                subPageLoader.previewStack = null;
+                item.previewModel = subPageLoader.previewModel;
+                subPageLoader.previewModel = null;
             }
             open = true;
         }

=== renamed file 'qml/Dash/PreviewListView.qml' => 'qml/Dash/PreviewView.qml'
--- qml/Dash/PreviewListView.qml	2015-10-26 08:53:52 +0000
+++ qml/Dash/PreviewView.qml	2016-02-19 10:15:29 +0000
@@ -23,20 +23,14 @@
 Item {
     id: root
 
-    property int initialIndex: -1
-    property var initialIndexPreviewStack: null
+    property bool open: false
     property var scope: null
     property var scopeStyle: null
-    property string categoryId
-    property bool usedInitialIndex: false
 
     property alias showSignatureLine: header.showSignatureLine
 
-    property alias open: previewListView.open
-    property alias model: previewListView.model
-    property alias currentIndex: previewListView.currentIndex
-    property alias currentItem: previewListView.currentItem
-    property alias count: previewListView.count
+    property alias currentItem: previewLoader.item
+    property var previewModel
 
     readonly property bool processing: currentItem && (!currentItem.previewModel.loaded
                                                        || currentItem.previewModel.processingAction)
@@ -55,73 +49,36 @@
         onBackClicked: root.backClicked()
     }
 
-    ListView  {
-        id: previewListView
-        objectName: "listView"
+    onOpenChanged: {
+        if (!open) {
+            // Cancel any pending preview requests or actions
+            if (currentItem && currentItem.previewData !== undefined) {
+                currentItem.previewData.cancelAction();
+            }
+            root.scope.cancelActivation();
+        }
+    }
+
+    Loader {
+        id: previewLoader
+        objectName: "loader"
         anchors {
             top: header.bottom
             bottom: parent.bottom
             left: parent.left
             right: parent.right
         }
-        orientation: ListView.Horizontal
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        snapMode: ListView.SnapOneItem
-        boundsBehavior: Flickable.DragAndOvershootBounds
-        highlightMoveDuration: 250
-        flickDeceleration: units.gu(625)
-        maximumFlickVelocity: width * 5
-        cacheBuffer: 0
-
-        property bool open: false
-
-        onOpenChanged: {
-            if (!open) {
-                // Cancel any pending preview requests or actions
-                if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {
-                    previewListView.currentItem.previewData.cancelAction();
-                }
-                root.scope.cancelActivation();
-                model = undefined;
-            }
-        }
-
-        onModelChanged: {
-            if (count > 0 && initialIndex >= 0 && !usedInitialIndex) {
-                usedInitialIndex = true;
-                previewListView.positionViewAtIndex(initialIndex, ListView.SnapPosition);
-            }
-        }
-
-        delegate: Previews.Preview {
+
+        sourceComponent: Previews.Preview {
             id: preview
-            objectName: "preview" + index
-            height: previewListView.height
-            width: previewListView.width
-
-            isCurrent: ListView.isCurrentItem
-
-            readonly property var previewStack: {
-                if (root.open) {
-                    if (index === root.initialIndex) {
-                        return root.initialIndexPreviewStack;
-                    } else {
-                        return root.scope.preview(result, root.categoryId);
-                    }
-                } else {
-                    return null;
-                }
-            }
-
-            previewModel: {
-                if (previewStack) {
-                    return previewStack.getPreviewModel(0);
-                } else {
-                    return null;
-                }
-            }
-
-            scopeStyle: root.scopeStyle
+            objectName: "preview"
+            height: previewLoader.height
+            width: previewLoader.width
+        }
+
+        onLoaded: {
+            item.scopeStyle = Qt.binding(function() { return root.scopeStyle; });
+            item.previewModel = Qt.binding(function() { return root.previewModel; });
         }
     }
 

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-11-26 16:36:41 +0000
+++ qml/Dash/Previews/Preview.qml	2016-02-19 10:15:29 +0000
@@ -34,9 +34,6 @@
      */
     property var previewModel
 
-    //! \brief Should be set to true if this preview is currently displayed.
-    property bool isCurrent: false
-
     //! \brief The ScopeStyle component.
     property var scopeStyle: null
 
@@ -88,7 +85,6 @@
                     widgetId: model.widgetId
                     widgetType: model.type
                     widgetData: model.properties
-                    isCurrentPreview: root.isCurrent
                     scopeStyle: root.scopeStyle
                     parentFlickable: column
 

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2015-09-18 07:43:38 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2016-02-19 10:15:29 +0000
@@ -84,7 +84,6 @@
                 widgetId: model.widgetId
                 widgetType: model.type
                 widgetData: model.properties
-                isCurrentPreview: root.isCurrentPreview
                 scopeStyle: root.scopeStyle
                 anchors {
                     left: parent.left

=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
--- qml/Dash/Previews/PreviewRatingEdit.qml	2016-01-20 17:59:53 +0000
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2016-02-19 10:15:29 +0000
@@ -68,7 +68,6 @@
 
         widgetId: root.widgetId
         widgetData: root.widgetData
-        isCurrentPreview: root.isCurrentPreview
         scopeStyle: root.scopeStyle
 
         ratingValue: widgetData["rating"]

=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
--- qml/Dash/Previews/PreviewWidget.qml	2015-11-26 16:36:41 +0000
+++ qml/Dash/Previews/PreviewWidget.qml	2016-02-19 10:15:29 +0000
@@ -19,9 +19,6 @@
 /*! Interface for preview widgets. */
 
 Item {
-    //! Specifies the preview widget being currently used or not
-    property bool isCurrentPreview: true
-
     //! The widget identifier
     property string widgetId
 

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-11-26 16:36:41 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2016-02-19 10:15:29 +0000
@@ -37,9 +37,6 @@
     //! Should the widget show in expanded mode (For those that support it)
     property bool expanded: widgetType !== "expandable" || widgetData["expanded"] === true
 
-    //! Set to true if the parent preview is displayed.
-    property bool isCurrentPreview: false
-
     //! Set margins width.
     property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
 
@@ -82,7 +79,6 @@
     onLoaded: {
         item.widgetId = Qt.binding(function() { return root.widgetId } )
         item.widgetData = Qt.binding(function() { return root.widgetData } )
-        item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )
         item.expanded = Qt.binding(function() { return root.expanded } )
         item.scopeStyle = Qt.binding(function() { return root.scopeStyle } )
         item.parentFlickable = Qt.binding(function() { return root.parentFlickable } )

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2015-10-26 08:53:52 +0000
+++ qml/Dash/ScopesList.qml	2016-02-19 10:15:29 +0000
@@ -24,7 +24,7 @@
     property var scope: null
 
     // Properties used by parent
-    readonly property bool processing: scope ? scope.searchInProgress : false
+    readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress) : false
 
     // Signals
     signal backClicked()

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2016-01-13 10:11:40 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2016-02-19 10:15:29 +0000
@@ -8,7 +8,7 @@
 add_subdirectory(Screens)
 
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=9)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=11)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -28,13 +28,11 @@
   fake_navigation.cpp
   fake_resultsmodel.cpp
   fake_previewmodel.cpp
-  fake_previewstack.cpp
   fake_previewwidgetmodel.cpp
   fake_unity_plugin.cpp
   ${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

=== removed file 'tests/mocks/Unity/fake_previewstack.cpp'
--- tests/mocks/Unity/fake_previewstack.cpp	2015-09-14 11:07:25 +0000
+++ tests/mocks/Unity/fake_previewstack.cpp	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 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/>.
- */
-
-// self
-#include "fake_previewstack.h"
-
-// local
-#include "fake_previewmodel.h"
-#include "fake_scope.h"
-
-PreviewStack::PreviewStack(Scope *scope)
- : unity::shell::scopes::PreviewStackInterface(nullptr)
-{
-    m_previews << new PreviewModel(this, scope);
-}
-
-PreviewStack::~PreviewStack()
-{
-}
-
-void PreviewStack::setWidgetColumnCount(int columnCount)
-{
-    if (columnCount != 1) {
-        qFatal("PreviewStack::setWidgetColumnCount != 1 not implemented");
-    }
-}
-
-int PreviewStack::widgetColumnCount() const
-{
-    return 1;
-}
-
-int PreviewStack::rowCount(const QModelIndex&) const
-{
-    return m_previews.size();
-}
-
-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
-{
-    switch (role) {
-        case RolePreviewModel:
-            return QVariant::fromValue(m_previews.at(index.row()));
-        default:
-            return QVariant();
-    }
-}

=== removed file 'tests/mocks/Unity/fake_previewstack.h'
--- tests/mocks/Unity/fake_previewstack.h	2015-09-14 11:07:25 +0000
+++ tests/mocks/Unity/fake_previewstack.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 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/>.
- */
-
-
-#ifndef FAKE_PREVIEWSTACK_H
-#define FAKE_PREVIEWSTACK_H
-
-#include <unity/shell/scopes/PreviewStackInterface.h>
-
-#include <QSharedPointer>
-#include <QVariantMap>
-
-class PreviewModel;
-
-class Scope;
-
-class PreviewStack : public unity::shell::scopes::PreviewStackInterface
-{
-    Q_OBJECT
-
-public:
-    explicit PreviewStack(Scope* scope = 0);
-    virtual ~PreviewStack();
-
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-
-    Q_INVOKABLE unity::shell::scopes::PreviewModelInterface* getPreviewModel(int index) const override;
-
-    void setWidgetColumnCount(int columnCount) override;
-    int widgetColumnCount() const override;
-
-private:
-    QList<PreviewModel*> m_previews;
-};
-
-Q_DECLARE_METATYPE(PreviewStack*)
-
-#endif // FAKE_PREVIEWSTACK_H

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2015-10-14 12:46:35 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2016-02-19 10:15:29 +0000
@@ -87,6 +87,11 @@
     return m_searching;
 }
 
+bool Scope::activationInProgress() const
+{
+    return false;
+}
+
 bool Scope::favorite() const
 {
     return m_favorite;
@@ -194,14 +199,14 @@
     }
 }
 
-PreviewStack* Scope::preview(QVariant const& result, QString const& /*categoryId*/)
+PreviewModel* Scope::preview(QVariant const& result, QString const& /*categoryId*/)
 {
     Q_UNUSED(result);
 
     if (m_returnNullPreview) {
         return nullptr;
     } else {
-        return new PreviewStack(this);
+        return new PreviewModel(this);
     }
 }
 

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2015-10-14 12:46:35 +0000
+++ tests/mocks/Unity/fake_scope.h	2016-02-19 10:15:29 +0000
@@ -20,7 +20,7 @@
 #include <unity/shell/scopes/ScopeInterface.h>
 
 #include "fake_categories.h"
-#include "fake_previewstack.h"
+#include "fake_previewmodel.h"
 
 #include <QTimer>
 
@@ -42,6 +42,7 @@
     QString searchHint() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    bool activationInProgress() const override;
     bool favorite() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     QString searchQuery() const override;
@@ -61,7 +62,7 @@
     Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits
 
     Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;
-    Q_INVOKABLE PreviewStack* preview(QVariant const& result, QString const& categoryId) override;
+    Q_INVOKABLE PreviewModel* preview(QVariant const& result, QString const& categoryId) override;
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
 

=== modified file 'tests/mocks/Unity/fake_unity_plugin.cpp'
--- tests/mocks/Unity/fake_unity_plugin.cpp	2014-08-26 12:27:36 +0000
+++ tests/mocks/Unity/fake_unity_plugin.cpp	2016-02-19 10:15:29 +0000
@@ -47,10 +47,9 @@
     qmlRegisterUncreatableType<unity::shell::scopes::SettingsModelInterface>(uri, 0, 2, "SettingsModel", "Can't create SettingsModel object in QML.");
     qmlRegisterUncreatableType<unity::shell::scopes::NavigationInterface>(uri, 0, 2, "Navigation", "Can't create Navigation object in QML.");
     qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
-    qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");
     qmlRegisterType<ResultsModel>(uri, 0, 2, "FakeResultsModel");
     qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");
     qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
-    qmlRegisterUncreatableType<PreviewStack>(uri, 0, 2, "PreviewStack", "Can't create new PreviewStack in QML. Get them from Scope instance.");
 }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2016-01-29 11:52:14 +0000
+++ tests/qmltests/CMakeLists.txt	2016-02-19 10:15:29 +0000
@@ -29,7 +29,7 @@
 add_unity8_qmltest(Dash CardTool)
 add_unity8_qmltest(Dash GenericScopeView)
 add_unity8_qmltest(Dash DashPageHeader)
-add_unity8_qmltest(Dash PreviewListView)
+add_unity8_qmltest(Dash PreviewView)
 add_unity8_qmltest(Dash/Previews Preview)
 add_unity8_qmltest(Dash/Previews PreviewActions)
 add_unity8_qmltest(Dash/Previews PreviewAudioPlayback)

=== renamed file 'tests/qmltests/Dash/tst_PreviewListView.qml' => 'tests/qmltests/Dash/tst_PreviewView.qml'
--- tests/qmltests/Dash/tst_PreviewListView.qml	2015-08-24 07:45:32 +0000
+++ tests/qmltests/Dash/tst_PreviewView.qml	2016-02-19 10:15:29 +0000
@@ -36,8 +36,8 @@
         id: mockResultsModel
     }
 
-    PreviewListView {
-        id: listView
+    PreviewView {
+        id: view
         anchors.fill: parent
         scope: mockScope
         scopeStyle: ScopeStyle {
@@ -45,12 +45,23 @@
         }
     }
 
+    Item {
+        Repeater {
+            id: repeater
+            model: mockResultsModel
+            Item {
+                property var previewModel: mockScope.preview(model.result, model.categoryId);
+            }
+        }
+    }
+
+
     UT.UnityTestCase {
         id: testCase
-        name: "PreviewListView"
+        name: "PreviewView"
         when: windowShown
 
-        property MouseArea mouseArea: findChild(listView, "processingMouseArea")
+        property MouseArea mouseArea: findChild(view, "processingMouseArea")
 
         SignalSpy {
             id: clickedSpy
@@ -59,43 +70,41 @@
         }
 
         function init() {
-            listView.model = mockResultsModel;
-            listView.currentIndex = 1;
-            listView.open = true;
+            view.open = true;
+            view.previewModel = repeater.itemAt(0).previewModel
             verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
         }
 
         function cleanup() {
-            listView.open = false;
-            listView.model = null;
+            view.open = false;
             clickedSpy.clear();
         }
 
         function test_notProcessing() {
             expectFail("", "processingMouseArea should not receive the click.");
-            mouseClick(listView);
+            mouseClick(view);
             clickedSpy.wait();
         }
 
         function test_processing() {
-            verify(listView.currentItem, "currentItem is not ready yet");
-            listView.currentItem.previewModel.setLoaded(false);
-
-            tryCompare(listView, "processing", true);
-
-            mouseClick(listView);
+            verify(view.currentItem, "currentItem is not ready yet");
+            view.currentItem.previewModel.setLoaded(false);
+
+            tryCompare(view, "processing", true);
+
+            mouseClick(view);
             clickedSpy.wait();
         }
 
         function test_title() {
-            var header = findChild(listView, "innerPageHeader");
+            var header = findChild(view, "innerPageHeader");
             verify(header, "Could not find the preview header");
 
             compare(header.config.title, "Mock Scope");
         }
 
         function test_header_style() {
-            var header = findChild(listView, "pageHeader");
+            var header = findChild(view, "pageHeader");
             verify(header, "Could not find the header");
 
             var innerHeader = findChild(header, "innerPageHeader");