Unity 8

Merge lp:~unity-team/unity8/tablePreviewWidget into lp:unity8

tablePreviewWidget
Merge into trunk

Proposed by Michał Sawicz on 2014-08-14

Status:	Merged
Approved by:	Michael Zanetti on 2014-08-15
Approved revision:	1106
Merged at revision:	1211
Proposed branch:	lp:~unity-team/unity8/tablePreviewWidget
Merge into:	lp:unity8
Prerequisite:	lp:~saviq/unity8/preview-customizations
Diff against target:	263 lines (+202/-1) 6 files modified qml/Dash/Previews/PreviewTable.qml (+80/-0) qml/Dash/Previews/PreviewWidgetFactory.qml (+1/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml (+5/-1) tests/qmltests/Dash/Previews/tst_PreviewTable.qml (+114/-0) tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+1/-0)
To merge this branch:	bzr merge lp:~unity-team/unity8/tablePreviewWidget
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-08-14	Approve on 2014-08-26
Albert Astals Cid (community)			Abstain on 2014-08-18
Michael Zanetti (community)		2014-08-14	Approve on 2014-08-15
Andrea Cimitan			Pending
Review via email: mp+230787@code.launchpad.net

This proposal supersedes a proposal from 2014-08-08.

Commit message

Add table preview widget

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
Prerequisite lp:~saviq/unity8/preview-customizations

* 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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-31: Posted in a previous version of this proposal

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)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michal Hruby (mhr3) wrote on 2014-08-01: Posted in a previous version of this proposal

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

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-08-01: Posted in a previous version of this proposal

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.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-05: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-08: Posted in a previous version of this proposal

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)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-08: Posted in a previous version of this proposal

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)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-09: Posted in a previous version of this proposal

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)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-14:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/tablePreviewWidget updated on 2014-08-15

1101. By Michał Sawicz on 2014-08-15: Merge lp:~saviq/unity8/preview-customizations
1102. By Michał Sawicz on 2014-08-15: Use theme's baseText instead of grey.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15:

FAILED: Continuous integration, rev:1101
http://jenkins.qa.ubuntu.com/job/unity8-ci/3922/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3596
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1016
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1016/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1016
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4843
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11542

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/tablePreviewWidget updated on 2014-08-15

1103. By Michał Sawicz on 2014-08-15: Merge lp:~saviq/unity8/preview-customizations
1104. By Michał Sawicz on 2014-08-15: Merge lp:~saviq/unity8/preview-customizations
1105. By Michał Sawicz on 2014-08-15: Merge lp:~saviq/unity8/preview-customizations
1106. By Michał Sawicz on 2014-08-15: Merge lp:~saviq/unity8/preview-customizations

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-08-15:

Are we ok with reaching out of context for widgetData?

See 2 inline questions

review: Needs Information

Revision history for this message

Michał Sawicz (saviq) on 2014-08-15:

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15:

FAILED: Continuous integration, rev:1103
http://jenkins.qa.ubuntu.com/job/unity8-ci/3927/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3601
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/928
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1021
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1021/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1021
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4848
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11549

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-08-15:

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

positive

* Did CI run pass? If not, please explain why.

negative (unrelated)

review: Approve

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-15:

> Are we ok with reaching out of context for widgetData?

Hmm? widgetData is a property of all PreviewWidgets, where are we reaching out?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-16:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/tablePreviewWidget updated on 2014-08-16

1107. By Michał Sawicz on 2014-08-16: Merge lp:~saviq/unity8/preview-customizations

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-17:

FAILED: Continuous integration, rev:1107
http://jenkins.qa.ubuntu.com/job/unity8-ci/3977/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3671
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1071
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1071/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1071
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4918
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4918/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11630

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) on 2014-08-18:

review: Abstain

lp:~unity-team/unity8/tablePreviewWidget updated on 2014-08-26

1108. By Michał Sawicz on 2014-08-18: Merge lp:~saviq/unity8/preview-customizations
1109. By Michał Sawicz on 2014-08-18: Merge lp:~saviq/unity8/preview-customizations
1110. By Michał Sawicz on 2014-08-22: Merge lp:~saviq/unity8/preview-customizations
1111. By Albert Astals Cid on 2014-08-22: Merge trunk
1112. By Michał Sawicz on 2014-08-26: Merge lp:~saviq/unity8/preview-customizations

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mirco Müller (macslow) wrote on 2014-08-26:

I wonder why testDashContent failed on Jenkins, when tried locally it passed without a failure.

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-26:

It segfaulted, see revision. It was 1107 instead of tip - 1112

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26:

PASSED: Continuous integration, rev:1112
http://jenkins.qa.ubuntu.com/job/unity8-ci/4101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4049
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5301
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12123

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === 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-26 10:55:11 +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 : Theme.palette.normal.baseText
++            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 : Theme.palette.normal.baseText
++                        font.bold: index == 0
++                    }
++                }
++            }
++        }
++    }
++}
 === modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
 --- qml/Dash/Previews/PreviewWidgetFactory.qml	2014-08-26 10:55:10 +0000
 +++ qml/Dash/Previews/PreviewWidgetFactory.qml	2014-08-26 10:55:11 +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-25 13:10:28 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-08-26 10:55:11 +0000
@@ -50,6 +50,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-08-21 11:23:33 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2014-08-26 10:55:11 +0000
@@ -30,6 +30,10 @@
      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"] ]
++    }
++
      ListModel {
          id: widgetsModel
+     }
@@ -42,7 +46,7 @@
      Component.onCompleted: {
          widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});
--        widgetsModel.append({"type": "text", "widgetId": "text2", "properties": { "text": longText2 }});
++        widgetsModel.append({"type": "text", "widgetId": "table1", "properties": { "text": tableData }});
          widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});
          widgetsModel.append({"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-26 10:55:11 +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-26 10:55:11 +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" },
              ];