Merge lp:~aacid/unity/remove_qsortfilterproxymodelqml_get into lp:unity/phablet

[Albert Astals Cid]

Remove ::get() in qsortfilterproxymodelqml

Using ::get() means that all the data of the model for a given row is obtained which in most of the cases is unnecessary and in some could mean getting expensive data. This data should be somewhere in the QML already so we should use that and not re-query it again

The new if in DashVideos.qml is a bit ugly, but if we don't want that it'll require a bit of surgery at the Carousel level, that given that we plan to use the Listview'ed one "soon" i'd prefer not to do at the moment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/868/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/744
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/744/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/748

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/868/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Please fix the comment re: the function - it did work, but wasn't called in correct places. Since we're switching to smart scopes soon, this will no longer be there anyway. So maybe we just drop it altogether already?

Please also add a comment to the commit message as to why we're removing the ::get().

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/870/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/746
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/750

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/870/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'Dash/Dash.qml'
--- Dash/Dash.qml	2013-02-27 17:36:32 +0000
+++ Dash/Dash.qml	2013-05-08 13:31:29 +0000
@@ -30,21 +30,6 @@
     width: units.gu(40)
     height: units.gu(71)
 
-    function updateLensesViewType(currentLensIndex, homeLensSelected) {
-        /* Lens.viewType need to be set for all lenses when switching lenses.
-           If showing the home lens, viewType must be set to "HomeView",
-           otherwise viewType must be set to "Hidden" for the non current lenses.
-        */
-        for (var i=0; i<filteredLenses.count; i++) {
-            var lens = filteredLenses.get(i)
-            if (homeLensSelected) {
-                lens.viewType = (i === currentLensIndex) ? Lens.LensView : Lens.HomeView
-            } else {
-                lens.viewType = (i === currentLensIndex) ? Lens.LensView : Lens.Hidden
-            }
-        }
-    }
-
     function setCurrentLens(lensId, animate, reset) {
         var lensIndex = filteredLenses.findFirst(Lenses.RoleId, lensId)
 
@@ -58,7 +43,6 @@
             return
         }
 
-        updateLensesViewType(lensIndex, (lensId == "home.lens"))
         dashContent.setCurrentLensAtIndex(lensIndex, animate, reset)
     }
 

