Merge lp:~mzanetti/unity8/fix-lockscreen-error-label into lp:unity8

[Michael Zanetti]

scale down errorText label if necessary

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

no

 * 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

[Michael Terry (mterry)]

Scale is an Item-level property? That's nuts, in a good way. That would have been useful for a previous branch of mine. Ah well.

LGTM

 * 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.
 TBD, but it won't pass, for unrelated reasons

 * Did you make sure that the branch does not contain spurious tags?
 Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1336
http://jenkins.qa.ubuntu.com/job/unity8-ci/4542/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5676/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1527/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1636
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6928/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1336
http://jenkins.qa.ubuntu.com/job/unity8-ci/4580/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5744/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1674
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5407/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6996
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6996/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14412

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2014-09-23 22:38:16 +0000
+++ qml/Components/PinLockscreen.qml	2014-10-08 14:34:21 +0000
@@ -114,6 +114,7 @@
                 horizontalAlignment: Text.AlignHCenter
                 text: root.errorText
                 visible: pinentryField.incorrectOverride
+                scale: Math.min(1, parent.width / width)
             }
 
             AbstractButton {