Merge lp:~mzanetti/unity8/switching-previews into lp:unity8

[Michael Zanetti]

transform previews to be a list that can be swiped left/right

[lp:~mzanetti/unity8/switching-previews]

340. By Paweł Stołowski on 2013-09-24

Check results model ptr returned by GetResultsFromCategory method from UnityCore. Fixes: https://bugs.launchpad.net/bugs/1211595, https://bugs.launchpad.net/bugs/1228097.

Approved by PS Jenkins bot, Michal Hruby.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:341
http://jenkins.qa.ubuntu.com/job/unity8-ci/1093/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3917
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1492
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1833/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1094
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1094/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3976
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3976/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1494
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1494/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1260
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1271

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/switching-previews]

341. By PS Jenkins bot on 2013-09-24

Releasing 7.81.3+13.10.20130924.2-0ubuntu1 (revision 340 from lp:unity8).

Approved by PS Jenkins bot.

342. By Paweł Stołowski on 2013-09-24

Support canned search queries returned by Home Scope.

Approved by Michał Sawicz, PS Jenkins bot.

343. By Michael Zanetti on 2013-09-24

drop our CrossFadeImage in favor of the SDK one. Fixes: https://bugs.launchpad.net/bugs/1227783.

Approved by Michał Sawicz, PS Jenkins bot.

344. By Michael Terry on 2013-09-24

Only enable the Bottombar when the HUD is available. Fixes: https://bugs.launchpad.net/bugs/1220306.

Approved by Michał Sawicz, PS Jenkins bot.

345. By Michael Terry on 2013-09-25

Increase the "Skip intro" clickable area, making dismissing the edge demo intro feel more natural. Fixes: https://bugs.launchpad.net/bugs/1220632.

Approved by PS Jenkins bot, Michał Sawicz.

346. By Albert Astals Cid on 2013-09-25

Make sure we always have least have one column in the gridview. Fixes: https://bugs.launchpad.net/bugs/1225391.

Approved by PS Jenkins bot, Michał Sawicz.

347. By Albert Astals Cid on 2013-09-25

LVWPH: Make sure we always overshoot vertically. Fixes: https://bugs.launchpad.net/bugs/1229851.

Approved by PS Jenkins bot, Michał Sawicz.

348. By Michal Hruby on 2013-09-25

Correctly handle image URI scheme in results.

Approved by PS Jenkins bot, Michał Sawicz.

349. By Albert Astals Cid on 2013-09-26

Remember the expanded categoryId and not the expanded index

The index can change on search, and we still want to maintain it expanded in that case. Fixes: https://bugs.launchpad.net/bugs/1230216.

Approved by PS Jenkins bot, Michael Zanetti.

350. By Michał Sawicz on 2013-09-26

Make SHOW_DASH and HIDE_DASH close the current preview. Fixes: https://bugs.launchpad.net/bugs/1231404.

Approved by PS Jenkins bot, Michał Sawicz, Diego Sarmentero.

351. By Diego Sarmentero on 2013-09-26

