Merge lp:~unity-team/unity8/music-video_renderers into lp:unity8

[Andrea Cimitan]

Add music and video renderers

Add music and video renderers

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/unity8-ci/1334/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4840/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2702
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1334
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1334/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1333
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1018/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2704/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2252

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1334/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/music-video_renderers]

410. By Andrea Cimitan on 2013-10-09

Should fix the test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:410
http://jenkins.qa.ubuntu.com/job/unity8-ci/1341/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4857/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2723
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1341
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1340
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1036/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2725
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2725/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2272

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1341/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I'm a little worried about how much copied but yet different the code seems to be, i.e. MusicTileStyle and VideoTileStyle labels are "almost" the same but one of them is eliding right and the other center, and of them is bold and the other is not.
Also the icon elements are very similar but not enterily.

Is there no way we can actually reuse most of the stuff here instead of copy&pasting and changing a few lines? Otherwise when we decide leftMargin: units.gu(1) has to be leftMargin: units.gu(2) for a Label or something it's going to be a pain having to find out all the places it was copied and pasted.

[lp:~unity-team/unity8/music-video_renderers]

411. By Andrea Cimitan on 2013-10-10

Should work better on tablet

412. By Andrea Cimitan on 2013-10-10

Deal with wrap

[Albert Astals Cid (aacid)]

Been told we'll have a second look after the freeze to try to address my comments, so Ok i guess

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/unity8-ci/1347/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4889
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2763
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1347
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2765
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2765/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2300
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2315

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1347/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'Components/Tile.qml'
--- Components/Tile.qml	2013-10-10 10:20:52 +0000
+++ Components/Tile.qml	2013-10-10 10:20:52 +0000
@@ -20,8 +20,7 @@
 AbstractButton {
     property url source
     property int fillMode: Image.PreserveAspectCrop
-    property int horizontalAlignment: Image.AlignHCenter
-    property int verticalAlignment: Image.AlignVCenter
+    property int horizontalAlignment: Text.AlignHCenter
     property string text
     property int imageWidth
     property int imageHeight

=== modified file 'Components/TileStyle.qml'
--- Components/TileStyle.qml	2013-10-10 10:20:52 +0000
+++ Components/TileStyle.qml	2013-10-10 10:20:52 +0000
@@ -39,8 +39,8 @@
             cache: false
             source: styledItem.source
             fillMode: styledItem.fillMode
-            horizontalAlignment: styledItem.horizontalAlignment
-            verticalAlignment: styledItem.verticalAlignment
+            horizontalAlignment: Image.AlignHCenter
+            verticalAlignment: Image.AlignVCenter
         }
     }
 
@@ -73,8 +73,9 @@
         styleColor: "black"
         fontSize: "small"
         elide: Text.ElideMiddle
-        horizontalAlignment: Text.AlignHCenter
+        horizontalAlignment: styledItem.horizontalAlignment
         text: styledItem.text
+        wrapMode: Text.Wrap
         maximumLineCount: styledItem.maximumLineCount
     }
 }

=== modified file 'Dash/Generic/FlatTileStyle.qml'
--- Dash/Generic/FlatTileStyle.qml	2013-10-10 10:20:52 +0000
+++ Dash/Generic/FlatTileStyle.qml	2013-10-10 10:20:52 +0000
@@ -38,8 +38,8 @@
         source: styledItem.source
         fillMode: styledItem.fillMode
         opacity: tile.disabled ? 0.3 : 1.0
