Unity 8

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

  1. cardAsyncOnCompileTime
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2204
Merged at revision: 2239
Proposed branch: lp:~aacid/unity8/cardAsyncOnCompileTime
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/titleAlignmentOnCompileTime
Diff against target: 726 lines (+64/-76)
24 files modified
plugins/Dash/CardCreator.js (+29/-18)
qml/Dash/CardTool.qml (+0/-1)
tests/plugins/Dash/cardcreator/1.res (+3/-4)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+2/-3)
tests/plugins/Dash/cardcreator/10.res (+1/-2)
tests/plugins/Dash/cardcreator/10.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/11.res (+3/-4)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+3/-4)
tests/plugins/Dash/cardcreator/2.res (+1/-2)
tests/plugins/Dash/cardcreator/2.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/3.res (+2/-3)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+2/-3)
tests/plugins/Dash/cardcreator/4.res (+1/-2)
tests/plugins/Dash/cardcreator/4.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/5.res (+3/-4)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+4/-5)
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 (+2/-3)
tests/plugins/Dash/cardcreator/8.res (+1/-2)
tests/plugins/Dash/cardcreator/8.res.cardcreator (+1/-2)
tests/plugins/Dash/cardcreator/9.res (+0/-1)
tests/plugins/Dash/cardcreator/9.res.cardcreator (+0/-1)
To merge this branch: bzr merge lp:~aacid/unity8/cardAsyncOnCompileTime
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+286275@code.launchpad.net

Commit message

asynchronous is only false on the fake card in cardtool

Resolve the code on compile time

Description of the change

 * 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

 * 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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2204
http://jenkins.qa.ubuntu.com/job/unity8-ci/7331/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6524
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/746/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2036/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/737
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6535
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6535/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27695
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/390/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/744
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/744/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27696

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

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

FAILED: Continuous integration, rev:2204
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/393/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/531
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/172
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/172
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/554
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/572
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/568/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/568
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/568/artifact/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:2204
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/402/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/541
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/177
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/177
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/564
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/582
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/582
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/578
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/578/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/578
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/578/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/578
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/578/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/578
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/578/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/578
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/578/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/578
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/578/artifact/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:2204
http://jenkins.qa.ubuntu.com/job/unity8-ci/7339/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6532
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/754/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/747
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/745
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27705
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/395/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27708

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7339/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?
y
 * Did CI run pass? If not, please explain why.
