dialer-app

Merge lp:~boiko/dialer-app/resize_text_hint into lp:dialer-app

  1. resize_text_hint
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Bill Filler
Approved revision: 282
Merged at revision: 286
Proposed branch: lp:~boiko/dialer-app/resize_text_hint
Merge into: lp:dialer-app
Diff against target: 44 lines (+10/-3)
2 files modified
src/qml/DialerPage/DialerPage.qml (+2/-2)
src/qml/DialerPage/KeypadEntry.qml (+8/-1)
To merge this branch: bzr merge lp:~boiko/dialer-app/resize_text_hint
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+235232@code.launchpad.net

Commit message

Make sure the keypad entry hint is scaled if the text is too big (the text
translated into some languages might not fit).

Description of the change

Make sure the keypad entry hint is scaled if the text is too big (the text
translated into some languages might not fit).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/459/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4987
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6239
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13442
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3948
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3948/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/459/rebuild

review: Needs Fixing (continuous-integration)
lp:~boiko/dialer-app/resize_text_hint updated
282. By Gustavo Pichorim Boiko

Center the hint text.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:282
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/461/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5013
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3658
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4763
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6265
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13482
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3967
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3967/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/461/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml 2014-09-16 17:56:36 +0000
+++ src/qml/DialerPage/DialerPage.qml 2014-09-19 18:09:28 +0000
@@ -210,7 +210,7 @@
210 left: parent.left210 left: parent.left
211 verticalCenter: parent.verticalCenter211 verticalCenter: parent.verticalCenter
212 }212 }
213 width: units.gu(4)213 width: opacity > 0 ? units.gu(4) : 0
214 height: (keypadEntry.value !== "" && contactWatcher.isUnknown) ? parent.height : 0214 height: (keypadEntry.value !== "" && contactWatcher.isUnknown) ? parent.height : 0
215 icon: "contact-new"215 icon: "contact-new"
216 iconWidth: units.gu(3)216 iconWidth: units.gu(3)
@@ -251,7 +251,7 @@
251 right: parent.right251 right: parent.right
252 verticalCenter: parent.verticalCenter252 verticalCenter: parent.verticalCenter
253 }253 }
254 width: units.gu(4)254 width: opacity > 0 ? units.gu(4) : 0
255 height: input.text !== "" ? parent.height : 0255 height: input.text !== "" ? parent.height : 0
256 icon: "erase"256 icon: "erase"
257 iconWidth: units.gu(3)257 iconWidth: units.gu(3)
258258
=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
--- src/qml/DialerPage/KeypadEntry.qml 2014-09-11 20:55:31 +0000
+++ src/qml/DialerPage/KeypadEntry.qml 2014-09-19 18:09:28 +0000
@@ -121,10 +121,17 @@
121 Label {121 Label {
122 id: hint122 id: hint
123 visible: input.text === ""123 visible: input.text === ""
124 anchors.centerIn: parent124 anchors {
125 left: parent.left
126 right: parent.right
127 verticalCenter: parent.verticalCenter
128 }
129
125 text: ""130 text: ""
126 font.pixelSize: input.maximumFontSize131 font.pixelSize: input.maximumFontSize
132 fontSizeMode: Text.HorizontalFit
127 color: UbuntuColors.darkGrey133 color: UbuntuColors.darkGrey
128 opacity: 0.9134 opacity: 0.9
135 horizontalAlignment: Text.AlignHCenter
129 }136 }
130}137}

Subscribers

People subscribed via source and target branches