Unity 8

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

  1. dashPreviewTableFixed1stColumnWidth
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Superseded
Proposed branch: lp:~aacid/unity8/dashPreviewTableFixed1stColumnWidth
Merge into: lp:unity8
Diff against target: 213 lines (+46/-7)
9 files modified
qml/Dash/Previews/PreviewAudioPlayback.qml (+2/-1)
qml/Dash/Previews/PreviewComment.qml (+2/-0)
qml/Dash/Previews/PreviewHeader.qml (+5/-3)
qml/Dash/Previews/PreviewIconActions.qml (+1/-0)
qml/Dash/Previews/PreviewRatingInput.qml (+1/-0)
qml/Dash/Previews/PreviewRatingSingleDisplay.qml (+3/-0)
qml/Dash/Previews/PreviewTable.qml (+7/-2)
qml/Dash/Previews/PreviewTextSummary.qml (+4/-1)
tests/qmltests/Dash/Previews/tst_PreviewTable.qml (+21/-0)
To merge this branch: bzr merge lp:~aacid/unity8/dashPreviewTableFixed1stColumnWidth
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Andrea Cimitan (community) Approve
Review via email: mp+307951@code.launchpad.net

This proposal has been superseded by a proposal from 2016-10-14.

Commit message

Fix first column of the preview table to be 25%

This way two consecutive tables have the second column start at the same X coordinate

Description of the change

 * 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

 * 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?
Design driven change

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2657
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2340/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3080
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1726
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1726
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1726
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3108
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2965/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2965
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2965/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2340/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

http://i.imgur.com/6R0cu7M.png

wondering what to do in this case...

Revision history for this message
Albert Astals Cid (aacid) wrote :

Are you wondering about the "we could give more space to the first column" or "the first column wrapping looks ugly"?

Revision history for this message
Andrea Cimitan (cimi) wrote :

> Are you wondering about the "we could give more space to the first column" or
> "the first column wrapping looks ugly"?
Both issues... for the spacing between columns ok, the wrapping is tricky

lp:~aacid/unity8/dashPreviewTableFixed1stColumnWidth updated
2658. By Albert Astals Cid

workaround for bad row height on Qt 5.4 (on the phone)

Revision history for this message
Albert Astals Cid (aacid) wrote :

Added a workaround for the wrapping looking bad in Qt 5.4

About "knowing we could give more space to the 1st column", it's complicated, you'd have to recalculate everything for every other table on the preview column and check how long is the second column and etc, i understood this simple solution is what we wanted?

Revision history for this message
Andrea Cimitan (cimi) wrote :

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

+1 for the test summary :)

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2658
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2357/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3109
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1754
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1754
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1754
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3137
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2993/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2993
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2993/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2357/rebuild

review: Approve (continuous-integration)
lp:~aacid/unity8/dashPreviewTableFixed1stColumnWidth updated
2659. By Albert Astals Cid

bring lp:~unity-team/unity8/previews_fonts-update

2660. By Albert Astals Cid

Add a minimum height, design wants more breathing space in the table

2661. By Albert Astals Cid

less min height

2662. By Albert Astals Cid

remerge

2663. By Albert Astals Cid

More merging

2664. By Albert Astals Cid

use implicitHeight for this now since we force a minimumHeight the old test was failing

2665. By Albert Astals Cid

Try to make the vivid qt happy

2666. By Albert Astals Cid

