Unity 8

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

  1. unboxArtShapeLoader
  2. Merge into trunk
Proposed by Andrea Cimitan on 2016-06-27
Status: Merged
Approved by: Albert Astals Cid on 2016-06-29
Approved revision: 2227
Merged at revision: 2559
Proposed branch: lp:~unity-team/unity8/unboxArtShapeLoader
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/simplifyCardCodeFixedArtShapeSize
Diff against target: 1005 lines (+154/-202)
23 files modified
plugins/Dash/CardCreator.js (+70/-78)
tests/plugins/Dash/cardcreator/1.res (+8/-11)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+6/-11)
tests/plugins/Dash/cardcreator/10.res (+1/-1)
tests/plugins/Dash/cardcreator/10.res.cardcreator (+1/-1)
tests/plugins/Dash/cardcreator/11.res (+9/-12)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+6/-11)
tests/plugins/Dash/cardcreator/12.res (+8/-11)
tests/plugins/Dash/cardcreator/12.res.cardcreator (+6/-11)
tests/plugins/Dash/cardcreator/2.res (+1/-1)
tests/plugins/Dash/cardcreator/2.res.cardcreator (+1/-1)
tests/plugins/Dash/cardcreator/3.res (+7/-10)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+6/-11)
tests/plugins/Dash/cardcreator/4.res (+1/-1)
tests/plugins/Dash/cardcreator/4.res.cardcreator (+1/-1)
tests/plugins/Dash/cardcreator/5.res (+9/-12)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+7/-12)
tests/plugins/Dash/cardcreator/6.res (+1/-1)
tests/plugins/Dash/cardcreator/6.res.cardcreator (+1/-1)
tests/plugins/Dash/cardcreator/7.res (+1/-1)
tests/plugins/Dash/cardcreator/7.res.cardcreator (+1/-1)
tests/plugins/Dash/cardcreator/8.res (+1/-1)
tests/plugins/Dash/cardcreator/8.res.cardcreator (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity8/unboxArtShapeLoader
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration 2016-06-27 Needs Fixing on 2016-06-29
Albert Astals Cid (community) Approve on 2016-06-29
Andrea Cimitan Pending
Michael Zanetti 2016-06-27 Pending
Review via email: mp+298431@code.launchpad.net

This proposal supersedes a proposal from 2016-05-20.

Commit Message

Unbox the artshapeLoader

There's no need for it to be inside an Item

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

 * 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.
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2220
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1270/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/804
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/804
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1712
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1662
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1662
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1655
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1655/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1655
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1655/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1655
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1655/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1655
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1655/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1655
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1655/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1655
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1655/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2221
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1275/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/809
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1667
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1667
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1660
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1660/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1660
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1660/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1660
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1660/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1660
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1660/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1660
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1660/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1660
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1660/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

javascript nitpicks

review: Needs Fixing
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

I just changed all the == of the code generated by CardCreator.js to ===

Some were not part of this MR but i thought it made sense to do them all together.

Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2222
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1304/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1729
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/831
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/831
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/831
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1755
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1700
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1700
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1700
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1693/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1693
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1693/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes I did
 * Did CI run pass? If not, please explain why.
not due to this

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2222
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1510/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2013
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1024
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1024
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1024
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2041
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1958
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1958
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1958
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1949/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1949
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1949/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2222
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1534/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2041
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1047
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1047
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1047
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2069
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1981
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1981
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1981
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1972/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1972
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1972/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

This causes a small regression: http://i.imgur.com/S5r99Rh.png

This only happens in some circumstances though.

a) if the image is loaded delayed (won't happen any more on a second refresh)
b) if the card defines an image but the actual entry does not contain on.

One scope to reproduce is the stol-scope.mzanetti from the store as that RSS feed frequently posts out articles without picture.

review: Needs Fixing
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

> One scope to reproduce is the stol-scope.mzanetti from the store as that RSS
> feed frequently posts out articles without picture.

I meant ulm-news.mzanetti

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2223
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1619/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2157
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1140/console
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1140
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1140
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2185
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2092
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2092
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2092
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2083/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2083
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2083/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/unboxArtShapeLoader updated on 2016-06-27
2224. By Andrea Cimitan on 2016-06-27

fixed cardcreator test

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2223
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1620/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2159
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1141
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1141
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1141
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2187
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2094
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2094
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2094
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2085/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2085
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2085/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2224
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1621/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2160
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1142
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1142
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1142
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2188
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2095
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2095
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2095
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2086/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2086
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2086/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Albert Astals Cid (aacid) wrote :

There's no fixedArtShapeSize variable in the isCardTool variants

review: Needs Fixing
lp:~unity-team/unity8/unboxArtShapeLoader updated on 2016-06-28
2225. By Andrea Cimitan on 2016-06-28

fix as review

2226. By Andrea Cimitan on 2016-06-28

spacing

2227. By Andrea Cimitan on 2016-06-28

ooops

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2225
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1625/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2167
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1148
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1148
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1148
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2195
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2102
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2102
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2102
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2093/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2093
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2093/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2227
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1626/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2168
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1149
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1149
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1149
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2196
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2103
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2103
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2103
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2094/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2094
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2094/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Albert Astals Cid (aacid) wrote :

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

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