- Handling error signal from the DownloadTracker plugin (BUG: #1229744). Fixes: https://bugs.launchpad.net/bugs/1229744.

Approved by PS Jenkins bot, Michał Sawicz, Roberto Alsina.

352. By Diego Sarmentero on 2013-09-26

- Remove "Reviews and Comments" section from Application Preview until the feature is ready (BUG: #1226632)
- Detect when the keyboard is being shown to allow the user to scroll the Preview even more if necessary to interact with the components at the bottom of that preview, and don't leave those components obscured behind the keyboard (BUG: #1226638). Fixes: https://bugs.launchpad.net/bugs/1224717, https://bugs.launchpad.net/bugs/1226632, https://bugs.launchpad.net/bugs/1226638.

Approved by PS Jenkins bot, Michał Sawicz, Alejandro J. Cura.

353. By Nick Dedekind on 2013-09-26

Brought messaging indicator inline with UnityMenuModel & UnityMenuAction. Fixes: https://bugs.launchpad.net/bugs/1217676, https://bugs.launchpad.net/bugs/1217678.

Approved by PS Jenkins bot, Michael Zanetti.

354. By Albert Astals Cid on 2013-09-26

Fix showHeader in an edge case of notShownByItsOwn

Not all the tests i've added fail without the code fix, but i've added them just to be more covered
. Fixes: https://bugs.launchpad.net/bugs/1230187.

Approved by PS Jenkins bot, Michał Sawicz.

355. By Launchpad Translations on behalf of unity-team on 2013-09-27

Launchpad automatic translations update.

356. By Michał Sawicz on 2013-09-27

Add a LazyImage component that shows an activity spinner for long-loading images and handles aspect ratio properly.

Approved by PS Jenkins bot, Michael Zanetti.

357. By Michał Sawicz on 2013-09-27

Fix Qt 5.1 FTBFS and suppress some build warnings.

Approved by PS Jenkins bot, Michael Zanetti.

358. By Paweł Stołowski on 2013-09-27

Cancel previous actions and previews on new activation / preview. Expose previewed data row in Preview object.

Approved by PS Jenkins bot, Michal Hruby, Michał Sawicz.

359. By PS Jenkins bot on 2013-09-27

Releasing 7.81.3+13.10.20130927.3-0ubuntu1 (revision 358 from lp:unity8).

Approved by PS Jenkins bot.

360. By Launchpad Translations on behalf of unity-team on 2013-09-29

Launchpad automatic translations update.

361. By Launchpad Translations on behalf of unity-team on 2013-09-30

Launchpad automatic translations update.

362. By Michael Zanetti on 2013-09-30

reset after completely messing up merging

363. By Michael Zanetti on 2013-10-01

merge trunk

364. By Michael Zanetti on 2013-10-01

cancel any pending preview activations when closing the preview

365. By Michael Zanetti on 2013-10-02

also cancel any pending actions

366. By Michael Zanetti on 2013-10-02

move the openeffect position around instead of overscroll the listview
don't try to cancel any previewActions if the preview hasn't been loaded yet

367. By Michael Zanetti on 2013-10-04

properly fixed the carousel

368. By Michael Zanetti on 2013-10-04

that shouldn't have gone in

369. By Michael Zanetti on 2013-10-04

merge trunk

370. By Michael Zanetti on 2013-10-04

merge with prerequisite branch

371. By Michael Zanetti on 2013-10-04

cleanup

Unmerged revisions

=== modified file 'Components/Carousel.qml'
--- Components/Carousel.qml	2013-07-17 16:27:23 +0000
+++ Components/Carousel.qml	2013-09-24 11:40:47 +0000
@@ -48,15 +48,15 @@
 
     /// Emitted when the user clicked on an item
     /// @param index is the index of the clicked item
-    /// @param delegateItem is the clicked component/delegate itself
+    /// @param model is the model of all the items in the carousel
     /// @param itemY is y of the clicked delegate
-    signal clicked(int index, var delegateItem, real itemY)
+    signal clicked(int index, var model, real itemY)
 
     /// Emitted when the user pressed and held on an item
     /// @param index is the index of the held item
-    /// @param delegateItem is the held component/delegate itself
+    /// @param model is the model of all the items in the carousel
     /// @param itemY is y of the held delegate
-    signal pressAndHold(int index, var delegateItem, real itemY)
+    signal pressAndHold(int index, var model, real itemY)
 
     implicitHeight: listView.tileHeight * selectedItemScaleFactor
 
@@ -154,7 +154,7 @@
                 /* We're clicking the selected item and
                    we're in the neighbourhood of radius 1 pixel from it.
                    Let's emit the clicked signal. */
-                carousel.clicked(index, delegateItem, delegateItem.y)
+                carousel.clicked(index, listView.model, delegateItem.y)
                 return
             }
 
@@ -178,7 +178,7 @@
                 /* We're pressAndHold the selected item and
                    we're in the neighbourhood of radius 1 pixel from it.
                    Let's emit the pressAndHold signal. */
-                carousel.pressAndHold(index, delegateItem, delegateItem.y);
+                carousel.pressAndHold(index, listView.model, delegateItem.y);
                 return;
             }
 