=== modified file 'Dash/DashHome.qml'
--- Dash/DashHome.qml	2013-04-16 09:32:38 +0000
+++ Dash/DashHome.qml	2013-05-08 13:31:29 +0000
@@ -156,10 +156,9 @@
                     //FIXME: workaround for lack of previews for videos in Home lens.
                     //Need to connect to the clicked() signal here and act upon it here instead.
                     if (component === "VideosGrid") {
-                        function playVideo(index) {
-                            var video = item.model.get(index);
-                            if (video && video.fileName) {
-                                shell.activateApplication('/usr/share/applications/media-player.desktop', "/usr/share/demo-assets/videos/" + video.fileName);
+                        function playVideo(index, data) {
+                            if (data.fileUri) {
+                                shell.activateApplication('/usr/share/applications/media-player.desktop', "/usr/share/demo-assets/videos/" + data.fileUri);
                             }
                         }
 

=== modified file 'Dash/DashVideos.qml'
--- Dash/DashVideos.qml	2013-04-29 23:47:43 +0000
+++ Dash/DashVideos.qml	2013-05-08 13:31:29 +0000
@@ -117,9 +117,17 @@
                 Connections {
                     target: loader.item
                     onClicked: {
-                        var item = loader.item.model.get(index)
-                        if (item.column_5 != "") {
-                            previewLoader.videoItem = loader.item.model.get(index);
+                        var dataItem;
+                        // VideosCarousel and VideosFilterGrid have different
+                        // clicked signals, accomodate for that
+                        if (categoryId == 0) {
+                            var fileUri = delegateItem.model.column_0.replace(/^[^:]+:/, "")
+                            dataItem = {fileUri: fileUri, nfoUri: delegateItem.model.column_5}
+                        } else {
+                            dataItem = data;
+                        }
+                        if (dataItem.nfoUri != "") {
+                            previewLoader.videoData = dataItem;
                             previewLoader.open = true;
                             effect.positionPx = mapToItem(categoryView, 0, itemY).y;
                         }
@@ -156,7 +164,7 @@
 
         property bool open: false
         property bool onScreen: false
-        property var videoItem
+        property var videoData
 
 
         onOpenChanged: {
@@ -166,7 +174,7 @@
         }
 
         onLoaded: {
-            item.item = videoItem;
+            item.item = videoData;
         }
     }
 

=== modified file 'Dash/Video/VideoPreview.qml'
--- Dash/Video/VideoPreview.qml	2013-02-27 17:20:00 +0000
+++ Dash/Video/VideoPreview.qml	2013-05-08 13:31:29 +0000
@@ -24,15 +24,15 @@
 
     property var item
     property alias ready: nfo.ready
-    property url fileUri: item ? item.column_0.replace(/^[^:]+:/, "") : ""
+    readonly property url fileUri: item ? item.fileUri : ""
 
     VideoInfo {
         id: nfo
-        source: item ? item.column_5 : ""
+        source: item ? item.nfoUri : ""
     }
 
     title: nfo.ready ? nfo.video.title : ""
-    url: item ? item.column_5.replace(/\.nfo$/, "-fanart.jpg") : ""
+    url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""
     previewWidthRatio: 0.6
     playable: fileUri != ""
 

=== modified file 'Dash/Video/VideosFilterGrid.qml'
--- Dash/Video/VideosFilterGrid.qml	2013-04-22 10:10:47 +0000
+++ Dash/Video/VideosFilterGrid.qml	2013-05-08 13:31:29 +0000
@@ -30,7 +30,7 @@
     readonly property int iconWidth: (width / columns) * 0.8
     readonly property int iconHeight: iconWidth * 16 / 11
 
-    signal clicked(int index, real itemY)
+    signal clicked(int index, var data, real itemY)
 
     delegate: Tile {
         id: tile
@@ -43,7 +43,9 @@
         source: model.column_1
         fillMode: Image.PreserveAspectCrop
         onClicked: {
-            filtergrid.clicked(index, tile.y);
+            var fileUri = model.column_0.replace(/^[^:]+:/, "")
+            var data = {fileUri: fileUri, nfoUri: model.column_5}
+            filtergrid.clicked(index, data, tile.y);
         }
     }
 }

=== modified file 'plugins/Utils/qsortfilterproxymodelqml.cpp'
--- plugins/Utils/qsortfilterproxymodelqml.cpp	2013-05-08 13:24:15 +0000
+++ plugins/Utils/qsortfilterproxymodelqml.cpp	2013-05-08 13:31:29 +0000
@@ -57,23 +57,6 @@
     }
 }
 
-QVariantMap
-QSortFilterProxyModelQML::get(int row)
-{
-    if (sourceModel() == NULL) {
-        return QVariantMap();
-    }
-
-    const QModelIndex modelIndex = index(row, 0);
-    QVariantMap result;
-    QHashIterator<int, QByteArray> i(roleNames());
-    while (i.hasNext()) {
-        i.next();
-        result[i.value()] = modelIndex.data(i.key());
-    }
-    return result;
-}
-
 int
 QSortFilterProxyModelQML::totalCount() const
 {

=== modified file 'plugins/Utils/qsortfilterproxymodelqml.h'
--- plugins/Utils/qsortfilterproxymodelqml.h	2013-04-16 15:54:41 +0000
+++ plugins/Utils/qsortfilterproxymodelqml.h	2013-05-08 13:31:29 +0000
@@ -31,7 +31,6 @@
 public:
     explicit QSortFilterProxyModelQML(QObject *parent = 0);
 
-    Q_INVOKABLE QVariantMap get(int row);
     Q_INVOKABLE int count();
     Q_INVOKABLE int findFirst(int role, const QVariant& value) const;
     virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;