Cimi reviewed by code and I reviewed his, should be good.

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2227
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1636/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2178/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2206
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2103/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2103
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2103/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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-06-17 01:18:49 +0000
3+++ plugins/Dash/CardCreator.js 2016-06-28 15:51:00 +0000
4@@ -25,7 +25,7 @@
5 objectName: "backgroundLoader"; \n\
6 anchors.fill: parent; \n\
7 asynchronous: %3; \n\
8- visible: status == Loader.Ready; \n\
9+ visible: status === Loader.Ready; \n\
10 sourceComponent: UbuntuShape { \n\
11 objectName: "background"; \n\
12 radius: "medium"; \n\
13@@ -75,7 +75,7 @@
14 aspect: UbuntuShape.DropShadow; \n\
15 }';
16
17-// %1 is used as anchors of artShapeHolder
18+// %1 is used as anchors of artShapeLoader
19 // %2 is used as image width
20 // %3 is used as image height
21 // %4 is whether the image should be visible
22@@ -83,42 +83,39 @@
23 // %6 is the shape code we want to use
24 // %7 is injected as code to artImage
25 // %8 is used as image fallback
26-var kArtShapeHolderCode = 'Item { \n\
27- id: artShapeHolder; \n\
28+var kArtShapeHolderCode = 'Loader { \n\
29+ id: artShapeLoader; \n\
30 height: root.fixedArtShapeSize.height; \n\
31 width: root.fixedArtShapeSize.width; \n\
32 anchors { %1 } \n\
33- Loader { \n\
34- id: artShapeLoader; \n\
35- objectName: "artShapeLoader"; \n\
36- readonly property string cardArt: cardData && cardData["art"] || %8; \n\
37- onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
38- active: cardArt != ""; \n\
39- asynchronous: %5; \n\
40- visible: status == Loader.Ready; \n\
41- sourceComponent: Item { \n\
42- id: artShape; \n\
43- objectName: "artShape"; \n\
44- visible: image.status == Image.Ready; \n\
45- readonly property alias image: artImage; \n\
46- %6 \n\
47- width: root.fixedArtShapeSize.width; \n\
48- height: root.fixedArtShapeSize.height; \n\
49- CroppedImageMinimumSourceSize { \n\
50- id: artImage; \n\
51- objectName: "artImage"; \n\
52- source: artShapeLoader.cardArt; \n\
53- asynchronous: %5; \n\
54- visible: %4; \n\
55- width: %2; \n\
56- height: %3; \n\
57- %7 \n\
58- } \n\
59+ objectName: "artShapeLoader"; \n\
60+ readonly property string cardArt: cardData && cardData["art"] || %8; \n\
61+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
62+ active: cardArt != ""; \n\
63+ asynchronous: %5; \n\
64+ visible: status === Loader.Ready; \n\
65+ sourceComponent: Item { \n\
66+ id: artShape; \n\
67+ objectName: "artShape"; \n\
68+ visible: image.status === Image.Ready; \n\
69+ readonly property alias image: artImage; \n\
70+ %6 \n\
71+ width: root.fixedArtShapeSize.width; \n\
72+ height: root.fixedArtShapeSize.height; \n\
73+ CroppedImageMinimumSourceSize { \n\
74+ id: artImage; \n\
75+ objectName: "artImage"; \n\
76+ source: artShapeLoader.cardArt; \n\
77+ asynchronous: %5; \n\
78+ visible: %4; \n\
79+ width: %2; \n\
80+ height: %3; \n\
81+ %7 \n\
82 } \n\
83 } \n\
84 }\n';
85
86-// %1 is used as anchors of artShapeHolder
87+// %1 is used as anchors of artShapeLoader
88 // %2 is used as image width
89 // %3 is used as image height
90 // %4 is whether the image should be visible
91@@ -126,37 +123,32 @@
92 // %6 is the shape code we want to use
93 // %7 is injected as code to artImage
94 // %8 is used as image fallback
95-var kArtShapeHolderCodeCardToolCard = 'Item { \n\
96- id: artShapeHolder; \n\
97- height: artShapeLoader.height; \n\
98- width: artShapeLoader.width; \n\
99+var kArtShapeHolderCodeCardToolCard = 'Loader { \n\
100+ id: artShapeLoader; \n\
101 anchors { %1 } \n\
102- Loader { \n\
103- id: artShapeLoader; \n\
104- objectName: "artShapeLoader"; \n\
105- readonly property string cardArt: cardData && cardData["art"] || %8; \n\
106- onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
107- active: cardArt != ""; \n\
108- asynchronous: %5; \n\
109- visible: status == Loader.Ready; \n\
110- sourceComponent: Item { \n\
111- id: artShape; \n\
112- objectName: "artShape"; \n\
113- visible: image.status == Image.Ready; \n\
114- readonly property alias image: artImage; \n\
115- %6 \n\
116- width: image.status !== Image.Ready ? 0 : image.width; \n\
117- height: image.status !== Image.Ready ? 0 : image.height; \n\
118- CroppedImageMinimumSourceSize { \n\
119- id: artImage; \n\
120- objectName: "artImage"; \n\
121- source: artShapeLoader.cardArt; \n\
122- asynchronous: %5; \n\
123- visible: %4; \n\
124- width: %2; \n\
125- height: %3; \n\
126- %7 \n\
127- } \n\
128+ objectName: "artShapeLoader"; \n\
129+ readonly property string cardArt: cardData && cardData["art"] || %8; \n\
130+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
131+ active: cardArt != ""; \n\
132+ asynchronous: %5; \n\
133+ visible: status === Loader.Ready; \n\
134+ sourceComponent: Item { \n\
135+ id: artShape; \n\
136+ objectName: "artShape"; \n\
137+ visible: image.status === Image.Ready; \n\
138+ readonly property alias image: artImage; \n\
139+ %6 \n\
140+ width: image.status !== Image.Ready ? 0 : image.width; \n\
141+ height: image.status !== Image.Ready ? 0 : image.height; \n\
142+ CroppedImageMinimumSourceSize { \n\
143+ id: artImage; \n\
144+ objectName: "artImage"; \n\
145+ source: artShapeLoader.cardArt; \n\
146+ asynchronous: %5; \n\
147+ visible: %4; \n\
148+ width: %2; \n\
149+ height: %3; \n\
150+ %7 \n\
151 } \n\
152 } \n\
153 }\n';
154@@ -214,10 +206,10 @@
155 var kOverlayLoaderCode = 'Loader { \n\
156 id: overlayLoader; \n\
157 readonly property real overlayHeight: %2 + units.gu(2); \n\
158- anchors.fill: artShapeHolder; \n\
159+ anchors.fill: artShapeLoader; \n\
160 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
161 asynchronous: %1; \n\
162- visible: showHeader && status == Loader.Ready; \n\
163+ visible: showHeader && status === Loader.Ready; \n\
164 sourceComponent: UbuntuShapeOverlay { \n\
165 id: overlay; \n\
166 property real luminance: Style.luminance(overlayColor); \n\
167@@ -274,7 +266,7 @@
168 objectName: "mascotShapeLoader"; \n\
169 asynchronous: %2; \n\
170 active: mascotImage.status === Image.Ready; \n\
171- visible: showHeader && active && status == Loader.Ready; \n\
172+ visible: showHeader && active && status === Loader.Ready; \n\
173 width: units.gu(6); \n\
174 height: units.gu(5.625); \n\
175 sourceComponent: UbuntuShape { image: mascotImage } \n\
176@@ -592,15 +584,15 @@
177
178 var headerVerticalAnchors;
179 if (headerAsOverlay) {
180- headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\
181+ headerVerticalAnchors = 'bottom: artShapeLoader.bottom; \n\
182 bottomMargin: units.gu(1);\n';
183 } else {
184 if (hasArt) {
185 if (isHorizontal) {
186- headerVerticalAnchors = 'top: artShapeHolder.top; \n\
187+ headerVerticalAnchors = 'top: artShapeLoader.top; \n\
188 topMargin: units.gu(1);\n';
189 } else {
190- headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\
191+ headerVerticalAnchors = 'top: artShapeLoader.bottom; \n\
192 topMargin: units.gu(1);\n';
193 }
194 } else {
195@@ -612,7 +604,7 @@
196 var headerLeftAnchor;
197 var headerLeftAnchorHasMargin = false;
198 if (isHorizontal && hasArt) {
199- headerLeftAnchor = 'left: artShapeHolder.right; \n\
200+ headerLeftAnchor = 'left: artShapeLoader.right; \n\
201 leftMargin: units.gu(1);\n';
202 headerLeftAnchorHasMargin = true;
203 } else if (isHorizontal && isAudio) {
204@@ -866,7 +858,7 @@
205 var audioButtonWidth;
206 var audioButtonHeight;
207 if (hasArt) {
208- audioButtonAnchorsFill = 'artShapeHolder';
209+ audioButtonAnchorsFill = 'artShapeLoader';
210 audioButtonWidth = 'undefined';
211 audioButtonHeight = 'undefined';
212 } else {
213@@ -880,15 +872,15 @@
214
215 if (hasSummary) {
216 var summaryTopAnchor;
217- if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
218- else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
219+ if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';
220+ else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';
221 else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
222 else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
223 else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
224 else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
225 else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
226 else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
227- else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
228+ else if (hasArt) summaryTopAnchor = 'artShapeLoader.bottom';
229 else summaryTopAnchor = 'parent.top';
230
231 var summaryColor;
232@@ -908,15 +900,15 @@
233 var socialTopAnchor;
234
235 if (hasSummary) socialTopAnchor = 'summary.bottom;';
236- else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
237- else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
238+ else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';
239+ else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';
240 else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';
241 else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';
242 else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';
243 else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';
244 else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';
245 else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';
246- else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
247+ else if (hasArt) socialTopAnchor = 'artShapeLoader.bottom;';
248 else socialTopAnchor = 'parent.top';
249
250 socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'
251@@ -936,7 +928,7 @@
252 if (hasBackground) {
253 touchdownAnchors = 'fill: backgroundLoader';
254 } else if (touchdownOnArtShape) {
255- touchdownAnchors = 'fill: artShapeHolder';
256+ touchdownAnchors = 'fill: artShapeLoader';
257 } else {
258 touchdownAnchors = 'fill: root'
259 }
260@@ -951,7 +943,7 @@
261 } else if (isAudio) {
262 implicitHeight += 'audioButton.height;\n';
263 } else if (headerAsOverlay) {
264- implicitHeight += 'artShapeHolder.height;\n';
265+ implicitHeight += 'artShapeLoader.height;\n';
266 } else if (hasHeaderRow) {
267 implicitHeight += 'row.y + row.height + units.gu(1);\n';
268 } else if (hasMascot) {
269@@ -965,7 +957,7 @@
270 } else if (hasTitle) {
271 implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
272 } else if (hasArt) {
273- implicitHeight += 'artShapeHolder.height;\n';
274+ implicitHeight += 'artShapeLoader.height;\n';
275 } else {
276 implicitHeight = '';
277 }
278
279=== modified file 'tests/plugins/Dash/cardcreator/1.res'
280--- tests/plugins/Dash/cardcreator/1.res 2016-05-20 15:56:34 +0000
281+++ tests/plugins/Dash/cardcreator/1.res 2016-06-28 15:51:00 +0000
282@@ -12,23 +12,21 @@
283 property size fixedArtShapeSize: Qt.size(-1, -1);
284 signal action(var actionId);
285 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
286-Item {
287- id: artShapeHolder;
288- height: root.fixedArtShapeSize.height;
289- width: root.fixedArtShapeSize.width;
290- anchors { horizontalCenter: parent.horizontalCenter; }
291- Loader {
292+Loader {
293 id: artShapeLoader;
294+ height: root.fixedArtShapeSize.height;
295+ width: root.fixedArtShapeSize.width;
296+ anchors { horizontalCenter: parent.horizontalCenter; }
297 objectName: "artShapeLoader";
298 readonly property string cardArt: cardData && cardData["art"] || "";
299 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
300 active: cardArt != "";
301 asynchronous: true;
302- visible: status == Loader.Ready;
303+ visible: status === Loader.Ready;
304 sourceComponent: Item {
305 id: artShape;
306 objectName: "artShape";
307- visible: image.status == Image.Ready;
308+ visible: image.status === Image.Ready;
309 readonly property alias image: artImage;
310 UbuntuShape {
311 anchors.fill: parent;
312@@ -50,14 +48,13 @@
313 }
314 }
315 }
316- }
317 readonly property int headerHeight: titleLabel.height;
318 Label {
319 id: titleLabel;
320 objectName: "titleLabel";
321 anchors { right: parent.right;
322 left: parent.left;
323- top: artShapeHolder.bottom;
324+ top: artShapeLoader.bottom;
325 topMargin: units.gu(1);
326 }
327 elide: Text.ElideRight;
328@@ -75,7 +72,7 @@
329 UbuntuShape {
330 id: touchdown;
331 objectName: "touchdown";
332- anchors { fill: artShapeHolder }
333+ anchors { fill: artShapeLoader }
334 visible: root.pressed;
335 radius: "medium";
336 borderSource: "radius_pressed.sci"
337
338=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
339--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-05-20 15:56:34 +0000
340+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-06-28 15:51:00 +0000
341@@ -10,23 +10,19 @@
342 enabled: true;
343 signal action(var actionId);
344 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
345-Item {
346- id: artShapeHolder;
347- height: artShapeLoader.height;
348- width: artShapeLoader.width;
349- anchors { horizontalCenter: parent.horizontalCenter; }
350- Loader {
351+Loader {
352 id: artShapeLoader;
353+ anchors { horizontalCenter: parent.horizontalCenter; }
354 objectName: "artShapeLoader";
355 readonly property string cardArt: cardData && cardData["art"] || "";
356 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
357 active: cardArt != "";
358 asynchronous: false;
359- visible: status == Loader.Ready;
360+ visible: status === Loader.Ready;
361 sourceComponent: Item {
362 id: artShape;
363 objectName: "artShape";
364- visible: image.status == Image.Ready;
365+ visible: image.status === Image.Ready;
366 readonly property alias image: artImage;
367 UbuntuShape {
368 anchors.fill: parent;
369@@ -47,7 +43,6 @@
370 height: width / 1.6;
371 }
372 }
373- }
374 }
375 readonly property int headerHeight: titleLabel.height;
376 Label {
377@@ -55,7 +50,7 @@
378 objectName: "titleLabel";
379 anchors { right: parent.right;
380 left: parent.left;
381- top: artShapeHolder.bottom;
382+ top: artShapeLoader.bottom;
383 topMargin: units.gu(1);
384 }
385 elide: Text.ElideRight;
386@@ -73,7 +68,7 @@
387 UbuntuShape {
388 id: touchdown;
389 objectName: "touchdown";
390- anchors { fill: artShapeHolder }
391+ anchors { fill: artShapeLoader }
392 visible: root.pressed;
393 radius: "medium";
394 borderSource: "radius_pressed.sci"
395
396=== modified file 'tests/plugins/Dash/cardcreator/10.res'
397--- tests/plugins/Dash/cardcreator/10.res 2016-05-20 14:53:04 +0000
398+++ tests/plugins/Dash/cardcreator/10.res 2016-06-28 15:51:00 +0000
399@@ -16,7 +16,7 @@
400 objectName: "backgroundLoader";
401 anchors.fill: parent;
402 asynchronous: true;
403- visible: status == Loader.Ready;
404+ visible: status === Loader.Ready;
405 sourceComponent: UbuntuShape {
406 objectName: "background";
407 radius: "medium";
408
409=== modified file 'tests/plugins/Dash/cardcreator/10.res.cardcreator'
410--- tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-05-20 14:53:04 +0000
411+++ tests/plugins/Dash/cardcreator/10.res.cardcreator 2016-06-28 15:51:00 +0000
412@@ -14,7 +14,7 @@
413 objectName: "backgroundLoader";
414 anchors.fill: parent;
415 asynchronous: false;
416- visible: status == Loader.Ready;
417+ visible: status === Loader.Ready;
418 sourceComponent: UbuntuShape {
419 objectName: "background";
420 radius: "medium";
421
422=== modified file 'tests/plugins/Dash/cardcreator/11.res'
423--- tests/plugins/Dash/cardcreator/11.res 2016-05-20 15:56:34 +0000
424+++ tests/plugins/Dash/cardcreator/11.res 2016-06-28 15:51:00 +0000
425@@ -16,7 +16,7 @@
426 objectName: "backgroundLoader";
427 anchors.fill: parent;
428 asynchronous: true;
429- visible: status == Loader.Ready;
430+ visible: status === Loader.Ready;
431 sourceComponent: UbuntuShape {
432 objectName: "background";
433 radius: "medium";
434@@ -50,23 +50,21 @@
435 }
436 }
437 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
438-Item {
439- id: artShapeHolder;
440- height: root.fixedArtShapeSize.height;
441- width: root.fixedArtShapeSize.width;
442- anchors { horizontalCenter: parent.horizontalCenter; }
443- Loader {
444+Loader {
445 id: artShapeLoader;
446+ height: root.fixedArtShapeSize.height;
447+ width: root.fixedArtShapeSize.width;
448+ anchors { horizontalCenter: parent.horizontalCenter; }
449 objectName: "artShapeLoader";
450 readonly property string cardArt: cardData && cardData["art"] || decodeURI("%5C");
451 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
452 active: cardArt != "";
453 asynchronous: true;
454- visible: status == Loader.Ready;
455+ visible: status === Loader.Ready;
456 sourceComponent: Item {
457 id: artShape;
458 objectName: "artShape";
459- visible: image.status == Image.Ready;
460+ visible: image.status === Image.Ready;
461 readonly property alias image: artImage;
462 UbuntuShape {
463 anchors.fill: parent;
464@@ -87,8 +85,7 @@
465 height: width / (root.fixedArtShapeSize.width / root.fixedArtShapeSize.height);
466 onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");
467 }
468- }
469- }
470+ }
471 }
472 readonly property int headerHeight: row.height;
473 Row {
474@@ -97,7 +94,7 @@
475 property real margins: units.gu(1);
476 spacing: margins;
477 height: root.fixedHeaderHeight;
478- anchors { top: artShapeHolder.bottom;
479+ anchors { top: artShapeLoader.bottom;
480 topMargin: units.gu(1);
481 left: parent.left;
482 }
483
484=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
485--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-05-20 15:56:34 +0000
486+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-06-28 15:51:00 +0000
487@@ -14,7 +14,7 @@
488 objectName: "backgroundLoader";
489 anchors.fill: parent;
490 asynchronous: false;
491- visible: status == Loader.Ready;
492+ visible: status === Loader.Ready;
493 sourceComponent: UbuntuShape {
494 objectName: "background";
495 radius: "medium";
496@@ -48,23 +48,19 @@
497 }
498 }
499 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
500-Item {
501- id: artShapeHolder;
502- height: artShapeLoader.height;
503- width: artShapeLoader.width;
504- anchors { horizontalCenter: parent.horizontalCenter; }
505- Loader {
506+Loader {
507 id: artShapeLoader;
508+ anchors { horizontalCenter: parent.horizontalCenter; }
509 objectName: "artShapeLoader";
510 readonly property string cardArt: cardData && cardData["art"] || "";
511 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
512 active: cardArt != "";
513 asynchronous: false;
514- visible: status == Loader.Ready;
515+ visible: status === Loader.Ready;
516 sourceComponent: Item {
517 id: artShape;
518 objectName: "artShape";
519- visible: image.status == Image.Ready;
520+ visible: image.status === Image.Ready;
521 readonly property alias image: artImage;
522 UbuntuShape {
523 anchors.fill: parent;
524@@ -85,7 +81,6 @@
525 height: width / 1;
526 }
527 }
528- }
529 }
530 readonly property int headerHeight: row.height;
531 Row {
532@@ -93,7 +88,7 @@
533 objectName: "outerRow";
534 property real margins: units.gu(1);
535 spacing: margins;
536- anchors { top: artShapeHolder.bottom;
537+ anchors { top: artShapeLoader.bottom;
538 topMargin: units.gu(1);
539 left: parent.left;
540 }
541
542=== modified file 'tests/plugins/Dash/cardcreator/12.res'
543--- tests/plugins/Dash/cardcreator/12.res 2016-05-20 15:56:34 +0000
544+++ tests/plugins/Dash/cardcreator/12.res 2016-06-28 15:51:00 +0000
545@@ -12,23 +12,21 @@
546 property size fixedArtShapeSize: Qt.size(-1, -1);
547 signal action(var actionId);
548 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
549-Item {
550- id: artShapeHolder;
551- height: root.fixedArtShapeSize.height;
552- width: root.fixedArtShapeSize.width;
553- anchors { horizontalCenter: parent.horizontalCenter; }
554- Loader {
555+Loader {
556 id: artShapeLoader;
557+ height: root.fixedArtShapeSize.height;
558+ width: root.fixedArtShapeSize.width;
559+ anchors { horizontalCenter: parent.horizontalCenter; }
560 objectName: "artShapeLoader";
561 readonly property string cardArt: cardData && cardData["art"] || "";
562 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
563 active: cardArt != "";
564 asynchronous: true;
565- visible: status == Loader.Ready;
566+ visible: status === Loader.Ready;
567 sourceComponent: Item {
568 id: artShape;
569 objectName: "artShape";
570- visible: image.status == Image.Ready;
571+ visible: image.status === Image.Ready;
572 readonly property alias image: artImage;
573 UbuntuShape {
574 anchors.fill: parent;
575@@ -49,7 +47,6 @@
576 height: width / (root.fixedArtShapeSize.width / root.fixedArtShapeSize.height);
577 }
578 }
579- }
580 }
581 readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
582 Label {
583@@ -57,7 +54,7 @@
584 objectName: "titleLabel";
585 anchors { right: parent.right;
586 left: parent.left;
587- top: artShapeHolder.bottom;
588+ top: artShapeLoader.bottom;
589 topMargin: units.gu(1);
590 }
591 elide: Text.ElideRight;
592@@ -101,7 +98,7 @@
593 UbuntuShape {
594 id: touchdown;
595 objectName: "touchdown";
596- anchors { fill: artShapeHolder }
597+ anchors { fill: artShapeLoader }
598 visible: root.pressed;
599 radius: "medium";
600 borderSource: "radius_pressed.sci"
601
602=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
603--- tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-05-20 15:56:34 +0000
604+++ tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-06-28 15:51:00 +0000
605@@ -10,23 +10,19 @@
606 enabled: true;
607 signal action(var actionId);
608 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
609-Item {
610- id: artShapeHolder;
611- height: artShapeLoader.height;
612- width: artShapeLoader.width;
613- anchors { horizontalCenter: parent.horizontalCenter; }
614- Loader {
615+Loader {
616 id: artShapeLoader;
617+ anchors { horizontalCenter: parent.horizontalCenter; }
618 objectName: "artShapeLoader";
619 readonly property string cardArt: cardData && cardData["art"] || "";
620 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
621 active: cardArt != "";
622 asynchronous: false;
623- visible: status == Loader.Ready;
624+ visible: status === Loader.Ready;
625 sourceComponent: Item {
626 id: artShape;
627 objectName: "artShape";
628- visible: image.status == Image.Ready;
629+ visible: image.status === Image.Ready;
630 readonly property alias image: artImage;
631 UbuntuShape {
632 anchors.fill: parent;
633@@ -47,7 +43,6 @@
634 height: width / 0.75;
635 }
636 }
637- }
638 }
639 readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
640 Label {
641@@ -55,7 +50,7 @@
642 objectName: "titleLabel";
643 anchors { right: parent.right;
644 left: parent.left;
645- top: artShapeHolder.bottom;
646+ top: artShapeLoader.bottom;
647 topMargin: units.gu(1);
648 }
649 elide: Text.ElideRight;
650@@ -99,7 +94,7 @@
651 UbuntuShape {
652 id: touchdown;
653 objectName: "touchdown";
654- anchors { fill: artShapeHolder }
655+ anchors { fill: artShapeLoader }
656 visible: root.pressed;
657 radius: "medium";
658 borderSource: "radius_pressed.sci"
659
660=== modified file 'tests/plugins/Dash/cardcreator/2.res'
661--- tests/plugins/Dash/cardcreator/2.res 2016-05-20 14:53:04 +0000
662+++ tests/plugins/Dash/cardcreator/2.res 2016-06-28 15:51:00 +0000
663@@ -16,7 +16,7 @@
664 objectName: "backgroundLoader";
665 anchors.fill: parent;
666 asynchronous: true;
667- visible: status == Loader.Ready;
668+ visible: status === Loader.Ready;
669 sourceComponent: UbuntuShape {
670 objectName: "background";
671 radius: "medium";
672
673=== modified file 'tests/plugins/Dash/cardcreator/2.res.cardcreator'
674--- tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-05-20 14:53:04 +0000
675+++ tests/plugins/Dash/cardcreator/2.res.cardcreator 2016-06-28 15:51:00 +0000
676@@ -14,7 +14,7 @@
677 objectName: "backgroundLoader";
678 anchors.fill: parent;
679 asynchronous: false;
680- visible: status == Loader.Ready;
681+ visible: status === Loader.Ready;
682 sourceComponent: UbuntuShape {
683 objectName: "background";
684 radius: "medium";
685
686=== modified file 'tests/plugins/Dash/cardcreator/3.res'
687--- tests/plugins/Dash/cardcreator/3.res 2016-06-17 01:18:49 +0000
688+++ tests/plugins/Dash/cardcreator/3.res 2016-06-28 15:51:00 +0000
689@@ -12,23 +12,21 @@
690 property size fixedArtShapeSize: Qt.size(-1, -1);
691 signal action(var actionId);
692 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
693-Item {
694- id: artShapeHolder;
695- height: root.fixedArtShapeSize.height;
696- width: root.fixedArtShapeSize.width;
697- anchors { horizontalCenter: parent.horizontalCenter; }
698- Loader {
699+Loader {
700 id: artShapeLoader;
701+ height: root.fixedArtShapeSize.height;
702+ width: root.fixedArtShapeSize.width;
703+ anchors { horizontalCenter: parent.horizontalCenter; }
704 objectName: "artShapeLoader";
705 readonly property string cardArt: cardData && cardData["art"] || decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
706 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
707 active: cardArt != "";
708 asynchronous: true;
709- visible: status == Loader.Ready;
710+ visible: status === Loader.Ready;
711 sourceComponent: Item {
712 id: artShape;
713 objectName: "artShape";
714- visible: image.status == Image.Ready;
715+ visible: image.status === Image.Ready;
716 readonly property alias image: artImage;
717 ProportionalShape {
718 anchors.left: parent.left;
719@@ -49,7 +47,6 @@
720 onStatusChanged: if (status === Image.Error) source = decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
721 }
722 }
723- }
724 }
725 readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
726 Label {
727@@ -57,7 +54,7 @@
728 objectName: "titleLabel";
729 anchors { right: parent.right;
730 left: parent.left;
731- top: artShapeHolder.bottom;
732+ top: artShapeLoader.bottom;
733 topMargin: units.gu(1);
734 }
735 elide: Text.ElideRight;
736
737=== modified file 'tests/plugins/Dash/cardcreator/3.res.cardcreator'
738--- tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-06-17 01:18:49 +0000
739+++ tests/plugins/Dash/cardcreator/3.res.cardcreator 2016-06-28 15:51:00 +0000
740@@ -10,23 +10,19 @@
741 enabled: true;
742 signal action(var actionId);
743 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
744-Item {
745- id: artShapeHolder;
746- height: artShapeLoader.height;
747- width: artShapeLoader.width;
748- anchors { horizontalCenter: parent.horizontalCenter; }
749- Loader {
750- id: artShapeLoader;
751+Loader {
752+ id: artShapeLoader;
753+ anchors { horizontalCenter: parent.horizontalCenter; }
754 objectName: "artShapeLoader";
755 readonly property string cardArt: cardData && cardData["art"] || "";
756 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
757 active: cardArt != "";
758 asynchronous: false;
759- visible: status == Loader.Ready;
760+ visible: status === Loader.Ready;
761 sourceComponent: Item {
762 id: artShape;
763 objectName: "artShape";
764- visible: image.status == Image.Ready;
765+ visible: image.status === Image.Ready;
766 readonly property alias image: artImage;
767 ProportionalShape {
768 anchors.left: parent.left;
769@@ -46,7 +42,6 @@
770 height: width / 0.75;
771 }
772 }
773- }
774 }
775 readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
776 Label {
777@@ -54,7 +49,7 @@
778 objectName: "titleLabel";
779 anchors { right: parent.right;
780 left: parent.left;
781- top: artShapeHolder.bottom;
782+ top: artShapeLoader.bottom;
783 topMargin: units.gu(1);
784 }
785 elide: Text.ElideRight;
786
787=== modified file 'tests/plugins/Dash/cardcreator/4.res'
788--- tests/plugins/Dash/cardcreator/4.res 2016-05-20 14:53:04 +0000
789+++ tests/plugins/Dash/cardcreator/4.res 2016-06-28 15:51:00 +0000
790@@ -32,7 +32,7 @@
791 objectName: "mascotShapeLoader";
792 asynchronous: true;
793 active: mascotImage.status === Image.Ready;
794- visible: showHeader && active && status == Loader.Ready;
795+ visible: showHeader && active && status === Loader.Ready;
796 width: units.gu(6);
797 height: units.gu(5.625);
798 sourceComponent: UbuntuShape { image: mascotImage }
799
800=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
801--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-05-20 14:53:04 +0000
802+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-06-28 15:51:00 +0000
803@@ -29,7 +29,7 @@
804 objectName: "mascotShapeLoader";
805 asynchronous: false;
806 active: mascotImage.status === Image.Ready;
807- visible: showHeader && active && status == Loader.Ready;
808+ visible: showHeader && active && status === Loader.Ready;
809 width: units.gu(6);
810 height: units.gu(5.625);
811 sourceComponent: UbuntuShape { image: mascotImage }
812
813=== modified file 'tests/plugins/Dash/cardcreator/5.res'
814--- tests/plugins/Dash/cardcreator/5.res 2016-05-20 15:56:34 +0000
815+++ tests/plugins/Dash/cardcreator/5.res 2016-06-28 15:51:00 +0000
816@@ -12,23 +12,21 @@
817 property size fixedArtShapeSize: Qt.size(-1, -1);
818 signal action(var actionId);
819 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
820-Item {
821- id: artShapeHolder;
822- height: root.fixedArtShapeSize.height;
823- width: root.fixedArtShapeSize.width;
824- anchors { horizontalCenter: parent.horizontalCenter; }
825- Loader {
826+Loader {
827 id: artShapeLoader;
828+ height: root.fixedArtShapeSize.height;
829+ width: root.fixedArtShapeSize.width;
830+ anchors { horizontalCenter: parent.horizontalCenter; }
831 objectName: "artShapeLoader";
832 readonly property string cardArt: cardData && cardData["art"] || "";
833 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
834 active: cardArt != "";
835 asynchronous: true;
836- visible: status == Loader.Ready;
837+ visible: status === Loader.Ready;
838 sourceComponent: Item {
839 id: artShape;
840 objectName: "artShape";
841- visible: image.status == Image.Ready;
842+ visible: image.status === Image.Ready;
843 readonly property alias image: artImage;
844 width: root.fixedArtShapeSize.width;
845 height: root.fixedArtShapeSize.height;
846@@ -42,15 +40,14 @@
847 height: width / (root.fixedArtShapeSize.width / root.fixedArtShapeSize.height);
848 }
849 }
850- }
851 }
852 Loader {
853 id: overlayLoader;
854 readonly property real overlayHeight: root.fixedHeaderHeight + units.gu(2);
855- anchors.fill: artShapeHolder;
856+ anchors.fill: artShapeLoader;
857 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
858 asynchronous: true;
859- visible: showHeader && status == Loader.Ready;
860+ visible: showHeader && status === Loader.Ready;
861 sourceComponent: UbuntuShapeOverlay {
862 id: overlay;
863 property real luminance: Style.luminance(overlayColor);
864@@ -102,5 +99,5 @@
865 text: cardData && cardData["subtitle"] || "";
866 font.weight: Font.Light;
867 }
868-implicitHeight: artShapeHolder.height;
869+implicitHeight: artShapeLoader.height;
870 }
871
872=== modified file 'tests/plugins/Dash/cardcreator/5.res.cardcreator'
873--- tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-05-20 15:56:34 +0000
874+++ tests/plugins/Dash/cardcreator/5.res.cardcreator 2016-06-28 15:51:00 +0000
875@@ -10,23 +10,19 @@
876 enabled: false;
877 signal action(var actionId);
878 readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
879-Item {
880- id: artShapeHolder;
881- height: artShapeLoader.height;
882- width: artShapeLoader.width;
883- anchors { horizontalCenter: parent.horizontalCenter; }
884- Loader {
885+Loader {
886 id: artShapeLoader;
887+ anchors { horizontalCenter: parent.horizontalCenter; }
888 objectName: "artShapeLoader";
889 readonly property string cardArt: cardData && cardData["art"] || "";
890 onCardArtChanged: { if (item) { item.image.source = cardArt; } }
891 active: cardArt != "";
892 asynchronous: false;
893- visible: status == Loader.Ready;
894+ visible: status === Loader.Ready;
895 sourceComponent: Item {
896 id: artShape;
897 objectName: "artShape";
898- visible: image.status == Image.Ready;
899+ visible: image.status === Image.Ready;
900 readonly property alias image: artImage;
901 width: image.status !== Image.Ready ? 0 : image.width;
902 height: image.status !== Image.Ready ? 0 : image.height;
903@@ -40,15 +36,14 @@
904 height: width / 1;
905 }
906 }
907- }
908 }
909 Loader {
910 id: overlayLoader;
911 readonly property real overlayHeight: headerHeight + units.gu(2);
912- anchors.fill: artShapeHolder;
913+ anchors.fill: artShapeLoader;
914 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false;
915 asynchronous: false;
916- visible: showHeader && status == Loader.Ready;
917+ visible: showHeader && status === Loader.Ready;
918 sourceComponent: UbuntuShapeOverlay {
919 id: overlay;
920 property real luminance: Style.luminance(overlayColor);
921@@ -100,5 +95,5 @@
922 text: cardData && cardData["subtitle"] || "";
923 font.weight: Font.Light;
924 }
925-implicitHeight: artShapeHolder.height;
926+implicitHeight: artShapeLoader.height;
927 }
928
929=== modified file 'tests/plugins/Dash/cardcreator/6.res'
930--- tests/plugins/Dash/cardcreator/6.res 2016-05-20 14:53:04 +0000
931+++ tests/plugins/Dash/cardcreator/6.res 2016-06-28 15:51:00 +0000
932@@ -16,7 +16,7 @@
933 objectName: "backgroundLoader";
934 anchors.fill: parent;
935 asynchronous: true;
936- visible: status == Loader.Ready;
937+ visible: status === Loader.Ready;
938 sourceComponent: UbuntuShape {
939 objectName: "background";
940 radius: "medium";
941
942=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
943--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-05-20 14:53:04 +0000
944+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-06-28 15:51:00 +0000
945@@ -14,7 +14,7 @@
946 objectName: "backgroundLoader";
947 anchors.fill: parent;
948 asynchronous: false;
949- visible: status == Loader.Ready;
950+ visible: status === Loader.Ready;
951 sourceComponent: UbuntuShape {
952 objectName: "background";
953 radius: "medium";
954
955=== modified file 'tests/plugins/Dash/cardcreator/7.res'
956--- tests/plugins/Dash/cardcreator/7.res 2016-05-20 14:53:04 +0000
957+++ tests/plugins/Dash/cardcreator/7.res 2016-06-28 15:51:00 +0000
958@@ -16,7 +16,7 @@
959 objectName: "backgroundLoader";
960 anchors.fill: parent;
961 asynchronous: true;
962- visible: status == Loader.Ready;
963+ visible: status === Loader.Ready;
964 sourceComponent: UbuntuShape {
965 objectName: "background";
966 radius: "medium";
967
968=== modified file 'tests/plugins/Dash/cardcreator/7.res.cardcreator'
969--- tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-05-20 14:53:04 +0000
970+++ tests/plugins/Dash/cardcreator/7.res.cardcreator 2016-06-28 15:51:00 +0000
971@@ -14,7 +14,7 @@
972 objectName: "backgroundLoader";
973 anchors.fill: parent;
974 asynchronous: false;
975- visible: status == Loader.Ready;
976+ visible: status === Loader.Ready;
977 sourceComponent: UbuntuShape {
978 objectName: "background";
979 radius: "medium";
980
981=== modified file 'tests/plugins/Dash/cardcreator/8.res'
982--- tests/plugins/Dash/cardcreator/8.res 2016-05-20 14:53:04 +0000
983+++ tests/plugins/Dash/cardcreator/8.res 2016-06-28 15:51:00 +0000
984@@ -16,7 +16,7 @@
985 objectName: "backgroundLoader";
986 anchors.fill: parent;
987 asynchronous: true;
988- visible: status == Loader.Ready;
989+ visible: status === Loader.Ready;
990 sourceComponent: UbuntuShape {
991 objectName: "background";
992 radius: "medium";
993
994=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
995--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-05-20 14:53:04 +0000
996+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-06-28 15:51:00 +0000
997@@ -14,7 +14,7 @@
998 objectName: "backgroundLoader";
999 anchors.fill: parent;
1000 asynchronous: false;
1001- visible: status == Loader.Ready;
1002+ visible: status === Loader.Ready;
1003 sourceComponent: UbuntuShape {
1004 objectName: "background";
1005 radius: "medium";

Subscribers

People subscribed via source and target branches