=== modified file 'Dash/Apps/AppPreview.qml'
--- Dash/Apps/AppPreview.qml	2013-09-05 10:02:00 +0000
+++ Dash/Apps/AppPreview.qml	2013-09-24 11:40:47 +0000
@@ -39,6 +39,15 @@
         }
         model: previewData.infoMap["more-screenshots"] != null ? previewData.infoMap["more-screenshots"].value : [previewData.image]
 
+        // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)
+        // we finally reached the point where this ListView doesn't correctly get swipe input any more but
+        // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking
+        // layer to make sure this ListView can be swiped, regardless of what's behind it.
+        MouseArea {
+            anchors.fill: parent
+            enabled: parent.contentWidth > parent.width
+        }
+
         delegate: UbuntuShape {
             id: shape
             anchors {

=== modified file 'Dash/DashPreview.qml'
--- Dash/DashPreview.qml	2013-08-09 09:48:56 +0000
+++ Dash/DashPreview.qml	2013-09-24 11:40:47 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-Rectangle {
+Item {
     id: root
 
     property var previewData
@@ -35,7 +35,6 @@
     signal close()
     signal previewImageClicked()
 
-    color: Qt.rgba(0, 0, 0, .3)
     clip: true
 
     Connections {
@@ -110,6 +109,7 @@
                     left: parent.left
                     leftMargin: title.paintedWidth + labelItem.spacing
                 }
+                visible: title.text !== ""
             }
         }
     }

=== added file 'Dash/DashPreviewPlaceholder.qml'
--- Dash/DashPreviewPlaceholder.qml	1970-01-01 00:00:00 +0000
+++ Dash/DashPreviewPlaceholder.qml	2013-09-24 11:40:47 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+DashPreview {
+    ActivityIndicator {
+        anchors.centerIn: parent
+        running: true
+    }
+}

=== modified file 'Dash/Generic/GenericFilterGrid.qml'
--- Dash/Generic/GenericFilterGrid.qml	2013-09-05 10:02:00 +0000
+++ Dash/Generic/GenericFilterGrid.qml	2013-09-24 11:40:47 +0000
@@ -28,8 +28,8 @@
     property int iconWidth: units.gu(8)
     property int iconHeight: units.gu(7.5)
 
-    signal clicked(int index, var delegateItem, real itemY)
-    signal pressAndHold(int index, var delegateItem, real itemY)
+    signal clicked(int index, var model, real itemY)
+    signal pressAndHold(int index, var model, real itemY)
 
     delegate: Tile {
         id: tile
@@ -45,13 +45,11 @@
         fillMode: Image.PreserveAspectCrop
 
         onClicked: {
-            var data = { model: model }
-            filtergrid.clicked(index, data, tile.y)
+            filtergrid.clicked(index, filtergrid.model, tile.y)
         }
 
         onPressAndHold: {
-            var data = { model: model }
-            filtergrid.pressAndHold(index, data, tile.y)
+            filtergrid.pressAndHold(index, filtergrid.model, tile.y)
         }
     }
 }

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-09-18 14:41:34 +0000
+++ Dash/GenericScopeView.qml	2013-09-24 11:40:47 +0000
@@ -21,11 +21,11 @@
 
 ScopeView {
     id: scopeView
-    readonly property alias previewShown: previewLoader.onScreen
+    readonly property alias previewShown: previewListView.onScreen
 
     onIsCurrentChanged: {
         pageHeader.resetSearch();
-        previewLoader.open = false;
+        previewListView.open = false;
     }
 
     onMovementStarted: categoryView.showHeader()
@@ -48,7 +48,7 @@
         id: categoryView
         anchors.fill: parent
         model: scopeView.categories
-        forceNoClip: previewLoader.onScreen
+        forceNoClip: previewListView.onScreen
 
         onAtYEndChanged: if (atYEnd) endReached()
         onMovingChanged: if (moving && atYEnd) endReached()
@@ -91,28 +91,56 @@
                 Connections {
                     target: rendererLoader.item
                     onClicked: {
+                        // Prepare the preview in case activate() triggers a preview only
                         effect.positionPx = mapToItem(categoryView, 0, itemY).y
-                        scopeView.scope.activate(delegateItem.model.uri,
-                                                 delegateItem.model.icon,
-                                                 delegateItem.model.category,
-                                                 0,
-                                                 delegateItem.model.mimetype,
-                                                 delegateItem.model.title,
-                                                 delegateItem.model.comment,
-                                                 delegateItem.model.dndUri,
-                                                 delegateItem.model.metadata)
+                        previewListView.model = model;
+                        previewListView.init = true;
+                        previewListView.currentIndex = index;
+
+                        var item = model.get(index);
+
+                        if ((scopeView.scope.id == "applications.scope" && categoryId == "installed")
+                                || (scopeView.scope.id == "home.scope" && categoryId == "applications.scope")) {
+                            scopeView.scope.activate(item.uri,
+                                                     item.icon,
+                                                     item.category,
+                                                     0,
+                                                     item.mimetype,
+                                                     item.title,
+                                                     item.comment,
+                                                     item.dndUri,
+                                                     item.metadata)
+                        } else {
+                            previewListView.open = true
+
+                            scopeView.scope.preview( item.uri,
+                                                     item.icon,
+                                                     item.category,
+                                                     0,
+                                                     item.mimetype,
+                                                     item.title,
+                                                     item.comment,
+                                                     item.dndUri,
+                                                     item.metadata)
+                        }
                     }
                     onPressAndHold: {
                         effect.positionPx = mapToItem(categoryView, 0, itemY).y
-                        scopeView.scope.preview( delegateItem.model.uri,
-                                                 delegateItem.model.icon,
-                                                 delegateItem.model.category,
+                        previewListView.model = model;
+                        previewListView.open = true
+                        previewListView.init = true;
+                        previewListView.currentIndex = index;
+
+                        var item = model.get(index)
+                        scopeView.scope.preview( item.uri,
+                                                 item.icon,
+                                                 item.category,
                                                  0,
-                                                 delegateItem.model.mimetype,
-                                                 delegateItem.model.title,
-                                                 delegateItem.model.comment,
-                                                 delegateItem.model.dndUri,
-                                                 delegateItem.model.metadata)
+                                                 item.mimetype,
+                                                 item.title,
+                                                 item.comment,
+                                                 item.dndUri,
+                                                 item.metadata)
                     }
                 }
                 Connections {
@@ -212,15 +240,15 @@
         bottomOpacity: 1 - (gap * 0.8)
 
         property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
-        property real gap: previewLoader.open ? 1.0 : 0.0
+        property real gap: previewListView.open ? 1.0 : 0.0
 
         Behavior on gap {
             NumberAnimation {
                 duration: 200
                 easing.type: Easing.InOutQuad
                 onRunningChanged: {
-                    if (!previewLoader.open && !running) {
-                        previewLoader.onScreen = false
+                    if (!previewListView.open && !running) {
+                        previewListView.onScreen = false
                     }
                 }
             }
@@ -230,8 +258,18 @@
     Connections {
         target: scopeView.scope
         onPreviewReady: {
-            previewLoader.previewData = preview
-            previewLoader.open = true
+            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
         }
     }
 
@@ -239,18 +277,9 @@
         id: previewDelegateMapper
     }
 
-    Connections {
-        ignoreUnknownSignals: true
-        target: previewLoader.valid ? previewLoader.item : null
-        onClose: {
-            previewLoader.open = false
-        }
-    }
-
-    Loader {
-        objectName: "previewLoader"
-        id: previewLoader
-        property var previewData
+    ListView  {
+        id: previewListView
+        objectName: "previewListView"
         height: effect.bottomGapPx - effect.topGapPx
         anchors {
             top: parent.top
@@ -258,32 +287,81 @@
             left: parent.left
             right: parent.right
         }
-        source: onScreen ? previewDelegateMapper.map(previewLoader.previewData.rendererName) : ""
+        orientation: ListView.Horizontal
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        snapMode: ListView.SnapOneItem
+
+        // because the ListView is built asynchronous, setting the
+        // currentIndex directly won't work. We need to refresh it
+        // when the first preview is ready to be displayed.
+        property bool init: true
+
+        onCurrentIndexChanged: {
+            if (!init && model !== undefined) {
+                var item = model.get(currentIndex)
+                scopeView.scope.preview( item.uri,
+                                         item.icon,
+                                         item.category,
+                                         0,
+                                         item.mimetype,
+                                         item.title,
+                                         item.comment,
+                                         item.dndUri,
+                                         item.metadata)
+            }
+        }
 
         property bool open: false
         property bool onScreen: false
-        property bool valid: item !== null
 
         onOpenChanged: {
             if (open) {
                 onScreen = true
-            }
-        }
-
-        onLoaded: {
-            item.previewData = Qt.binding(function() { return previewLoader.previewData })
+            } else {
+                model = undefined
+            }
+        }
+
+        Rectangle {
+            anchors.fill: parent
+            color: Qt.rgba(0, 0, 0, .3)
+        }
+
+        delegate: Loader {
+            objectName: "previewLoader"
+            height: previewListView.height
+            width: previewListView.width
+            source: previewListView.onScreen ?
+                         (previewData !== undefined ? previewDelegateMapper.map(previewData.rendererName) : "DashPreviewPlaceholder.qml") : ""
+
+            property var previewData
+            property bool valid: item !== null
+
+            onLoaded: {
+                if (previewListView.onScreen && previewData !== undefined) {
+                    item.previewData = Qt.binding(function() { return previewData })
+                }
+            }
+
+            Connections {
+                ignoreUnknownSignals: true
+                target: item
+                onClose: {
+                    previewListView.open = false
+                }
+            }
         }
     }
 
     // TODO: Move as InverseMouseArea to DashPreview
     MouseArea {
-        enabled: previewLoader.onScreen
+        enabled: previewListView.onScreen
         anchors {
             fill: parent
             topMargin: effect.bottomGapPx
         }
         onClicked: {
-            previewLoader.open = false;
+            previewListView.open = false;
         }
     }
 }

=== modified file 'Dash/SearchableResultModel.qml'
--- Dash/SearchableResultModel.qml	2013-08-14 12:19:25 +0000
+++ Dash/SearchableResultModel.qml	2013-09-24 11:40:47 +0000
@@ -25,6 +25,10 @@
 
     filterRole: CategoryResults.RoleTitle
 
+    function get(index) {
+        return model.get(mapToSource(index))
+    }
+
     onSearchQueryChanged: {
         if (searchQuery.length == 0) {
             filterRegExp = RegExp("");

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2013-09-17 16:40:27 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2013-09-24 11:40:47 +0000
@@ -44,10 +44,10 @@
 
             function test_isCurrent() {
                 var pageHeader = findChild(genericScopeView, "pageHeader");
-                var previewLoader = findChild(genericScopeView, "previewLoader");
+                var previewListView = findChild(genericScopeView, "previewListView");
                 genericScopeView.isCurrent = true
                 pageHeader.searchQuery = "test"
-                previewLoader.open = true
+                previewListView.open = true
                 genericScopeView.isCurrent = false
                 tryCompare(pageHeader, "searchQuery", "")
                 tryCompare(genericScopeView, "previewShown", false);