-        horizontalAlignment: styledItem.horizontalAlignment
-        verticalAlignment: styledItem.verticalAlignment
+        horizontalAlignment: Image.AlignHCenter
+        verticalAlignment: Image.AlignVCenter
     }
 
     UbuntuShape {
@@ -71,8 +71,9 @@
         styleColor: "black"
         fontSize: "small"
         elide: Text.ElideMiddle
-        horizontalAlignment: Text.AlignHCenter
+        horizontalAlignment: styledItem.horizontalAlignment
         text: styledItem.text
+        wrapMode: Text.Wrap
         maximumLineCount: styledItem.maximumLineCount
     }
 }

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-10-10 10:20:52 +0000
+++ Dash/GenericScopeView.qml	2013-10-10 10:20:52 +0000
@@ -208,7 +208,7 @@
         switch (rendererId) {
             case "grid": {
                 switch (contentType) {
-                    case "video": return "Generic/GenericFilterGridPotrait.qml";
+                    case "video": return "Video/VideoFilterGrid.qml";
                     case "music": return "Music/MusicFilterGrid.qml";
                     case "apps": {
                         if (rendererHint == "toggled")

=== modified file 'Dash/Music/MusicFilterGrid.qml'
--- Dash/Music/MusicFilterGrid.qml	2013-09-23 09:44:04 +0000
+++ Dash/Music/MusicFilterGrid.qml	2013-10-10 10:20:52 +0000
@@ -16,42 +16,41 @@
 
 import QtQuick 2.0
 import "../../Components"
-
-FilterGrid {
-    id: filterGrid
-
-    minimumHorizontalSpacing: units.gu(2)
-    maximumNumberOfColumns: 5
-    delegateWidth: units.gu(17)
-    delegateHeight: iconHeight + units.gu(3.5)
-    verticalSpacing: units.gu(2)
-
-    readonly property int iconWidth: (width / columns) * 0.8
-    readonly property int iconHeight: iconWidth
-
-    signal clicked(int index, var delegateItem, real itemY)
-    signal pressAndHold(int index, var delegateItem, real itemY)
-
-    delegate: AlbumTile {
+import "../Generic"
+
+GenericFilterGrid {
+    id: filtergrid
+
+    delegateWidth: units.gu(11)
+    delegateHeight: units.gu(16)
+
+    iconWidth: units.gu(11)
+    iconHeight: units.gu(11)
+
+    delegate: Tile {
         id: tile
         objectName: "delegate" + index
-        width: filterGrid.cellWidth
-        height: filterGrid.cellHeight
-        iconWidth: filterGrid.iconWidth
-        iconHeight: filterGrid.iconHeight
-
-        artist: model.title
-        album: model.comment
+        width: filtergrid.cellWidth
+        height: filtergrid.cellHeight
+        text: model.comment
+        imageWidth: filtergrid.iconWidth
+        imageHeight: filtergrid.iconHeight
         source: model.icon
+        maximumLineCount: 2
+        horizontalAlignment: Text.AlignLeft
+
+        style: MusicTileStyle {
+            artist: model.title
+        }
 
         onClicked: {
             var data = { model: model }
-            filterGrid.clicked(index, data, tile.y)
+            filtergrid.clicked(index, data, tile.y)
         }
 
         onPressAndHold: {
             var data = { model: model }
-            filterGrid.pressAndHold(index, data, tile.y)
+            filtergrid.pressAndHold(index, data, tile.y)
         }
     }
 }

=== added file 'Dash/Music/MusicTileStyle.qml'
--- Dash/Music/MusicTileStyle.qml	1970-01-01 00:00:00 +0000
+++ Dash/Music/MusicTileStyle.qml	2013-10-10 10:20:52 +0000
@@ -0,0 +1,101 @@
+/*
+ * 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
+
+Item {
+    id: tile
+
+    property alias artist: artistLabel.text
+
+    anchors.fill: parent
+
+    UbuntuShape {
+        id: icon
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+        radius: "medium"
+        width: styledItem.imageWidth
+        height: styledItem.imageHeight
+        image: Image {
+            id: image
+            objectName: "image"
+            sourceSize { width: icon.width; height: icon.height }
+            asynchronous: true
+            cache: false
+            source: styledItem.source
+            fillMode: styledItem.fillMode
+            horizontalAlignment: Image.AlignHCenter
+            verticalAlignment: Image.AlignVCenter
+        }
+    }
+
+    UbuntuShape {
+        id: borderPressed
+        objectName: "borderPressed"
+
+        anchors.fill: icon
+        radius: "medium"
+        borderSource: "radius_pressed.sci"
+        opacity: styledItem.pressed ? 1.0 : 0.0
+        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
+    }
+
+    Label {
+        id: label
+        objectName: "label"
+        anchors {
+            baseline: icon.bottom
+            baselineOffset: units.gu(2)
+            left: icon.left
+            right: parent.right
+            rightMargin: units.gu(1)
+        }
+
+        color: Theme.palette.selected.backgroundText
+        opacity: 0.9
+        style: Text.Raised
+        styleColor: "black"
+        fontSize: "small"
+        font.weight: Font.Bold
+        elide: Text.ElideRight
+        horizontalAlignment: styledItem.horizontalAlignment
+        text: styledItem.text
+        wrapMode: Text.Wrap
+        maximumLineCount: styledItem.maximumLineCount
+    }
+
+    Label {
+        id: artistLabel
+        anchors {
+            top: label.bottom
+            left: label.left
+            right: label.right
+            rightMargin: units.gu(1)
+        }
+
+        color: Theme.palette.selected.backgroundText
+        opacity: 0.9
+        style: Text.Raised
+        styleColor: "black"
+        fontSize: "x-small"
+        elide: Text.ElideMiddle
+        horizontalAlignment: styledItem.horizontalAlignment
+    }
+}

=== renamed file 'Dash/Video/VideosFilterGrid.qml' => 'Dash/Video/VideoFilterGrid.qml'
--- Dash/Video/VideosFilterGrid.qml	2013-08-02 14:44:55 +0000
+++ Dash/Video/VideoFilterGrid.qml	2013-10-10 10:20:52 +0000
@@ -16,20 +16,16 @@
 
 import QtQuick 2.0
 import "../../Components"
+import "../Generic"
 
-FilterGrid {
+GenericFilterGrid {
     id: filtergrid
 
-    minimumHorizontalSpacing: units.gu(0.5)
-    maximumNumberOfColumns: 5
     delegateWidth: units.gu(11)
-    delegateHeight: iconHeight + units.gu(2.5)
-    verticalSpacing: units.gu(2)
-
-    readonly property int iconWidth: (width / columns) * 0.8
-    readonly property int iconHeight: iconWidth * 16 / 11
-
-    signal clicked(int index, var data, real itemY)
+    delegateHeight: units.gu(15)
+
+    iconWidth: units.gu(11)
+    iconHeight: units.gu(11)
 
     delegate: Tile {
         id: tile
@@ -40,11 +36,19 @@
         imageWidth: filtergrid.iconWidth
         imageHeight: filtergrid.iconHeight
         source: model.icon
-        fillMode: Image.PreserveAspectCrop
+        maximumLineCount: 2
+        horizontalAlignment: Text.AlignLeft
+
+        style: VideoTileStyle {}
+
         onClicked: {
-            var fileUri = model.uri.replace(/^[^:]+:/, "")
-            var data = {fileUri: fileUri, nfoUri: model.comment}
-            filtergrid.clicked(index, data, tile.y);
+            var data = { model: model }
+            filtergrid.clicked(index, data, tile.y)
+        }
+
+        onPressAndHold: {
+            var data = { model: model }
+            filtergrid.pressAndHold(index, data, tile.y)
         }
     }
 }

=== added file 'Dash/Video/VideoTileStyle.qml'
--- Dash/Video/VideoTileStyle.qml	1970-01-01 00:00:00 +0000
+++ Dash/Video/VideoTileStyle.qml	2013-10-10 10:20:52 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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
+
+Item {
+    id: tile
+
+    anchors.fill: parent
+
+    Image {
+        id: icon
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: styledItem.imageWidth
+        height: styledItem.imageHeight
+        source: "graphics/movie_icon_holder.png"
+
+        Image {
+            id: image
+            objectName: "image"
+            anchors {
+                fill: parent;
+                topMargin: units.gu(2);
+                bottomMargin: units.gu(2)
+            }
+            sourceSize { width: icon.width; height: icon.height }
+            asynchronous: true
+            cache: false
+            source: styledItem.source
+            fillMode: styledItem.fillMode
+            horizontalAlignment: Image.AlignHCenter
+            verticalAlignment: Image.AlignVCenter
+        }
+    }
+
+    UbuntuShape {
+        id: borderPressed
+        objectName: "borderPressed"
+
+        anchors.fill: icon
+        radius: "medium"
+        borderSource: "radius_pressed.sci"
+        opacity: styledItem.pressed ? 1.0 : 0.0
+        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
+    }
+
+    Label {
+        id: label
+        objectName: "label"
+        anchors {
+            baseline: icon.bottom
+            baselineOffset: units.gu(2)
+            left: icon.left
+            right: parent.right
+            rightMargin: units.gu(1)
+        }
+
+        color: Theme.palette.selected.backgroundText
+        opacity: 0.9
+        style: Text.Raised
+        styleColor: "black"
+        fontSize: "small"
+        elide: Text.ElideRight
+        horizontalAlignment: styledItem.horizontalAlignment
+        text: styledItem.text
+        wrapMode: Text.Wrap
+        maximumLineCount: styledItem.maximumLineCount
+    }
+}

=== added file 'Dash/Video/graphics/[e-mail]'
Binary files Dash/Video/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Dash/Video/graphics/[e-mail]	2013-10-10 10:20:52 +0000 differ
=== modified file 'tests/qmltests/Dash/tst_FilterGrids.qml'
--- tests/qmltests/Dash/tst_FilterGrids.qml	2013-08-02 11:08:42 +0000
+++ tests/qmltests/Dash/tst_FilterGrids.qml	2013-10-10 10:20:52 +0000
@@ -107,7 +107,7 @@
 
         function test_clicked_signal_data() {
             return [
-                {tag: "VideosFilterGrid", component: "Video/VideosFilterGrid.qml"},
+                {tag: "VideoFilterGrid", component: "Video/VideoFilterGrid.qml"},
                 {tag: "MusicFilterGrid", component: "Music/MusicFilterGrid.qml"},
                 {tag: "ApplicationsFilterGrid", component: "Apps/ApplicationsFilterGrid.qml"}
             ]