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

[Albert Astals Cid]

Fixes for Table Preview Widget

* Are there any related MPs required for this MP to build/function as expected?
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?
Yes, James agrees to the word wrap

[Michael Zanetti (mzanetti)]

 * 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.

not yet. changed tests passing fine here.

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1562
http://jenkins.qa.ubuntu.com/job/unity8-ci/5157/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/869
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/322
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/867
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/867/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17219

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml	2014-08-15 11:19:54 +0000
+++ qml/Dash/Previews/PreviewTable.qml	2015-01-20 09:56:09 +0000
@@ -37,6 +37,7 @@
         id: column
         objectName: "column"
         spacing: units.gu(1)
+        width: parent.width
 
         Label {
             id: titleLabel
@@ -51,6 +52,7 @@
             visible: text !== ""
             opacity: .8
             text: widgetData["title"] || ""
+            elide: Text.ElideRight
         }
 
         GridLayout {
@@ -72,6 +74,10 @@
                         visible: root.expanded || rowIndex < maximumCollapsedRowCount
                         color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
                         font.bold: index == 0
+                        verticalAlignment: Text.AlignTop
+                        wrapMode: Text.WordWrap
+                        Layout.fillHeight: true
+                        Layout.maximumWidth: column.width - x
                     }
                 }
             }

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2014-07-31 09:33:41 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-01-20 09:56:09 +0000
@@ -27,17 +27,18 @@
     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"] ]
+        "title": "Title here longa long long long long long long long long long long",
+        "values": [ [ "Long Label 1", "Value 1"],  [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 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"] ]
+        "values": [ [ "Long Label 1", "Value 1"],  [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2"],  [ "Label 3", "Value 3"],  [ "Label 4", "Value 4"],  [ "Label 5", "Value 5"] ]
     }
 
-    PreviewTable {
+    PreviewWidgetFactory {
         id: previewTable
         anchors { left: parent.left; right: parent.right }
+        widgetType: "table"
         widgetData: widgetDataComplete
 
         Rectangle {
@@ -59,7 +60,7 @@
             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, "label11").text, "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2");
             compare(findChild(previewTable, "label20").text, "Label 3");
             compare(findChild(previewTable, "label21").text, "Value 3");
             compare(findChild(previewTable, "label30").text, "Label 4");