Unity 8

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

  1. titleAlignmentOnCompileTime
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2203
Merged at revision: 2238
Proposed branch: lp:~aacid/unity8/titleAlignmentOnCompileTime
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/cardToolCardCreator
Diff against target: 629 lines (+44/-78)
29 files modified
plugins/Dash/CardCreator.js (+18/-3)
qml/Dash/CardCarousel.qml (+0/-1)
qml/Dash/CardGrid.qml (+0/-1)
qml/Dash/CardHorizontalList.qml (+0/-1)
qml/Dash/CardTool.qml (+0/-23)
qml/Dash/CardVerticalJournal.qml (+0/-1)
tests/plugins/Dash/cardcreator/1.res (+1/-2)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/10.res (+1/-2)
tests/plugins/Dash/cardcreator/10.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/11.res (+1/-2)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/2.res (+1/-2)
tests/plugins/Dash/cardcreator/2.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/3.res (+1/-2)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/4.res (+1/-2)
tests/plugins/Dash/cardcreator/4.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/5.res (+1/-2)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/6.res (+1/-2)
tests/plugins/Dash/cardcreator/6.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/7.res (+1/-2)
tests/plugins/Dash/cardcreator/7.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/8.res (+1/-2)
tests/plugins/Dash/cardcreator/8.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/9.res (+1/-2)
tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-2)
tests/qmltests/Dash/tst_CardTool.qml (+4/-4)
To merge this branch: bzr merge lp:~aacid/unity8/titleAlignmentOnCompileTime
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+286186@code.launchpad.net

Commit message

Resolve title alignment on card creator time instead of on runtime

Description of the change

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

 * 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

To post a comment you must log in.
lp:~aacid/unity8/titleAlignmentOnCompileTime updated
2203. By Albert Astals Cid

Adapt test

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

FAILED: Continuous integration, rev:2202
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/375/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/511
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/158
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/158
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/534
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/552
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/552
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/548/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2202
http://jenkins.qa.ubuntu.com/job/unity8-ci/7312/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6504
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/727/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/718
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4966
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27638
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/375/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/725
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/725/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27640

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2203
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/381/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/518
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/160
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/160
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/541
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/558
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/558
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/554/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/554
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/554/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2203
http://jenkins.qa.ubuntu.com/job/unity8-ci/7319/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6512
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/734/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2024
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/727
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/726
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/725
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4972
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6523
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27655
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/380/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27656

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

review: Needs Fixing (continuous-integration)
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?
yes
 * Did CI run pass? If not, please explain why.
ap
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve
lp:~aacid/unity8/titleAlignmentOnCompileTime updated
2204. By Albert Astals Cid

Merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/CardCreator.js'
2--- plugins/Dash/CardCreator.js 2016-03-04 14:30:51 +0000
3+++ plugins/Dash/CardCreator.js 2016-03-04 14:30:51 +0000
4@@ -275,6 +275,7 @@
5 // %2 is used as color of titleLabel
6 // %3 is used as extra condition for visible of titleLabel
7 // %4 is used as title width
8+// %5 is used as horizontal alignment
9 var kTitleLabelCode = 'Label { \n\
10 id: titleLabel; \n\
11 objectName: "titleLabel"; \n\
12@@ -289,7 +290,7 @@
13 width: %4; \n\
14 text: root.title; \n\
15 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
16- horizontalAlignment: root.titleAlignment; \n\
17+ horizontalAlignment: %5; \n\
18 }\n';
19
20 // %1 is used as extra anchors of emblemIcon
21@@ -410,7 +411,6 @@
22 property string backgroundShapeStyle: "inset"; \n\
23 property real fontScale: 1.0; \n\
24 property var scopeStyle: null; \n\
25- property int titleAlignment: Text.AlignLeft; \n\
26 property int fixedHeaderHeight: -1; \n\
27 property size fixedArtShapeSize: Qt.size(-1, -1); \n\
28 readonly property string title: cardData && cardData["title"] || ""; \n\
29@@ -715,9 +715,24 @@
30 }
31 }
32
33+ var titleAlignment = "Text.AlignHCenter";
34+ if (template["card-layout"] === "horizontal"
35+ || typeof components["title"] !== "object"
36+ || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";
37+ var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
38+ for (var key in keys) {
39+ key = keys[key];
40+ try {
41+ if (typeof components[key] === "string"
42+ || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";
43+ } catch (e) {
44+ continue;
45+ }
46+ }
47+
48 // code for different elements
49 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
50- var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth);
51+ var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);
52 var subtitleCode;
53 var attributesCode;
54
55
56=== modified file 'qml/Dash/CardCarousel.qml'
57--- qml/Dash/CardCarousel.qml 2016-01-28 14:11:14 +0000
58+++ qml/Dash/CardCarousel.qml 2016-03-04 14:30:51 +0000
59@@ -66,7 +66,6 @@
60 item.cardData = Qt.binding(function() { return model; });
61 item.fontScale = Qt.binding(function() { return carousel.fontScale; });
62 item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
63- item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
64 item.artShapeStyle = "shadow";
65 item.scopeStyle = cardCarousel.scopeStyle;
66 }
67
68=== modified file 'qml/Dash/CardGrid.qml'
69--- qml/Dash/CardGrid.qml 2016-02-02 08:47:07 +0000
70+++ qml/Dash/CardGrid.qml 2016-03-04 14:30:51 +0000
71@@ -70,7 +70,6 @@
72 item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
73 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
74 item.cardData = Qt.binding(function() { return model; });
75- item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
76 item.scopeStyle = root.scopeStyle;
77 item.artShapeStyle = root.artShapeStyle;
78 item.backgroundShapeStyle = root.backgroundShapeStyle;
79
80=== modified file 'qml/Dash/CardHorizontalList.qml'
81--- qml/Dash/CardHorizontalList.qml 2016-01-28 14:11:14 +0000
82+++ qml/Dash/CardHorizontalList.qml 2016-03-04 14:30:51 +0000
83@@ -53,7 +53,6 @@
84 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
85 item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
86 item.cardData = Qt.binding(function() { return model; });
87- item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
88 item.scopeStyle = root.scopeStyle;
89 }
90 Connections {
91
92=== modified file 'qml/Dash/CardTool.qml'
93--- qml/Dash/CardTool.qml 2016-03-04 14:30:51 +0000
94+++ qml/Dash/CardTool.qml 2016-03-04 14:30:51 +0000
95@@ -139,29 +139,6 @@
96 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
97 property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
98
99- /*!
100- \brief Desired alignment of title
101- */
102- readonly property int titleAlignment: {
103- if (template["card-layout"] === "horizontal"
104- || typeof components["title"] !== "object"
105- || components["title"]["align"] === "left") return Text.AlignLeft;
106-
107- var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
108-
109- for (var key in keys) {
110- key = keys[key];
111- try {
112- if (typeof components[key] === "string"
113- || typeof components[key]["field"] === "string") return Text.AlignLeft;
114- } catch (e) {
115- continue;
116- }
117- }
118-
119- return Text.AlignHCenter;
120- }
121-
122 QtObject {
123 id: carouselTool
124
125
126=== modified file 'qml/Dash/CardVerticalJournal.qml'
127--- qml/Dash/CardVerticalJournal.qml 2016-01-28 14:11:14 +0000
128+++ qml/Dash/CardVerticalJournal.qml 2016-03-04 14:30:51 +0000
129@@ -72,7 +72,6 @@
130 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
131 item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
132 item.cardData = Qt.binding(function() { return model; });
133- item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
134 item.scopeStyle = root.scopeStyle;
135 }
136 Connections {
137
138=== modified file 'tests/plugins/Dash/cardcreator/1.res'
139--- tests/plugins/Dash/cardcreator/1.res 2016-02-11 13:13:31 +0000
140+++ tests/plugins/Dash/cardcreator/1.res 2016-03-04 14:30:51 +0000
141@@ -5,7 +5,6 @@
142 property string backgroundShapeStyle: "inset";
143 property real fontScale: 1.0;
144 property var scopeStyle: null;
145- property int titleAlignment: Text.AlignLeft;
146 property int fixedHeaderHeight: -1;
147 property size fixedArtShapeSize: Qt.size(-1, -1);
148 readonly property string title: cardData && cardData["title"] || "";
149@@ -108,7 +107,7 @@
150 width: undefined;
151 text: root.title;
152 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
153- horizontalAlignment: root.titleAlignment;
154+ horizontalAlignment: Text.AlignHCenter;
155 }
156 UbuntuShape {
157 id: touchdown;
158
159=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
160--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-04 14:30:51 +0000
161+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-04 14:30:51 +0000
162@@ -5,7 +5,6 @@
163 property string backgroundShapeStyle: "inset";
164 property real fontScale: 1.0;
165 property var scopeStyle: null;
166- property int titleAlignment: Text.AlignLeft;
167 property int fixedHeaderHeight: -1;
168 property size fixedArtShapeSize: Qt.size(-1, -1);
169 readonly property string title: cardData && cardData["title"] || "";
170@@ -108,7 +107,7 @@
171 width: undefined;
172 text: root.title;
173 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
174- horizontalAlignment: root.titleAlignment;
175+ horizontalAlignment: Text.AlignHCenter;
176 }
177 UbuntuShape {
178 id: touchdown;
179
180=== modified file 'tests/plugins/Dash/cardcreator/10.res'
181--- tests/plugins/Dash/cardcreator/10.res 2016-02-02 08:47:07 +0000
182+++ tests/plugins/Dash/cardcreator/10.res 2016-03-04 14:30:51 +0000
183@@ -5,7 +5,6 @@
184 property string backgroundShapeStyle: "inset";
185 property real fontScale: 1.0;
186 property var scopeStyle: null;
187- property int titleAlignment: Text.AlignLeft;
188 property int fixedHeaderHeight: -1;
189 property size fixedArtShapeSize: Qt.size(-1, -1);
190 readonly property string title: cardData && cardData["title"] || "";
191@@ -103,7 +102,7 @@
192 width: undefined;
193 text: root.title;
194 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
195- horizontalAlignment: root.titleAlignment;
196+ horizontalAlignment: Text.AlignLeft;
197 }
198 ,Label {
199 id: subtitleLabel;
200
201=== modified file 'tests/plugins/Dash/cardcreator/10.res.cardcreator'
202--- tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-03-04 14:30:51 +0000
203+++ tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-03-04 14:30:51 +0000
204@@ -5,7 +5,6 @@
205 property string backgroundShapeStyle: "inset";
206 property real fontScale: 1.0;
207 property var scopeStyle: null;
208- property int titleAlignment: Text.AlignLeft;
209 property int fixedHeaderHeight: -1;
210 property size fixedArtShapeSize: Qt.size(-1, -1);
211 readonly property string title: cardData && cardData["title"] || "";
212@@ -103,7 +102,7 @@
213 width: undefined;
214 text: root.title;
215 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
216- horizontalAlignment: root.titleAlignment;
217+ horizontalAlignment: Text.AlignLeft;
218 }
219 ,Label {
220 id: subtitleLabel;
221
222=== modified file 'tests/plugins/Dash/cardcreator/11.res'
223--- tests/plugins/Dash/cardcreator/11.res 2016-02-11 13:13:31 +0000
224+++ tests/plugins/Dash/cardcreator/11.res 2016-03-04 14:30:51 +0000
225@@ -5,7 +5,6 @@
226 property string backgroundShapeStyle: "inset";
227 property real fontScale: 1.0;
228 property var scopeStyle: null;
229- property int titleAlignment: Text.AlignLeft;
230 property int fixedHeaderHeight: -1;
231 property size fixedArtShapeSize: Qt.size(-1, -1);
232 readonly property string title: cardData && cardData["title"] || "";
233@@ -178,7 +177,7 @@
234 width: undefined;
235 text: root.title;
236 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
237- horizontalAlignment: root.titleAlignment;
238+ horizontalAlignment: Text.AlignLeft;
239 }
240 ,Label {
241 id: subtitleLabel;
242
243=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
244--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-04 14:30:51 +0000
245+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-04 14:30:51 +0000
246@@ -5,7 +5,6 @@
247 property string backgroundShapeStyle: "inset";
248 property real fontScale: 1.0;
249 property var scopeStyle: null;
250- property int titleAlignment: Text.AlignLeft;
251 property int fixedHeaderHeight: -1;
252 property size fixedArtShapeSize: Qt.size(-1, -1);
253 readonly property string title: cardData && cardData["title"] || "";
254@@ -176,7 +175,7 @@
255 width: undefined;
256 text: root.title;
257 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
258- horizontalAlignment: root.titleAlignment;
259+ horizontalAlignment: Text.AlignLeft;
260 }
261 ,Label {
262 id: subtitleLabel;
263
264=== modified file 'tests/plugins/Dash/cardcreator/2.res'
265--- tests/plugins/Dash/cardcreator/2.res 2016-01-28 14:11:14 +0000
266+++ tests/plugins/Dash/cardcreator/2.res 2016-03-04 14:30:51 +0000
267@@ -5,7 +5,6 @@
268 property string backgroundShapeStyle: "inset";
269 property real fontScale: 1.0;
270 property var scopeStyle: null;
271- property int titleAlignment: Text.AlignLeft;
272 property int fixedHeaderHeight: -1;
273 property size fixedArtShapeSize: Qt.size(-1, -1);
274 readonly property string title: cardData && cardData["title"] || "";
275@@ -102,7 +101,7 @@
276 width: undefined;
277 text: root.title;
278 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
279- horizontalAlignment: root.titleAlignment;
280+ horizontalAlignment: Text.AlignLeft;
281 }
282 ,Label {
283 id: subtitleLabel;
284
285=== modified file 'tests/plugins/Dash/cardcreator/2.res.cardcreator'
286--- tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-03-04 14:30:51 +0000
287+++ tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-03-04 14:30:51 +0000
288@@ -5,7 +5,6 @@
289 property string backgroundShapeStyle: "inset";
290 property real fontScale: 1.0;
291 property var scopeStyle: null;
292- property int titleAlignment: Text.AlignLeft;
293 property int fixedHeaderHeight: -1;
294 property size fixedArtShapeSize: Qt.size(-1, -1);
295 readonly property string title: cardData && cardData["title"] || "";
296@@ -102,7 +101,7 @@
297 width: undefined;
298 text: root.title;
299 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
300- horizontalAlignment: root.titleAlignment;
301+ horizontalAlignment: Text.AlignLeft;
302 }
303 ,Label {
304 id: subtitleLabel;
305
306=== modified file 'tests/plugins/Dash/cardcreator/3.res'
307--- tests/plugins/Dash/cardcreator/3.res 2016-02-11 13:13:31 +0000
308+++ tests/plugins/Dash/cardcreator/3.res 2016-03-04 14:30:51 +0000
309@@ -5,7 +5,6 @@
310 property string backgroundShapeStyle: "inset";
311 property real fontScale: 1.0;
312 property var scopeStyle: null;
313- property int titleAlignment: Text.AlignLeft;
314 property int fixedHeaderHeight: -1;
315 property size fixedArtShapeSize: Qt.size(-1, -1);
316 readonly property string title: cardData && cardData["title"] || "";
317@@ -109,7 +108,7 @@
318 width: undefined;
319 text: root.title;
320 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
321- horizontalAlignment: root.titleAlignment;
322+ horizontalAlignment: Text.AlignLeft;
323 }
324 Label {
325 id: subtitleLabel;
326
327=== modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
328--- tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-04 14:30:51 +0000
329+++ tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-04 14:30:51 +0000
330@@ -5,7 +5,6 @@
331 property string backgroundShapeStyle: "inset";
332 property real fontScale: 1.0;
333 property var scopeStyle: null;
334- property int titleAlignment: Text.AlignLeft;
335 property int fixedHeaderHeight: -1;
336 property size fixedArtShapeSize: Qt.size(-1, -1);
337 readonly property string title: cardData && cardData["title"] || "";
338@@ -108,7 +107,7 @@
339 width: undefined;
340 text: root.title;
341 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
342- horizontalAlignment: root.titleAlignment;
343+ horizontalAlignment: Text.AlignLeft;
344 }
345 Label {
346 id: subtitleLabel;
347
348=== modified file 'tests/plugins/Dash/cardcreator/4.res'
349--- tests/plugins/Dash/cardcreator/4.res 2016-01-28 14:11:14 +0000
350+++ tests/plugins/Dash/cardcreator/4.res 2016-03-04 14:30:51 +0000
351@@ -5,7 +5,6 @@
352 property string backgroundShapeStyle: "inset";
353 property real fontScale: 1.0;
354 property var scopeStyle: null;
355- property int titleAlignment: Text.AlignLeft;
356 property int fixedHeaderHeight: -1;
357 property size fixedArtShapeSize: Qt.size(-1, -1);
358 readonly property string title: cardData && cardData["title"] || "";
359@@ -77,7 +76,7 @@
360 width: undefined;
361 text: root.title;
362 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
363- horizontalAlignment: root.titleAlignment;
364+ horizontalAlignment: Text.AlignLeft;
365 }
366 ,Label {
367 id: subtitleLabel;
368
369=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
370--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-03-04 14:30:51 +0000
371+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-03-04 14:30:51 +0000
372@@ -5,7 +5,6 @@
373 property string backgroundShapeStyle: "inset";
374 property real fontScale: 1.0;
375 property var scopeStyle: null;
376- property int titleAlignment: Text.AlignLeft;
377 property int fixedHeaderHeight: -1;
378 property size fixedArtShapeSize: Qt.size(-1, -1);
379 readonly property string title: cardData && cardData["title"] || "";
380@@ -77,7 +76,7 @@
381 width: undefined;
382 text: root.title;
383 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
384- horizontalAlignment: root.titleAlignment;
385+ horizontalAlignment: Text.AlignLeft;
386 }
387 ,Label {
388 id: subtitleLabel;
389
390=== modified file 'tests/plugins/Dash/cardcreator/5.res'
391--- tests/plugins/Dash/cardcreator/5.res 2016-02-11 13:13:31 +0000
392+++ tests/plugins/Dash/cardcreator/5.res 2016-03-04 14:30:51 +0000
393@@ -5,7 +5,6 @@
394 property string backgroundShapeStyle: "inset";
395 property real fontScale: 1.0;
396 property var scopeStyle: null;
397- property int titleAlignment: Text.AlignLeft;
398 property int fixedHeaderHeight: -1;
399 property size fixedArtShapeSize: Qt.size(-1, -1);
400 readonly property string title: cardData && cardData["title"] || "";
401@@ -126,7 +125,7 @@
402 width: undefined;
403 text: root.title;
404 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
405- horizontalAlignment: root.titleAlignment;
406+ horizontalAlignment: Text.AlignLeft;
407 }
408 Label {
409 id: subtitleLabel;
410
411=== modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
412--- tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-04 14:30:51 +0000
413+++ tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-04 14:30:51 +0000
414@@ -5,7 +5,6 @@
415 property string backgroundShapeStyle: "inset";
416 property real fontScale: 1.0;
417 property var scopeStyle: null;
418- property int titleAlignment: Text.AlignLeft;
419 property int fixedHeaderHeight: -1;
420 property size fixedArtShapeSize: Qt.size(-1, -1);
421 readonly property string title: cardData && cardData["title"] || "";
422@@ -126,7 +125,7 @@
423 width: undefined;
424 text: root.title;
425 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
426- horizontalAlignment: root.titleAlignment;
427+ horizontalAlignment: Text.AlignLeft;
428 }
429 Label {
430 id: subtitleLabel;
431
432=== modified file 'tests/plugins/Dash/cardcreator/6.res'
433--- tests/plugins/Dash/cardcreator/6.res 2016-02-02 08:47:07 +0000
434+++ tests/plugins/Dash/cardcreator/6.res 2016-03-04 14:30:51 +0000
435@@ -5,7 +5,6 @@
436 property string backgroundShapeStyle: "inset";
437 property real fontScale: 1.0;
438 property var scopeStyle: null;
439- property int titleAlignment: Text.AlignLeft;
440 property int fixedHeaderHeight: -1;
441 property size fixedArtShapeSize: Qt.size(-1, -1);
442 readonly property string title: cardData && cardData["title"] || "";
443@@ -81,7 +80,7 @@
444 width: undefined;
445 text: root.title;
446 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
447- horizontalAlignment: root.titleAlignment;
448+ horizontalAlignment: Text.AlignLeft;
449 }
450 ,Label {
451 id: subtitleLabel;
452
453=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
454--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-03-04 14:30:51 +0000
455+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-03-04 14:30:51 +0000
456@@ -5,7 +5,6 @@
457 property string backgroundShapeStyle: "inset";
458 property real fontScale: 1.0;
459 property var scopeStyle: null;
460- property int titleAlignment: Text.AlignLeft;
461 property int fixedHeaderHeight: -1;
462 property size fixedArtShapeSize: Qt.size(-1, -1);
463 readonly property string title: cardData && cardData["title"] || "";
464@@ -81,7 +80,7 @@
465 width: undefined;
466 text: root.title;
467 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
468- horizontalAlignment: root.titleAlignment;
469+ horizontalAlignment: Text.AlignLeft;
470 }
471 ,Label {
472 id: subtitleLabel;
473
474=== modified file 'tests/plugins/Dash/cardcreator/7.res'
475--- tests/plugins/Dash/cardcreator/7.res 2016-01-28 14:11:14 +0000
476+++ tests/plugins/Dash/cardcreator/7.res 2016-03-04 14:30:51 +0000
477@@ -5,7 +5,6 @@
478 property string backgroundShapeStyle: "inset";
479 property real fontScale: 1.0;
480 property var scopeStyle: null;
481- property int titleAlignment: Text.AlignLeft;
482 property int fixedHeaderHeight: -1;
483 property size fixedArtShapeSize: Qt.size(-1, -1);
484 readonly property string title: cardData && cardData["title"] || "";
485@@ -103,7 +102,7 @@
486 width: undefined;
487 text: root.title;
488 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
489- horizontalAlignment: root.titleAlignment;
490+ horizontalAlignment: Text.AlignLeft;
491 }
492 ,Label {
493 id: subtitleLabel;
494
495=== modified file 'tests/plugins/Dash/cardcreator/7.res.cardcreator'
496--- tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-03-04 14:30:51 +0000
497+++ tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-03-04 14:30:51 +0000
498@@ -5,7 +5,6 @@
499 property string backgroundShapeStyle: "inset";
500 property real fontScale: 1.0;
501 property var scopeStyle: null;
502- property int titleAlignment: Text.AlignLeft;
503 property int fixedHeaderHeight: -1;
504 property size fixedArtShapeSize: Qt.size(-1, -1);
505 readonly property string title: cardData && cardData["title"] || "";
506@@ -103,7 +102,7 @@
507 width: undefined;
508 text: root.title;
509 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
510- horizontalAlignment: root.titleAlignment;
511+ horizontalAlignment: Text.AlignLeft;
512 }
513 ,Label {
514 id: subtitleLabel;
515
516=== modified file 'tests/plugins/Dash/cardcreator/8.res'
517--- tests/plugins/Dash/cardcreator/8.res 2016-01-28 14:11:14 +0000
518+++ tests/plugins/Dash/cardcreator/8.res 2016-03-04 14:30:51 +0000
519@@ -5,7 +5,6 @@
520 property string backgroundShapeStyle: "inset";
521 property real fontScale: 1.0;
522 property var scopeStyle: null;
523- property int titleAlignment: Text.AlignLeft;
524 property int fixedHeaderHeight: -1;
525 property size fixedArtShapeSize: Qt.size(-1, -1);
526 readonly property string title: cardData && cardData["title"] || "";
527@@ -94,7 +93,7 @@
528 width: parent.width - x;
529 text: root.title;
530 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
531- horizontalAlignment: root.titleAlignment;
532+ horizontalAlignment: Text.AlignLeft;
533 }
534
535 ]
536
537=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
538--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-03-04 14:30:51 +0000
539+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-03-04 14:30:51 +0000
540@@ -5,7 +5,6 @@
541 property string backgroundShapeStyle: "inset";
542 property real fontScale: 1.0;
543 property var scopeStyle: null;
544- property int titleAlignment: Text.AlignLeft;
545 property int fixedHeaderHeight: -1;
546 property size fixedArtShapeSize: Qt.size(-1, -1);
547 readonly property string title: cardData && cardData["title"] || "";
548@@ -94,7 +93,7 @@
549 width: parent.width - x;
550 text: root.title;
551 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
552- horizontalAlignment: root.titleAlignment;
553+ horizontalAlignment: Text.AlignLeft;
554 }
555
556 ]
557
558=== modified file 'tests/plugins/Dash/cardcreator/9.res'
559--- tests/plugins/Dash/cardcreator/9.res 2016-02-12 00:11:52 +0000
560+++ tests/plugins/Dash/cardcreator/9.res 2016-03-04 14:30:51 +0000
561@@ -5,7 +5,6 @@
562 property string backgroundShapeStyle: "inset";
563 property real fontScale: 1.0;
564 property var scopeStyle: null;
565- property int titleAlignment: Text.AlignLeft;
566 property int fixedHeaderHeight: -1;
567 property size fixedArtShapeSize: Qt.size(-1, -1);
568 readonly property string title: cardData && cardData["title"] || "";
569@@ -36,7 +35,7 @@
570 width: undefined;
571 text: root.title;
572 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
573- horizontalAlignment: root.titleAlignment;
574+ horizontalAlignment: Text.AlignLeft;
575 }
576 Label {
577 id: subtitleLabel;
578
579=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
580--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-04 14:30:51 +0000
581+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-04 14:30:51 +0000
582@@ -5,7 +5,6 @@
583 property string backgroundShapeStyle: "inset";
584 property real fontScale: 1.0;
585 property var scopeStyle: null;
586- property int titleAlignment: Text.AlignLeft;
587 property int fixedHeaderHeight: -1;
588 property size fixedArtShapeSize: Qt.size(-1, -1);
589 readonly property string title: cardData && cardData["title"] || "";
590@@ -36,7 +35,7 @@
591 width: undefined;
592 text: root.title;
593 font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
594- horizontalAlignment: root.titleAlignment;
595+ horizontalAlignment: Text.AlignLeft;
596 }
597 Label {
598 id: subtitleLabel;
599
600=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
601--- tests/qmltests/Dash/tst_CardTool.qml 2015-11-06 10:20:36 +0000
602+++ tests/qmltests/Dash/tst_CardTool.qml 2016-03-04 14:30:51 +0000
603@@ -339,22 +339,22 @@
604 function test_card_title_alignment(data) {
605 selector.selectedIndex = data.index;
606
607- tryCompare(cardTool, "titleAlignment", Text.AlignLeft);
608+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == Text.AlignLeft; }, true);
609
610 cardTool.components['title'] = { "field": "title", "align": "center" };
611 cardTool.componentsChanged();
612
613- tryCompare(cardTool, "titleAlignment", data.value);
614+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == data.value; }, true);
615
616 cardTool.components['title'] = { "field": "title" };
617 cardTool.componentsChanged();
618
619- tryCompare(cardTool, "titleAlignment", data.value);
620+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == data.value; }, true);
621
622 cardTool.components['title'] = { "field": "title", "align": "left" };
623 cardTool.componentsChanged();
624
625- tryCompare(cardTool, "titleAlignment", Text.AlignLeft);
626+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == Text.AlignLeft; }, true);
627 }
628
629 function test_categoryLayout_data() {

Subscribers

People subscribed via source and target branches