Merge lp:~unity-team/unity8/newscopes-preview into lp:~unity-team/unity8/new-scopes

[Michał Sawicz]

Integrate new preview.

[lp:~unity-team/unity8/newscopes-preview]

591. By Michał Sawicz on 2014-02-07

lp:~saviq/unity8/fix-indicator-tests

592. By Michał Sawicz on 2014-02-07

lp:~saviq/unity8/card-tool

593. By Michał Sawicz on 2014-02-07

lp:~mterry/unity8/demo-users

594. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/unity8.previews_audioPlayer

595. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/unity8.previews_textSummary

596. By Michał Sawicz on 2014-02-07

lp:~aacid/unity8/image_gallery_preview_widget

597. By Michał Sawicz on 2014-02-07

lp:~ted/unity8/on-the-screen

598. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/action_preview_widget

599. By Michał Sawicz on 2014-02-07

lp:~saviq/unity8/new-preview

600. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/unity8-card-overlay

601. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/header-alignment

602. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/new-scopes-title-alignment

603. By Michał Sawicz on 2014-02-07

lp:~unity-team/unity8/newscopes-card-overlay

604. By Michał Sawicz on 2014-02-07

Adapt to scopes_ng.

605. By Michał Sawicz on 2014-02-07

Initial preview integration.

606. By Michał Sawicz on 2014-02-07

Drop placeholder.

=== modified file 'qml/Dash/DashPreviewPlaceholder.qml'
--- qml/Dash/DashPreviewPlaceholder.qml	2013-09-30 12:17:20 +0000
+++ qml/Dash/DashPreviewPlaceholder.qml	2014-02-07 16:30:34 +0000
@@ -20,6 +20,6 @@
 DashPreview {
     ActivityIndicator {
         anchors.centerIn: parent
-        running: true
+        running: visible
     }
 }

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-02-04 17:44:56 +0000
+++ qml/Dash/GenericScopeView.qml	2014-02-07 16:30:34 +0000
@@ -193,7 +193,6 @@
                         previewListView.categoryId = categoryId
                         previewListView.categoryDelegate = rendererLoader.item
                         previewListView.model = target.model;
-                        previewListView.init = true;
                         previewListView.currentIndex = index;
 
                         var item = target.model.get(index);
@@ -203,8 +202,6 @@
                             scopeView.scope.activate(item.result)
                         } else {
                             previewListView.open = true
-
-                            scopeView.scope.preview(item.result)
                         }
                     }
                     onPressAndHold: {
@@ -212,13 +209,8 @@
                         previewListView.categoryId = categoryId
                         previewListView.categoryDelegate = rendererLoader.item
                         previewListView.model = target.model;
-                        previewListView.init = true;
                         previewListView.currentIndex = index;
                         previewListView.open = true
-
-                        var item = target.model.get(index)
-                        scopeView.scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title,
-                                                item.comment, item.dndUri, item.metadata)
                     }
                 }
                 Connections {
@@ -335,24 +327,6 @@
         }
     }
 
