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