ap
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve
lp:~aacid/unity8/cardAsyncOnCompileTime updated
2205. 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:31:48 +0000
3+++ plugins/Dash/CardCreator.js 2016-03-04 14:31:49 +0000
4@@ -18,12 +18,13 @@
5
6 // %1 is the template["card-background"]["elements"][0]
7 // %2 is the template["card-background"]["elements"][1]
8-// %3 is the template["card-background"] string
9+// %3 is whether the loader should be asynchronous or not
10+// %4 is the template["card-background"] string
11 var kBackgroundLoaderCode = 'Loader {\n\
12 id: backgroundLoader; \n\
13 objectName: "backgroundLoader"; \n\
14 anchors.fill: parent; \n\
15- asynchronous: root.asynchronous; \n\
16+ asynchronous: %3; \n\
17 visible: status == Loader.Ready; \n\
18 sourceComponent: UbuntuShape { \n\
19 objectName: "background"; \n\
20@@ -46,7 +47,7 @@
21 objectName: "backgroundImage"; \n\
22 source: { \n\
23 if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
24- else return %3; \n\
25+ else return %4; \n\
26 } \n\
27 } \n\
28 function getColor(index) { \n\
29@@ -63,8 +64,9 @@
30 // %3 is used as image height
31 // %4 is used for artShapeSource.hideSource and inner Loader visible
32 // %5 is used as aspect ratio fallback
33-// %6 is injected as code to artImage
34-// %7 is used as image fallback
35+// %6 is whether the loader should be asynchronous or not
36+// %7 is injected as code to artImage
37+// %8 is used as image fallback
38 var kArtShapeHolderCode = 'Item { \n\
39 id: artShapeHolder; \n\
40 height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
41@@ -73,9 +75,9 @@
42 Loader { \n\
43 id: artShapeLoader; \n\
44 objectName: "artShapeLoader"; \n\
45- readonly property string cardArt: cardData && cardData["art"] || %7; \n\
46+ readonly property string cardArt: cardData && cardData["art"] || %8; \n\
47 active: cardArt != ""; \n\
48- asynchronous: root.asynchronous; \n\
49+ asynchronous: %6; \n\
50 visible: status == Loader.Ready; \n\
51 sourceComponent: Item { \n\
52 id: artShape; \n\
53@@ -132,10 +134,10 @@
54 id: artImage; \n\
55 objectName: "artImage"; \n\
56 source: artShapeLoader.cardArt; \n\
57- asynchronous: root.asynchronous; \n\
58+ asynchronous: %6; \n\
59 width: %2; \n\
60 height: %3; \n\
61- %6 \n\
62+ %7 \n\
63 } \n\
64 } \n\
65 } \n\
66@@ -187,12 +189,13 @@
67 } \n\
68 }';
69
70+// %1 is whether the loader should be asynchronous or not
71 var kOverlayLoaderCode = 'Loader { \n\
72 id: overlayLoader; \n\
73 readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
74 anchors.fill: artShapeHolder; \n\
75 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
76- asynchronous: root.asynchronous; \n\
77+ asynchronous: %1; \n\
78 visible: showHeader && status == Loader.Ready; \n\
79 sourceComponent: UbuntuShapeOverlay { \n\
80 id: overlay; \n\
81@@ -242,10 +245,11 @@
82 }
83
84 // %1 is used as anchors of mascotShapeLoader
85+// %2 is whether the loader should be asynchronous or not
86 var kMascotShapeLoaderCode = 'Loader { \n\
87 id: mascotShapeLoader; \n\
88 objectName: "mascotShapeLoader"; \n\
89- asynchronous: root.asynchronous; \n\
90+ asynchronous: %2; \n\
91 active: mascotImage.status === Image.Ready; \n\
92 visible: showHeader && active && status == Loader.Ready; \n\
93 width: units.gu(6); \n\
94@@ -414,7 +418,6 @@
95 property int fixedHeaderHeight: -1; \n\
96 property size fixedArtShapeSize: Qt.size(-1, -1); \n\
97 readonly property string title: cardData && cardData["title"] || ""; \n\
98- property bool asynchronous: true; \n\
99 property bool showHeader: true; \n\
100 implicitWidth: childrenRect.width; \n\
101 enabled: %1; \n\
102@@ -435,6 +438,7 @@
103 var hasHeaderRow = hasMascot && hasTitle;
104 var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
105 var isAudio = template["quick-preview-type"] === "audio";
106+ var asynchronous = isCardTool ? "false" : "true";
107
108 if (isAudio) {
109 // For now we only support audio cards with [optional] art, title, subtitle
110@@ -468,7 +472,7 @@
111 backgroundElements1 = '"%1"'.arg(element1);
112 }
113 }
114- code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(templateCardBackground);
115+ code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
116 }
117
118 if (hasArt) {
119@@ -503,17 +507,24 @@
120 var fallbackURICode = '""';
121 if (fallback !== "") {
122 // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
123- // which in kArtShapeHolderCode is %7
124- fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %7;';
125+ // which in kArtShapeHolderCode is %8
126+ fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
127 fallbackURICode = 'decodeURI("%1")'.arg(fallback);
128 }
129- code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode).arg(isConciergeMode ? "false" : "true").arg(aspectRatio).arg(fallbackStatusCode).arg(fallbackURICode);
130+ code += kArtShapeHolderCode.arg(artAnchors)
131+ .arg(widthCode)
132+ .arg(heightCode)
133+ .arg(isConciergeMode ? "false" : "true")
134+ .arg(aspectRatio)
135+ .arg(asynchronous)
136+ .arg(fallbackStatusCode)
137+ .arg(fallbackURICode);
138 } else {
139 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
140 }
141
142 if (headerAsOverlay) {
143- code += kOverlayLoaderCode;
144+ code += kOverlayLoaderCode.arg(asynchronous);
145 }
146
147 var headerVerticalAnchors;
148@@ -595,7 +606,7 @@
149 }
150
151 if (useMascotShape) {
152- mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
153+ mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);
154 }
155
156 var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
157
158=== modified file 'qml/Dash/CardTool.qml'
159--- qml/Dash/CardTool.qml 2016-03-04 14:31:48 +0000
160+++ qml/Dash/CardTool.qml 2016-03-04 14:31:49 +0000
161@@ -196,7 +196,6 @@
162 sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true);
163 onLoaded: {
164 item.objectName = "cardToolCard";
165- item.asynchronous = false;
166 item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });
167 item.height = Qt.binding(function() { return cardTool.cardHeight !== -1 ? cardTool.cardHeight : item.implicitHeight; });
168 }
169
170=== modified file 'tests/plugins/Dash/cardcreator/1.res'
171--- tests/plugins/Dash/cardcreator/1.res 2016-03-04 14:31:48 +0000
172+++ tests/plugins/Dash/cardcreator/1.res 2016-03-04 14:31:49 +0000
173@@ -8,8 +8,7 @@
174 property int fixedHeaderHeight: -1;
175 property size fixedArtShapeSize: Qt.size(-1, -1);
176 readonly property string title: cardData && cardData["title"] || "";
177- property bool asynchronous: true;
178- property bool showHeader: true;
179+ property bool showHeader: true;
180 implicitWidth: childrenRect.width;
181 enabled: true;
182
183@@ -24,7 +23,7 @@
184 objectName: "artShapeLoader";
185 readonly property string cardArt: cardData && cardData["art"] || "";
186 active: cardArt != "";
187- asynchronous: root.asynchronous;
188+ asynchronous: true;
189 visible: status == Loader.Ready;
190 sourceComponent: Item {
191 id: artShape;
192@@ -81,7 +80,7 @@
193 id: artImage;
194 objectName: "artImage";
195 source: artShapeLoader.cardArt;
196- asynchronous: root.asynchronous;
197+ asynchronous: true;
198 width: root.width;
199 height: width / artShape.aspect;
200 }
201
202=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
203--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-04 14:31:48 +0000
204+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-03-04 14:31:49 +0000
205@@ -8,7 +8,6 @@
206 property int fixedHeaderHeight: -1;
207 property size fixedArtShapeSize: Qt.size(-1, -1);
208 readonly property string title: cardData && cardData["title"] || "";
209- property bool asynchronous: true;
210 property bool showHeader: true;
211 implicitWidth: childrenRect.width;
212 enabled: true;
213@@ -24,7 +23,7 @@
214 objectName: "artShapeLoader";
215 readonly property string cardArt: cardData && cardData["art"] || "";
216 active: cardArt != "";
217- asynchronous: root.asynchronous;
218+ asynchronous: false;
219 visible: status == Loader.Ready;
220 sourceComponent: Item {
221 id: artShape;
222@@ -81,7 +80,7 @@
223 id: artImage;
224 objectName: "artImage";
225 source: artShapeLoader.cardArt;
226- asynchronous: root.asynchronous;
227+ asynchronous: false;
228 width: root.width;
229 height: width / artShape.aspect;
230 }
231
232=== modified file 'tests/plugins/Dash/cardcreator/10.res'
233--- tests/plugins/Dash/cardcreator/10.res 2016-03-04 14:31:48 +0000
234+++ tests/plugins/Dash/cardcreator/10.res 2016-03-04 14:31:49 +0000
235@@ -8,7 +8,6 @@
236 property int fixedHeaderHeight: -1;
237 property size fixedArtShapeSize: Qt.size(-1, -1);
238 readonly property string title: cardData && cardData["title"] || "";
239- property bool asynchronous: true;
240 property bool showHeader: true;
241 implicitWidth: childrenRect.width;
242 enabled: true;
243@@ -17,7 +16,7 @@
244 id: backgroundLoader;
245 objectName: "backgroundLoader";
246 anchors.fill: parent;
247- asynchronous: root.asynchronous;
248+ asynchronous: true;
249 visible: status == Loader.Ready;
250 sourceComponent: UbuntuShape {
251 objectName: "background";
252
253=== modified file 'tests/plugins/Dash/cardcreator/10.res.cardcreator'
254--- tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-03-04 14:31:48 +0000
255+++ tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-03-04 14:31:49 +0000
256@@ -8,7 +8,6 @@
257 property int fixedHeaderHeight: -1;
258 property size fixedArtShapeSize: Qt.size(-1, -1);
259 readonly property string title: cardData && cardData["title"] || "";
260- property bool asynchronous: true;
261 property bool showHeader: true;
262 implicitWidth: childrenRect.width;
263 enabled: true;
264@@ -17,7 +16,7 @@
265 id: backgroundLoader;
266 objectName: "backgroundLoader";
267 anchors.fill: parent;
268- asynchronous: root.asynchronous;
269+ asynchronous: false;
270 visible: status == Loader.Ready;
271 sourceComponent: UbuntuShape {
272 objectName: "background";
273
274=== modified file 'tests/plugins/Dash/cardcreator/11.res'
275--- tests/plugins/Dash/cardcreator/11.res 2016-03-04 14:31:48 +0000
276+++ tests/plugins/Dash/cardcreator/11.res 2016-03-04 14:31:49 +0000
277@@ -8,7 +8,6 @@
278 property int fixedHeaderHeight: -1;
279 property size fixedArtShapeSize: Qt.size(-1, -1);
280 readonly property string title: cardData && cardData["title"] || "";
281- property bool asynchronous: true;
282 property bool showHeader: true;
283 implicitWidth: childrenRect.width;
284 enabled: true;
285@@ -17,7 +16,7 @@
286 id: backgroundLoader;
287 objectName: "backgroundLoader";
288 anchors.fill: parent;
289- asynchronous: root.asynchronous;
290+ asynchronous: true;
291 visible: status == Loader.Ready;
292 sourceComponent: UbuntuShape {
293 objectName: "background";
294@@ -62,7 +61,7 @@
295 objectName: "artShapeLoader";
296 readonly property string cardArt: cardData && cardData["art"] || decodeURI("%5C");
297 active: cardArt != "";
298- asynchronous: root.asynchronous;
299+ asynchronous: true;
300 visible: status == Loader.Ready;
301 sourceComponent: Item {
302 id: artShape;
303@@ -119,7 +118,7 @@
304 id: artImage;
305 objectName: "artImage";
306 source: artShapeLoader.cardArt;
307- asynchronous: root.asynchronous;
308+ asynchronous: true;
309 width: root.width;
310 height: width / artShape.aspect;
311 onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");
312
313=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
314--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-04 14:31:48 +0000
315+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-03-04 14:31:49 +0000
316@@ -8,7 +8,6 @@
317 property int fixedHeaderHeight: -1;
318 property size fixedArtShapeSize: Qt.size(-1, -1);
319 readonly property string title: cardData && cardData["title"] || "";
320- property bool asynchronous: true;
321 property bool showHeader: true;
322 implicitWidth: childrenRect.width;
323 enabled: true;
324@@ -17,7 +16,7 @@
325 id: backgroundLoader;
326 objectName: "backgroundLoader";
327 anchors.fill: parent;
328- asynchronous: root.asynchronous;
329+ asynchronous: false;
330 visible: status == Loader.Ready;
331 sourceComponent: UbuntuShape {
332 objectName: "background";
333@@ -62,7 +61,7 @@
334 objectName: "artShapeLoader";
335 readonly property string cardArt: cardData && cardData["art"] || "";
336 active: cardArt != "";
337- asynchronous: root.asynchronous;
338+ asynchronous: false;
339 visible: status == Loader.Ready;
340 sourceComponent: Item {
341 id: artShape;
342@@ -119,7 +118,7 @@
343 id: artImage;
344 objectName: "artImage";
345 source: artShapeLoader.cardArt;
346- asynchronous: root.asynchronous;
347+ asynchronous: false;
348 width: root.width;
349 height: width / artShape.aspect;
350 }
351
352=== modified file 'tests/plugins/Dash/cardcreator/2.res'
353--- tests/plugins/Dash/cardcreator/2.res 2016-03-04 14:31:48 +0000
354+++ tests/plugins/Dash/cardcreator/2.res 2016-03-04 14:31:49 +0000
355@@ -8,7 +8,6 @@
356 property int fixedHeaderHeight: -1;
357 property size fixedArtShapeSize: Qt.size(-1, -1);
358 readonly property string title: cardData && cardData["title"] || "";
359- property bool asynchronous: true;
360 property bool showHeader: true;
361 implicitWidth: childrenRect.width;
362 enabled: true;
363@@ -17,7 +16,7 @@
364 id: backgroundLoader;
365 objectName: "backgroundLoader";
366 anchors.fill: parent;
367- asynchronous: root.asynchronous;
368+ asynchronous: true;
369 visible: status == Loader.Ready;
370 sourceComponent: UbuntuShape {
371 objectName: "background";
372
373=== modified file 'tests/plugins/Dash/cardcreator/2.res.cardcreator'
374--- tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-03-04 14:31:48 +0000
375+++ tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-03-04 14:31:49 +0000
376@@ -8,7 +8,6 @@
377 property int fixedHeaderHeight: -1;
378 property size fixedArtShapeSize: Qt.size(-1, -1);
379 readonly property string title: cardData && cardData["title"] || "";
380- property bool asynchronous: true;
381 property bool showHeader: true;
382 implicitWidth: childrenRect.width;
383 enabled: true;
384@@ -17,7 +16,7 @@
385 id: backgroundLoader;
386 objectName: "backgroundLoader";
387 anchors.fill: parent;
388- asynchronous: root.asynchronous;
389+ asynchronous: false;
390 visible: status == Loader.Ready;
391 sourceComponent: UbuntuShape {
392 objectName: "background";
393
394=== modified file 'tests/plugins/Dash/cardcreator/3.res'
395--- tests/plugins/Dash/cardcreator/3.res 2016-03-04 14:31:48 +0000
396+++ tests/plugins/Dash/cardcreator/3.res 2016-03-04 14:31:49 +0000
397@@ -8,7 +8,6 @@
398 property int fixedHeaderHeight: -1;
399 property size fixedArtShapeSize: Qt.size(-1, -1);
400 readonly property string title: cardData && cardData["title"] || "";
401- property bool asynchronous: true;
402 property bool showHeader: true;
403 implicitWidth: childrenRect.width;
404 enabled: true;
405@@ -24,7 +23,7 @@
406 objectName: "artShapeLoader";
407 readonly property string cardArt: cardData && cardData["art"] || decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
408 active: cardArt != "";
409- asynchronous: root.asynchronous;
410+ asynchronous: true;
411 visible: status == Loader.Ready;
412 sourceComponent: Item {
413 id: artShape;
414@@ -81,7 +80,7 @@
415 id: artImage;
416 objectName: "artImage";
417 source: artShapeLoader.cardArt;
418- asynchronous: root.asynchronous;
419+ asynchronous: true;
420 width: root.width;
421 height: width / artShape.aspect;
422 onStatusChanged: if (status === Image.Error) source = decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
423
424=== modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
425--- tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-04 14:31:48 +0000
426+++ tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-03-04 14:31:49 +0000
427@@ -8,7 +8,6 @@
428 property int fixedHeaderHeight: -1;
429 property size fixedArtShapeSize: Qt.size(-1, -1);
430 readonly property string title: cardData && cardData["title"] || "";
431- property bool asynchronous: true;
432 property bool showHeader: true;
433 implicitWidth: childrenRect.width;
434 enabled: true;
435@@ -24,7 +23,7 @@
436 objectName: "artShapeLoader";
437 readonly property string cardArt: cardData && cardData["art"] || "";
438 active: cardArt != "";
439- asynchronous: root.asynchronous;
440+ asynchronous: false;
441 visible: status == Loader.Ready;
442 sourceComponent: Item {
443 id: artShape;
444@@ -81,7 +80,7 @@
445 id: artImage;
446 objectName: "artImage";
447 source: artShapeLoader.cardArt;
448- asynchronous: root.asynchronous;
449+ asynchronous: false;
450 width: root.width;
451 height: width / artShape.aspect;
452 }
453
454=== modified file 'tests/plugins/Dash/cardcreator/4.res'
455--- tests/plugins/Dash/cardcreator/4.res 2016-03-04 14:31:48 +0000
456+++ tests/plugins/Dash/cardcreator/4.res 2016-03-04 14:31:49 +0000
457@@ -8,7 +8,6 @@
458 property int fixedHeaderHeight: -1;
459 property size fixedArtShapeSize: Qt.size(-1, -1);
460 readonly property string title: cardData && cardData["title"] || "";
461- property bool asynchronous: true;
462 property bool showHeader: true;
463 implicitWidth: childrenRect.width;
464 enabled: true;
465@@ -32,7 +31,7 @@
466 Loader {
467 id: mascotShapeLoader;
468 objectName: "mascotShapeLoader";
469- asynchronous: root.asynchronous;
470+ asynchronous: true;
471 active: mascotImage.status === Image.Ready;
472 visible: showHeader && active && status == Loader.Ready;
473 width: units.gu(6);
474
475=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
476--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-03-04 14:31:48 +0000
477+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-03-04 14:31:49 +0000
478@@ -8,7 +8,6 @@
479 property int fixedHeaderHeight: -1;
480 property size fixedArtShapeSize: Qt.size(-1, -1);
481 readonly property string title: cardData && cardData["title"] || "";
482- property bool asynchronous: true;
483 property bool showHeader: true;
484 implicitWidth: childrenRect.width;
485 enabled: true;
486@@ -32,7 +31,7 @@
487 Loader {
488 id: mascotShapeLoader;
489 objectName: "mascotShapeLoader";
490- asynchronous: root.asynchronous;
491+ asynchronous: false;
492 active: mascotImage.status === Image.Ready;
493 visible: showHeader && active && status == Loader.Ready;
494 width: units.gu(6);
495
496=== modified file 'tests/plugins/Dash/cardcreator/5.res'
497--- tests/plugins/Dash/cardcreator/5.res 2016-03-04 14:31:48 +0000
498+++ tests/plugins/Dash/cardcreator/5.res 2016-03-04 14:31:49 +0000
499@@ -8,7 +8,6 @@
500 property int fixedHeaderHeight: -1;
501 property size fixedArtShapeSize: Qt.size(-1, -1);
502 readonly property string title: cardData && cardData["title"] || "";
503- property bool asynchronous: true;
504 property bool showHeader: true;
505 implicitWidth: childrenRect.width;
506 enabled: false;
507@@ -24,7 +23,7 @@
508 objectName: "artShapeLoader";
509 readonly property string cardArt: cardData && cardData["art"] || "";
510 active: cardArt != "";
511- asynchronous: root.asynchronous;
512+ asynchronous: true;
513 visible: status == Loader.Ready;
514 sourceComponent: Item {
515 id: artShape;
516@@ -81,7 +80,7 @@
517 id: artImage;
518 objectName: "artImage";
519 source: artShapeLoader.cardArt;
520- asynchronous: root.asynchronous;
521+ asynchronous: true;
522 width: root.width;
523 height: width / artShape.aspect;
524 }
525@@ -93,7 +92,7 @@
526 readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
527 anchors.fill: artShapeHolder;
528 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
529- asynchronous: root.asynchronous;
530+ asynchronous: true;
531 visible: showHeader && status == Loader.Ready;
532 sourceComponent: UbuntuShapeOverlay {
533 id: overlay;
534
535=== modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
536--- tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-04 14:31:48 +0000
537+++ tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-03-04 14:31:49 +0000
538@@ -8,8 +8,7 @@
539 property int fixedHeaderHeight: -1;
540 property size fixedArtShapeSize: Qt.size(-1, -1);
541 readonly property string title: cardData && cardData["title"] || "";
542- property bool asynchronous: true;
543- property bool showHeader: true;
544+ property bool showHeader: true;
545 implicitWidth: childrenRect.width;
546 enabled: false;
547
548@@ -24,7 +23,7 @@
549 objectName: "artShapeLoader";
550 readonly property string cardArt: cardData && cardData["art"] || "";
551 active: cardArt != "";
552- asynchronous: root.asynchronous;
553+ asynchronous: false;
554 visible: status == Loader.Ready;
555 sourceComponent: Item {
556 id: artShape;
557@@ -81,7 +80,7 @@
558 id: artImage;
559 objectName: "artImage";
560 source: artShapeLoader.cardArt;
561- asynchronous: root.asynchronous;
562+ asynchronous: false;
563 width: root.width;
564 height: width / artShape.aspect;
565 }
566@@ -93,7 +92,7 @@
567 readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
568 anchors.fill: artShapeHolder;
569 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
570- asynchronous: root.asynchronous;
571+ asynchronous: false;
572 visible: showHeader && status == Loader.Ready;
573 sourceComponent: UbuntuShapeOverlay {
574 id: overlay;
575
576=== modified file 'tests/plugins/Dash/cardcreator/6.res'
577--- tests/plugins/Dash/cardcreator/6.res 2016-03-04 14:31:48 +0000
578+++ tests/plugins/Dash/cardcreator/6.res 2016-03-04 14:31:49 +0000
579@@ -8,7 +8,6 @@
580 property int fixedHeaderHeight: -1;
581 property size fixedArtShapeSize: Qt.size(-1, -1);
582 readonly property string title: cardData && cardData["title"] || "";
583- property bool asynchronous: true;
584 property bool showHeader: true;
585 implicitWidth: childrenRect.width;
586 enabled: true;
587@@ -17,7 +16,7 @@
588 id: backgroundLoader;
589 objectName: "backgroundLoader";
590 anchors.fill: parent;
591- asynchronous: root.asynchronous;
592+ asynchronous: true;
593 visible: status == Loader.Ready;
594 sourceComponent: UbuntuShape {
595 objectName: "background";
596
597=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
598--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-03-04 14:31:48 +0000
599+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-03-04 14:31:49 +0000
600@@ -8,7 +8,6 @@
601 property int fixedHeaderHeight: -1;
602 property size fixedArtShapeSize: Qt.size(-1, -1);
603 readonly property string title: cardData && cardData["title"] || "";
604- property bool asynchronous: true;
605 property bool showHeader: true;
606 implicitWidth: childrenRect.width;
607 enabled: true;
608@@ -17,7 +16,7 @@
609 id: backgroundLoader;
610 objectName: "backgroundLoader";
611 anchors.fill: parent;
612- asynchronous: root.asynchronous;
613+ asynchronous: false;
614 visible: status == Loader.Ready;
615 sourceComponent: UbuntuShape {
616 objectName: "background";
617
618=== modified file 'tests/plugins/Dash/cardcreator/7.res'
619--- tests/plugins/Dash/cardcreator/7.res 2016-03-04 14:31:48 +0000
620+++ tests/plugins/Dash/cardcreator/7.res 2016-03-04 14:31:49 +0000
621@@ -8,7 +8,6 @@
622 property int fixedHeaderHeight: -1;
623 property size fixedArtShapeSize: Qt.size(-1, -1);
624 readonly property string title: cardData && cardData["title"] || "";
625- property bool asynchronous: true;
626 property bool showHeader: true;
627 implicitWidth: childrenRect.width;
628 enabled: true;
629@@ -17,7 +16,7 @@
630 id: backgroundLoader;
631 objectName: "backgroundLoader";
632 anchors.fill: parent;
633- asynchronous: root.asynchronous;
634+ asynchronous: true;
635 visible: status == Loader.Ready;
636 sourceComponent: UbuntuShape {
637 objectName: "background";
638
639=== modified file 'tests/plugins/Dash/cardcreator/7.res.cardcreator'
640--- tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-03-04 14:31:48 +0000
641+++ tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-03-04 14:31:49 +0000
642@@ -8,8 +8,7 @@
643 property int fixedHeaderHeight: -1;
644 property size fixedArtShapeSize: Qt.size(-1, -1);
645 readonly property string title: cardData && cardData["title"] || "";
646- property bool asynchronous: true;
647- property bool showHeader: true;
648+ property bool showHeader: true;
649 implicitWidth: childrenRect.width;
650 enabled: true;
651
652@@ -17,7 +16,7 @@
653 id: backgroundLoader;
654 objectName: "backgroundLoader";
655 anchors.fill: parent;
656- asynchronous: root.asynchronous;
657+ asynchronous: false;
658 visible: status == Loader.Ready;
659 sourceComponent: UbuntuShape {
660 objectName: "background";
661
662=== modified file 'tests/plugins/Dash/cardcreator/8.res'
663--- tests/plugins/Dash/cardcreator/8.res 2016-03-04 14:31:48 +0000
664+++ tests/plugins/Dash/cardcreator/8.res 2016-03-04 14:31:49 +0000
665@@ -8,7 +8,6 @@
666 property int fixedHeaderHeight: -1;
667 property size fixedArtShapeSize: Qt.size(-1, -1);
668 readonly property string title: cardData && cardData["title"] || "";
669- property bool asynchronous: true;
670 property bool showHeader: true;
671 implicitWidth: childrenRect.width;
672 enabled: true;
673@@ -17,7 +16,7 @@
674 id: backgroundLoader;
675 objectName: "backgroundLoader";
676 anchors.fill: parent;
677- asynchronous: root.asynchronous;
678+ asynchronous: true;
679 visible: status == Loader.Ready;
680 sourceComponent: UbuntuShape {
681 objectName: "background";
682
683=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
684--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-03-04 14:31:48 +0000
685+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-03-04 14:31:49 +0000
686@@ -8,7 +8,6 @@
687 property int fixedHeaderHeight: -1;
688 property size fixedArtShapeSize: Qt.size(-1, -1);
689 readonly property string title: cardData && cardData["title"] || "";
690- property bool asynchronous: true;
691 property bool showHeader: true;
692 implicitWidth: childrenRect.width;
693 enabled: true;
694@@ -17,7 +16,7 @@
695 id: backgroundLoader;
696 objectName: "backgroundLoader";
697 anchors.fill: parent;
698- asynchronous: root.asynchronous;
699+ asynchronous: false;
700 visible: status == Loader.Ready;
701 sourceComponent: UbuntuShape {
702 objectName: "background";
703
704=== modified file 'tests/plugins/Dash/cardcreator/9.res'
705--- tests/plugins/Dash/cardcreator/9.res 2016-03-04 14:31:48 +0000
706+++ tests/plugins/Dash/cardcreator/9.res 2016-03-04 14:31:49 +0000
707@@ -8,7 +8,6 @@
708 property int fixedHeaderHeight: -1;
709 property size fixedArtShapeSize: Qt.size(-1, -1);
710 readonly property string title: cardData && cardData["title"] || "";
711- property bool asynchronous: true;
712 property bool showHeader: true;
713 implicitWidth: childrenRect.width;
714 enabled: true;
715
716=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
717--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-04 14:31:48 +0000
718+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-04 14:31:49 +0000
719@@ -8,7 +8,6 @@
720 property int fixedHeaderHeight: -1;
721 property size fixedArtShapeSize: Qt.size(-1, -1);
722 readonly property string title: cardData && cardData["title"] || "";
723- property bool asynchronous: true;
724 property bool showHeader: true;
725 implicitWidth: childrenRect.width;
726 enabled: true;

Subscribers

People subscribed via source and target branches