-    Connections {
-        target: scopeView.scope
-        onPreviewReady: {
-            if (previewListView.init) {
-                // Preview was triggered because of a click on the item. Need to expand now.
-                if (!previewListView.open) {
-                    previewListView.open = true
-                }
-
-                var index = previewListView.currentIndex
-                previewListView.currentIndex = -1
-                previewListView.currentIndex = index
-                previewListView.init = false
-            }
-            previewListView.currentItem.previewData = preview
-        }
-    }
-
     // TODO: Move as InverseMouseArea to DashPreview
     MouseArea {
         objectName: "closePreviewMouseArea"

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-01-20 16:29:58 +0000
+++ qml/Dash/PreviewListView.qml	2014-02-07 16:30:34 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 0.1
 import Unity 0.2
 import "../Components"
+import "Previews" as Previews
 
 Item {
     property OpenEffect openEffect: null
@@ -28,7 +29,6 @@
     property alias onScreen: previewListView.onScreen
     property alias categoryId: previewListView.categoryId
     property alias categoryDelegate: previewListView.categoryDelegate
-    property alias init: previewListView.init
     property alias model: previewListView.model
     property alias currentIndex: previewListView.currentIndex
     property alias currentItem: previewListView.currentItem
@@ -83,11 +83,8 @@
         // when the first preview is ready to be displayed.
         property bool init: true
 
-        PreviewDelegateMapper {
-            id: previewDelegateMapper
-        }
-
         onCurrentIndexChanged: {
+            if (currentIndex < 0) return;
             var row = Math.floor(currentIndex / categoryDelegate.columns);
             if (categoryDelegate.collapsedRowCount <= row) {
                 categoryView.expandedCategoryId = categoryId
@@ -97,9 +94,9 @@
                 categoryDelegate.highlightIndex = currentIndex
             }
 
-            if (!init && model !== undefined) {
+            if (model !== undefined) {
                 var item = model.get(currentIndex)
-                scope.preview(item.uri, item.icon, item.category, 0, item.mimetype, item.title, item.comment, item.dndUri, item.metadata)
+                previewListView.currentItem.previewModel = scope.preview(item.result)
             }
 
             // Adjust contentY in case we need to change to it to show the next row
@@ -154,58 +151,32 @@
             z: -1
         }
 
-        delegate: Loader {
-            id: previewLoader
-            objectName: "previewLoader" + index
+        delegate: Previews.Preview {
+            id: preview
+            objectName: "preview" + index
             height: previewListView.height
             width: previewListView.width
-            asynchronous: true
-            source: previewListView.onScreen ?
-                            (previewData !== undefined ? previewDelegateMapper.map(previewData.rendererName) : "DashPreviewPlaceholder.qml") : ""
-
-            onPreviewDataChanged: {
-                if (previewData !== undefined && source.toString().indexOf("DashPreviewPlaceholder.qml") != -1) {
-                    previewLoader.opacity = 0;
-                }
-            }
-
-            onSourceChanged: {
-                if (previewData !== undefined) {
-                    fadeIn.start()
-                }
-            }
+
+            isCurrent: ListView.isCurrentItem
+
+            onPreviewModelChanged: preview.opacity = 0;
+            onReadyChanged: if (ready) fadeIn.start()
+//            onClose: {
+//                previewListView.open = false
+//            }
 
             PropertyAnimation {
                 id: fadeIn
-                target: previewLoader
+                target: preview
                 property: "opacity"
                 from: 0.0
                 to: 1.0
                 duration: UbuntuAnimation.BriskDuration
             }
 
-            property var previewData
-            property bool valid: item !== null
-
-            onLoaded: {
-                if (previewListView.onScreen && previewData !== undefined) {
-                    item.previewData = Qt.binding(function() { return previewData })
-                    item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
-                }
-            }
-
-            Connections {
-                ignoreUnknownSignals: true
-                target: item
-                onClose: {
-                    previewListView.open = false
-                }
-            }
-
-            function closePreviewSpinner() {
-                if (item) {
-                    item.showProcessingAction = false;
-                }
+            ActivityIndicator {
+                anchors.centerIn: parent
+                running: visible
             }
         }
     }

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2014-02-07 09:57:30 +0000
+++ qml/Dash/Previews/Preview.qml	2014-02-07 16:30:34 +0000
@@ -36,10 +36,14 @@
     //! \brief Should be set to true if this preview is currently displayed.
     property bool isCurrent: false
 
+    //! \brief Will be changed to true when the initial preview widgets are in.
+    property bool ready: false
+
     clip: true
 
     Connections {
-        target: shell.applicationManager
+        target: shell.applicationManager || null
+        ignoreUnknownSignals: true
         onMainStageFocusedApplicationChanged: {
             root.close();
         }
@@ -71,6 +75,7 @@
                 bottomMargin: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
 
                 model: previewModel
+                onCountChanged: if (count > 0) root.ready = true
 
                 Behavior on contentY { UbuntuNumberAnimation { } }
 

=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2014-02-07 09:57:46 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2014-02-07 16:30:34 +0000
@@ -18,7 +18,7 @@
 import QtTest 1.0
 import "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT
-import Unity 0.1 as Unity
+import Unity 0.2 as Unity
 
 Rectangle {
     id: root