Merge lp:~aacid/unity8/tablePreviewWidget into lp:unity8

[Albert Astals Cid]

Table Preview Widget

* Are there any related MPs required for this MP to build/function as expected?
Prereq

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, only using tests though since no scope uses it

* 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:1093
http://jenkins.qa.ubuntu.com/job/unity8-ci/3700/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2813/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/702/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/794/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/794/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/794/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4056/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/unity8-ci/3723/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2885
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/725
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/817
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/817/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4128
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10829

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1095
http://jenkins.qa.ubuntu.com/job/unity8-ci/3731/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2894
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/825
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/825/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4137
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10838

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

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

Weren't there designs that also had table headers? Should probably support that too...

review: Needs Information

[Albert Astals Cid (aacid)]

Maybe they were designs with headers, but there is no mention of headers in the previews spec and i have not seen any design with headers.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1096
http://jenkins.qa.ubuntu.com/job/unity8-ci/3762/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/856
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/856/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/856
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4297
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4297/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11025

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/unity8-ci/3816/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3189
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/818/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/910
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/910/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/910
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4434/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11162

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/tablePreviewWidget]

1099. By Albert Astals Cid on 2014-08-08

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/unity8-ci/3827/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3225
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/829/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/921
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/921/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4470
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4470/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1099
http://jenkins.qa.ubuntu.com/job/unity8-ci/3842/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3269
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/844/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/936
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/936/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4514
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4514/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11205

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== added file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewTable.qml	2014-08-08 09:23:52 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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.0
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 0.1
+import "../../Components"
+
+/*! \brief Preview widget for table.
+
+    This widget shows two columns contained in widgetData["values"]
+    as arrays of label,value along with a title that comes from widgetData["title"].
+
+    In case the widget is collapsed it only shows 3 lines of values.
+ */
+
+PreviewWidget {
+    id: root
+    implicitHeight: column.implicitHeight
+
+    readonly property int maximumCollapsedRowCount: 3
+
+    Column {
+        id: column
+        objectName: "column"
+        spacing: units.gu(1)
+
+        Label {
+            id: titleLabel
+            objectName: "titleLabel"
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: visible ? implicitHeight : 0
+            fontSize: "large"
+            color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
+            visible: text !== ""
+            opacity: .8
+            text: widgetData["title"] || ""
+        }
+
+        GridLayout {
+            objectName: "gridLayout"
+            columns: 2
+            columnSpacing: units.gu(2)
+            Repeater {
+                id: rowsRepeater
+                model: widgetData["values"]
+
+                delegate: Repeater {
+                    id: perRowRepeater
+                    readonly property int rowIndex: index
+                    model: widgetData["values"][index]
+                    delegate: Label {
+                        objectName: "label"+rowIndex+index
+                        fontSize: "small"
+                        text: perRowRepeater.model[index]
+                        visible: root.expanded || rowIndex < maximumCollapsedRowCount
+                        color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
+                        font.bold: index == 0
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2014-07-30 14:08:29 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2014-08-08 09:23:52 +0000
@@ -58,6 +58,7 @@
             case "payments": return "PreviewPayments.qml";
             case "rating-input": return "PreviewRatingInput.qml";
             case "reviews": return "PreviewRatingDisplay.qml";
+            case "table": return "PreviewTable.qml";
             case "text": return "PreviewTextSummary.qml";
             case "video": return "PreviewVideoPlayback.qml";
             default: return "";

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-08-01 07:38:01 +0000
+++ tests/qmltests/CMakeLists.txt	2014-08-08 09:23:52 +0000
@@ -49,6 +49,7 @@
 add_qml_test(Dash/Previews PreviewProgress)
 add_qml_test(Dash/Previews PreviewRatingDisplay)
 add_qml_test(Dash/Previews PreviewRatingInput)
+add_qml_test(Dash/Previews PreviewTable)
 add_qml_test(Dash/Previews PreviewTextSummary)
 add_qml_test(Dash/Previews PreviewVideoPlayback)
 add_qml_test(Dash/Previews PreviewWidgetFactory)

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2014-07-30 14:16:03 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2014-08-08 09:23:52 +0000
@@ -30,12 +30,16 @@
     property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
     property string shortText: "This is a short text :)"
 
+    property var tableData: {
+        "values": [ [ "Long Label 1", "Value 1"],  [ "Label 2", "Long Value 2"],  [ "Label 3", "Value 3"],  [ "Label 4", "Value 4"],  [ "Label 5", "Value 5"] ]
+    }
+
     property var widgetData: {
         "title": "Title here",
         "collapsed-widgets": 2,
         "widgets": [
             { "type": "text", "widgetId" : "text1", "properties" : { "text": longText } },
-            { "type": "text", "widgetId" : "text2", "properties" : { "text": longText2 } },
+            { "type": "table", "widgetId" : "table1", "properties" : tableData },
             { "type": "text", "widgetId" : "text3", "properties" : { "text": shortText } },
             { "type": "text", "widgetId" : "text4", "properties" : { "text": longText } }
         ]

=== added file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2014-08-08 09:23:52 +0000
@@ -0,0 +1,114 @@
+/*
+ * Copyright 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.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../../../qml/Dash/Previews"
+import Unity.Test 0.1 as UT
+
+Rectangle {
+    id: root
+    width: units.gu(40)
+    height: units.gu(80)
+    color: Theme.palette.selected.background
+
+    property var widgetDataComplete: {
+        "title": "Title here",
+        "values": [ [ "Long Label 1", "Value 1"],  [ "Label 2", "Long Value 2"],  [ "Label 3", "Value 3"],  [ "Label 4", "Value 4"],  [ "Label 5", "Value 5"] ]
+    }
+
+    property var widgetDataNoTitle: {
+        "values": [ [ "Long Label 1", "Value 1"],  [ "Label 2", "Long Value 2"],  [ "Label 3", "Value 3"],  [ "Label 4", "Value 4"],  [ "Label 5", "Value 5"] ]
+    }
+
+    PreviewTable {
+        id: previewTable
+        anchors { left: parent.left; right: parent.right }
+        widgetData: widgetDataComplete
+
+        Rectangle {
+            color: "red"
+            anchors.fill: parent
+            opacity: 0.5
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "PreviewTableTest"
+        when: windowShown
+
+        function init() {
+            previewTable.widgetData = widgetDataComplete;
+        }
+
+        function test_values() {
+            compare(findChild(previewTable, "label00").text, "Long Label 1");
+            compare(findChild(previewTable, "label01").text, "Value 1");
+            compare(findChild(previewTable, "label10").text, "Label 2");
+            compare(findChild(previewTable, "label11").text, "Long Value 2");
+            compare(findChild(previewTable, "label20").text, "Label 3");
+            compare(findChild(previewTable, "label21").text, "Value 3");
+            compare(findChild(previewTable, "label30").text, "Label 4");
+            compare(findChild(previewTable, "label31").text, "Value 4");
+            compare(findChild(previewTable, "label40").text, "Label 5");
+            compare(findChild(previewTable, "label41").text, "Value 5");
+        }
+
+        function test_optional_title() {
+            var titleLabel = findChild(previewTable, "titleLabel");
+            compare(titleLabel.visible, true);
+            var titleHeight = titleLabel.height;
+            var prevHeight = previewTable.height;
+
+            previewTable.widgetData = widgetDataNoTitle;
+            var column = findChild(previewTable, "column");
+            tryCompare(previewTable, "height", prevHeight - titleHeight - column.spacing );
+        }
+
+        function test_show_collapsed() {
+            verify(findChild(previewTable, "label00").visible);
+            verify(findChild(previewTable, "label01").visible);
+            verify(findChild(previewTable, "label10").visible);
+            verify(findChild(previewTable, "label11").visible);
+            verify(findChild(previewTable, "label20").visible);
+            verify(findChild(previewTable, "label21").visible);
+            verify(findChild(previewTable, "label30").visible);
+            verify(findChild(previewTable, "label31").visible);
+            verify(findChild(previewTable, "label40").visible);
+            verify(findChild(previewTable, "label41").visible);
+
+            waitForRendering(previewTable);
+            var prevHeight = previewTable.height;
+            previewTable.expanded = false;
+
+            verify(findChild(previewTable, "label00").visible);
+            verify(findChild(previewTable, "label01").visible);
+            verify(findChild(previewTable, "label10").visible);
+            verify(findChild(previewTable, "label11").visible);
+            verify(findChild(previewTable, "label20").visible);
+            verify(findChild(previewTable, "label21").visible);
+            verify(!findChild(previewTable, "label30").visible);
+            verify(!findChild(previewTable, "label31").visible);
+            verify(!findChild(previewTable, "label40").visible);
+            verify(!findChild(previewTable, "label41").visible);
+
+            var labelHeight = findChild(previewTable, "label00").height;
+            var gridLayout = findChild(previewTable, "gridLayout");
+            tryCompare(previewTable, "height", prevHeight - labelHeight * 2 - gridLayout.rowSpacing * 2);
+        }
+    }
+}

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-07-30 14:08:29 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-08-08 09:23:52 +0000
@@ -84,6 +84,7 @@
                 { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },
                 { tag: "Rating Input", type: "rating-input", source: "PreviewRatingInput.qml" },
                 { tag: "Rating Display", type: "reviews", source: "PreviewRatingDisplay.qml" },
+                { tag: "Table", type: "table", source: "PreviewTable.qml" },
                 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
                 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
             ];