Merge lp:~ravirdv/ubuntu-calculator-app/calculator_label_width_fix into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Ravi Vagadia]

Fix for bug #1198868: Changed font size and operator label width

Fix for bug #1198868: Changed font size and operator label width. Please review, not tested on device.

[Mihir Soni (mihirsoni)]

Looks good :)
Thanks for committing :)

review: Approve

[Bhaumik Shukla (boom-shukla)]

its good. Appreciate this commit.

review: Approve (fix)

[Gustavo Pichorim Boiko (boiko)]

9 + width: units.gu(0.2)

As far as I remember, for things less than 0.5 grid units, you should use this instead:

width: units.dp(2)

I don't know if two would be the correct value there, you might need to try it out to check what the correct value would be.

review: Needs Fixing

[Gustavo Pichorim Boiko (boiko)]

Thanks for your fix!

I have tried it on the device, but it still doesn't look like the visual designs.
The font size for the calculation is too small now, and the plus sign is not centered on the screen.

See this picture (taken from the app running on a Galaxy Nexus):
http://ubuntuone.com/2zXD7VWJrb2bWNinGpaD2P

review: Needs Fixing

[Michael Hall (mhall119)]

Looks a bit small for me too, here it is on a Nexus 4: http://ubuntuone.com/3uhvRhJ0LXNgpnlbPUzwcX

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:121
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/58/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/58
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/58
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/50

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/58/rebuild

review: Approve (continuous-integration)

[Michael Hall (mhall119)]

Using x-large for the font size seems to be pretty close to the size it was before.

[lp:~ravirdv/ubuntu-calculator-app/calculator_label_width_fix]

122. By Ravi Vagadia on 2013-08-07

Merged with calculator parent branch

123. By Ravi Vagadia on 2013-08-07

changed formulaLabel fontsize, operator label width and formulalabel width

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:123
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/60/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/52
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/60
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/60
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/52

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/60/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me :)

Any user with device can test this branch ?

[Gustavo Pichorim Boiko (boiko)]

Looks good to me now too! Thanks for the fix!

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-07-20 17:15:13 +0000
+++ Simple/CalcLabel.qml	2013-08-07 06:59:28 +0000
@@ -94,7 +94,7 @@
 
         Label {
             id: operatorLabel
-            width: units.gu(4)
+            width: units.dp(2)
             anchors.verticalCenter: parent.verticalCenter
             font.pixelSize: FontUtils.sizeToPixels("medium")
             color: "#FEFEFE"
@@ -109,7 +109,7 @@
             property bool isLast: root.isLast
 
             objectName: "formulaLabel"
-            width: units.gu(25)
+            width: parent.width / 2
             color: numbersColor
             anchors.bottom: parent.bottom
             font.pixelSize: numbersHeight

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-08-06 07:42:42 +0000
+++ Simple/Screen.qml	2013-08-07 06:59:28 +0000
@@ -236,7 +236,7 @@
                         labelText: _text
                         numbers: _number
                         operation: _operation == "=" ? "" : _operation
-                        numbersHeight: units.gu(5)
+                        numbersHeight: FontUtils.sizeToPixels("x-large")
                         isLast: (isLastItem && index === repeater.model.count-1)
 
                         onLabelTextChanged: {