Give the first column some more breathing space

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml 2016-02-16 03:24:40 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml 2016-10-14 12:39:00 +0000
@@ -105,7 +105,8 @@
105 anchors { top: parent.top; left: parent.left; right: parent.right }105 anchors { top: parent.top; left: parent.left; right: parent.right }
106 opacity: 0.9106 opacity: 0.9
107 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText107 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
108 fontSize: "small"108 fontSize: "medium"
109 font.weight: Font.Light
109 horizontalAlignment: Text.AlignLeft110 horizontalAlignment: Text.AlignLeft
110 text: modelData["title"]111 text: modelData["title"]
111 elide: Text.ElideRight112 elide: Text.ElideRight
112113
=== modified file 'qml/Dash/Previews/PreviewComment.qml'
--- qml/Dash/Previews/PreviewComment.qml 2015-07-21 14:40:36 +0000
+++ qml/Dash/Previews/PreviewComment.qml 2016-10-14 12:39:00 +0000
@@ -70,6 +70,7 @@
70 visible: text !== ""70 visible: text !== ""
71 text: widgetData["subtitle"] || ""71 text: widgetData["subtitle"] || ""
72 fontSize: "xx-small"72 fontSize: "xx-small"
73 font.weight: Font.Light
73 maximumLineCount: 174 maximumLineCount: 1
74 elide: Text.ElideRight75 elide: Text.ElideRight
75 }76 }
@@ -77,6 +78,7 @@
77 width: parent.width78 width: parent.width
78 text: widgetData["comment"] || ""79 text: widgetData["comment"] || ""
79 fontSize: "small"80 fontSize: "small"
81 font.weight: Font.Light
80 wrapMode: Text.Wrap82 wrapMode: Text.Wrap
81 }83 }
82 }84 }
8385
=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml 2016-03-10 22:39:24 +0000
+++ qml/Dash/Previews/PreviewHeader.qml 2016-10-14 12:39:00 +0000
@@ -60,7 +60,8 @@
60 anchors {60 anchors {
61 top: parent.top; left: parent.left; right: parent.right61 top: parent.top; left: parent.left; right: parent.right
62 margins: margins62 margins: margins
63 leftMargin: spacing63 topMargin: 0
64 leftMargin: 0
64 rightMargin: spacing65 rightMargin: spacing
65 }66 }
6667
@@ -83,6 +84,7 @@
83 sourceFillMode: UbuntuShape.PreserveAspectCrop84 sourceFillMode: UbuntuShape.PreserveAspectCrop
84 sourceHorizontalAlignment: UbuntuShape.AlignHCenter85 sourceHorizontalAlignment: UbuntuShape.AlignHCenter
85 sourceVerticalAlignment: UbuntuShape.AlignVCenter86 sourceVerticalAlignment: UbuntuShape.AlignVCenter
87 aspect: UbuntuShape.Flat
86 source: Image {88 source: Image {
87 source: headerRoot.mascot89 source: headerRoot.mascot
88 width: source ? mascotShapeLoader.width : 090 width: source ? mascotShapeLoader.width : 0
@@ -113,8 +115,8 @@
113 rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0115 rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0
114 }116 }
115 elide: Text.ElideRight117 elide: Text.ElideRight
116 font.weight: Font.Normal
117 fontSize: "large"118 fontSize: "large"
119 font.weight: Font.Light
118 wrapMode: Text.Wrap120 wrapMode: Text.Wrap
119 color: headerRoot.fontColor121 color: headerRoot.fontColor
120 text: headerRoot.title122 text: headerRoot.title
@@ -145,7 +147,7 @@
145 id: subtitleLabel147 id: subtitleLabel
146 objectName: "subtitleLabel"148 objectName: "subtitleLabel"
147 elide: Text.ElideRight149 elide: Text.ElideRight
148 fontSize: "small"150 fontSize: "x-small"
149 font.weight: Font.Light151 font.weight: Font.Light
150 color: headerRoot.fontColor152 color: headerRoot.fontColor
151 text: headerRoot.subtitle153 text: headerRoot.subtitle
152154
=== modified file 'qml/Dash/Previews/PreviewIconActions.qml'
--- qml/Dash/Previews/PreviewIconActions.qml 2016-04-01 15:34:03 +0000
+++ qml/Dash/Previews/PreviewIconActions.qml 2016-10-14 12:39:00 +0000
@@ -71,6 +71,7 @@
71 anchors.left: icon.right71 anchors.left: icon.right
72 anchors.leftMargin: visible ? units.gu(0.5) : 072 anchors.leftMargin: visible ? units.gu(0.5) : 0
73 text: modelData.label73 text: modelData.label
74 font.weight: Font.Light
74 visible: text !== ""75 visible: text !== ""
75 }76 }
7677
7778
=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml 2016-08-18 15:02:04 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml 2016-10-14 12:39:00 +0000
@@ -103,6 +103,7 @@
103 objectName: "ratingLabel"103 objectName: "ratingLabel"
104 anchors { left: parent.left; right: parent.right; }104 anchors { left: parent.left; right: parent.right; }
105 fontSize: "large"105 fontSize: "large"
106 font.weight: Font.Light
106 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText107 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
107 opacity: .8108 opacity: .8
108 text: widgetData["rating-label"] || i18n.tr("Rate this")109 text: widgetData["rating-label"] || i18n.tr("Rate this")
109110
=== modified file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml 2015-06-18 10:07:37 +0000
+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml 2016-10-14 12:39:00 +0000
@@ -47,6 +47,7 @@
47 objectName: "authorLabel"47 objectName: "authorLabel"
48 anchors { left: parent.left; right: parent.right }48 anchors { left: parent.left; right: parent.right }
49 opacity: .849 opacity: .8
50 font.size: "small"
50 visible: text !== ""51 visible: text !== ""
51 wrapMode: Text.Wrap52 wrapMode: Text.Wrap
52 }53 }
@@ -57,6 +58,8 @@
57 anchors { left: parent.left; right: parent.right }58 anchors { left: parent.left; right: parent.right }
58 color: authorLabel.color59 color: authorLabel.color
59 opacity: .860 opacity: .8
61 font.size: "x-small"
62 font.weight: Font.Light
60 visible: text !== ""63 visible: text !== ""
61 wrapMode: Text.Wrap64 wrapMode: Text.Wrap
62 }65 }
6366
=== modified file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml 2015-07-15 15:13:18 +0000
+++ qml/Dash/Previews/PreviewTable.qml 2016-10-14 12:39:00 +0000
@@ -48,6 +48,7 @@
48 }48 }
49 height: visible ? implicitHeight : 049 height: visible ? implicitHeight : 0
50 fontSize: "large"50 fontSize: "large"
51 font.weight: Font.Light
51 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText52 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
52 visible: text !== ""53 visible: text !== ""
53 opacity: .854 opacity: .8
@@ -73,10 +74,14 @@
73 text: perRowRepeater.model[index]74 text: perRowRepeater.model[index]
74 visible: root.expanded || rowIndex < maximumCollapsedRowCount75 visible: root.expanded || rowIndex < maximumCollapsedRowCount
75 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText76 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
76 font.bold: index == 077 font.weight: index == 0 ? Font.Normal : Font.Light
77 wrapMode: Text.Wrap78 wrapMode: Text.Wrap
78 Layout.alignment: Qt.AlignTop79 Layout.alignment: Qt.AlignTop
79 Layout.maximumWidth: column.width - x80 Layout.maximumWidth: index == 0 ? column.width / 4 : column.width - x
81 Layout.minimumWidth: index == 0 ? column.width / 4 : -1
82 height: -1 // FIXME Qt 5.4 needs this otherwise wrapped columns
83 // get the height wrong and the next row looks weird
84 // remove once we stop supporting Qt 5.4 (if 5.5 doesn't need it)
80 }85 }
81 }86 }
82 }87 }
8388
=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
--- qml/Dash/Previews/PreviewTextSummary.qml 2015-07-15 15:07:19 +0000
+++ qml/Dash/Previews/PreviewTextSummary.qml 2016-10-14 12:39:00 +0000
@@ -39,6 +39,7 @@
39 }39 }
40 height: visible ? implicitHeight : 040 height: visible ? implicitHeight : 0
41 fontSize: "large"41 fontSize: "large"
42 font.weight: Font.Light
42 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText43 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
43 visible: text !== ""44 visible: text !== ""
44 opacity: .845 opacity: .8
@@ -56,10 +57,12 @@
56 left: parent.left57 left: parent.left
57 right: parent.right58 right: parent.right
58 top: titleLabel.visible ? titleLabel.bottom : parent.top59 top: titleLabel.visible ? titleLabel.bottom : parent.top
60 topMargin: units.gu(1.5)
59 }61 }
60 height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount62 height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount
61 clip: true63 clip: true
62 fontSize: "small"64 fontSize: "medium"
65 font.weight: Font.Light
63 lineHeight: 1.266 lineHeight: 1.2
64 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText67 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
65 opacity: .868 opacity: .8
6669
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml 2015-07-15 15:07:19 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml 2016-10-14 12:39:00 +0000
@@ -31,6 +31,11 @@
31 "values": [ [ "Long Label 1", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "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"] ]31 "values": [ [ "Long Label 1", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "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"] ]
32 }32 }
3333
34 property var widgetDataComplete2: {
35 "title": "Short Title here",
36 "values": [ [ "Publisher/Creator", "Unity8 team" ], [ "Label A", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Author", "Best 3v3r"], [ "Summary", "If i knew how to write summaries i'd be working somewhere else"] ]
37 }
38
34 property var widgetDataNoTitle: {39 property var widgetDataNoTitle: {
35 "values": [ [ "Long Label 1", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "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"] ]40 "values": [ [ "Long Label 1", "Long Value 1 Long Value 2 Long Value 3 Long Value 4 Long Value 5 Long Value 6 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "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"] ]
36 }41 }
@@ -51,6 +56,22 @@
51 }56 }
52 }57 }
5358
59 PreviewWidgetFactory {
60 id: previewTable2
61 anchors { left: parent.left; right: parent.right; top: previewTable.bottom; topMargin: units.gu(4) }
62 widgetType: "table"
63
64 Rectangle {
65 color: "red"
66 anchors.fill: parent
67 opacity: 0.5
68 }
69
70 Component.onCompleted: {
71 previewTable2.widgetData = widgetDataComplete2
72 }
73 }
74
54 UT.UnityTestCase {75 UT.UnityTestCase {
55 name: "PreviewTableTest"76 name: "PreviewTableTest"
56 when: windowShown77 when: windowShown

Subscribers

People subscribed via source and target branches