Merge lp:~saviq/unity8/dash-horizontal-list into lp:unity8

[Michał Sawicz]

Add new horizontal list category layout.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

 * Did you make sure that your branch does not contain spurious tags?
Yes.

 * 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?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1140
http://jenkins.qa.ubuntu.com/job/unity8-ci/3851/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3301
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/853/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/945
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/945
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/945/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/945
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4546
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11237

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

review: Needs Fixing (continuous-integration)

[Chris Wayne (cwayne)]

FWIW tried this out locally, seemed to do exactly what I expected (although it didn't have overview merged yet at the time)

[Andrea Cimitan (cimi)]

Few inline

review: Needs Fixing

[lp:~saviq/unity8/dash-horizontal-list]

1141. By Michał Sawicz on 2014-08-13

Merge trunk.

1142. By Michał Sawicz on 2014-08-13

Bump imports.

[Andrea Cimitan (cimi)]

review: Approve

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes
 * Did CI run pass? If not, please explain why.
Waiting CI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1142
http://jenkins.qa.ubuntu.com/job/unity8-ci/3888/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/888/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/982
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/982/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/982
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3388/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4732/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== added file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/CardHorizontalList.qml	2014-08-13 15:33:58 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 1.1
+import "../Components"
+
+DashRenderer {
+    id: root
+
+    expandedHeight: cardTool.cardHeight + units.gu(2)
+    collapsedHeight: expandedHeight
+    clip: true
+
+    ListView {
+        id: listView
+        anchors {
+            fill: parent
+            margins: units.gu(1)
+            rightMargin: 0
+        }
+        rightMargin: units.gu(1)
+        spacing: units.gu(1)
+        model: root.model
+        orientation: ListView.Horizontal
+
+        delegate: Loader {
+            id: loader
+            sourceComponent: cardTool.cardComponent
+            anchors { top: parent.top; bottom: parent.bottom }
+            width: cardTool.cardWidth
+            onLoaded: {
+                item.objectName = "delegate" + index;
+                item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
+                item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
+                item.cardData = Qt.binding(function() { return model; });
+                item.template = Qt.binding(function() { return cardTool.template; });
+                item.components = Qt.binding(function() { return cardTool.components; });
+                item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });
+                item.scopeStyle = root.scopeStyle;
+            }
+            Connections {
+                target: loader.item
+                onClicked: root.clicked(index, result)
+                onPressAndHold: root.pressAndHold(index)
+            }
+        }
+    }
+}
 
=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2014-08-01 07:25:10 +0000
+++ qml/Dash/CardTool.qml	2014-08-13 15:33:58 +0000
@@ -91,6 +91,7 @@
                 }
                 return units.gu(18.5);
             case "carousel":
+            case "horizontal-list":
                 return carouselTool.minimumTileWidth;
             case undefined:
             case "organic-grid":
@@ -111,6 +112,7 @@
                 if (template["card-size"] >= 12 && template["card-size"] <= 38) return units.gu(template["card-size"]);
                 return units.gu(18.5);
             case "grid":
+            case "horizontal-list":
                 return cardLoader.item ? cardLoader.item.implicitHeight : 0
             case "carousel":
                 return cardWidth / (components ? components["art"]["aspect-ratio"] : 1)
 
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-08-08 09:20:17 +0000
+++ qml/Dash/GenericScopeView.qml	2014-08-13 15:33:58 +0000
@@ -227,6 +227,7 @@
                     switch (cardTool.categoryLayout) {
                         case "carousel": return "CardCarousel.qml";
                         case "vertical-journal": return "CardVerticalJournal.qml";
+                        case "horizontal-list": return "CardHorizontalList.qml";
                         case "grid":
                         default: return "CardGrid.qml";
                     }
 
=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
--- tests/qmltests/Dash/tst_CardTool.qml	2014-05-02 14:51:22 +0000
+++ tests/qmltests/Dash/tst_CardTool.qml	2014-08-13 15:33:58 +0000
@@ -163,6 +163,7 @@
                     { label: "Horizontal Journal", layout: "journal" },
                     { label: "Vertical Journal", layout: "vertical-journal" },
                     { label: "Carousel", layout: "carousel" },
+                    { label: "Horizontal List", layout: "horizontal-list" },
                 ]
                 delegate: OptionSelectorDelegate { text: modelData.label }
                 onSelectedIndexChanged: {
@@ -226,6 +227,7 @@
                     case "journal": layoutSelector.selectedIndex = 2; break;
                     case "vertical-journal": layoutSelector.selectedIndex = 3; break;
                     case "carousel": layoutSelector.selectedIndex = 4; break;
+                    case "horizontal-list": layoutSelector.selectedIndex = 5; break;
                     case "grid":
                     default: layoutSelector.selectedIndex = 0; break;
                 }
@@ -270,6 +272,10 @@
                 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},
                 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},
                 { tag: "PortraitCarousel", width: units.gu(22), height: units.gu(44), viewWidth: 84, index: 10, layout_index: 4},
+                { tag: "SmallHorizontalList", width: units.gu(18), height: units.gu(39.5), viewWidth: 30, index: 0, layout_index: 5},
+                { tag: "MediumHorizontalList", width: units.gu(22), height: units.gu(43.5), viewWidth: 84, index: 0, layout_index: 5},
+                { tag: "LargeHorizontalList", width: units.gu(26), height: units.gu(47.5), viewWidth: 140, index: 0, layout_index: 5},
+                { tag: "PortraitHorizontalList", width: units.gu(22), height: units.gu(65.5), viewWidth: 84, index: 10, layout_index: 5},
             ]
         }