Merge lp:~rpadovani/ubuntu-calculator-app/4Sep2013 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Update the function to fix bug 1219704

After commit 147[1] when you click on a sign to add a new number, in the calcLabel appears number 0.
This commit fix it without regression about bug 1219704

Pencil icon in now hidden when there are no calc

[1]https://bazaar.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/trunk/revision/147

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

PASSED: Continuous integration, rev:148
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/75/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/217
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/74
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/74
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/74
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/74

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I pressed 8 then C and still have one pencil icon. See screenshot.

http://popey.com/~alan/device-2013-09-04-172701.png

review: Needs Fixing

[lp:~rpadovani/ubuntu-calculator-app/4Sep2013]

149. By Riccardo Padovani on 2013-09-04

Pencil icon in now hidden when there are no calc

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Works great! Thanks!

review: Approve

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

PASSED: Continuous integration, rev:149
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/76/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/218
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/75

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good.
Thank you

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-09-03 08:20:41 +0000
+++ Simple/CalcLabel.qml	2013-09-04 16:38:23 +0000
@@ -138,7 +138,8 @@
             font.pixelSize: numbersHeight
             fontSizeMode: Text.Fit
             horizontalAlignment: Text.AlignRight
-            text: ((isLast && !newCalculation) || root.numbers === "") ? "0" : root.numbers // print 0 if it is a new calculation else the existing number.
+            // If is a new calculation or if last calculation as been deleted print 0, else the number
+            text: ((isLast && !newCalculation) || (root.numbers === "" && formulaView.headerItem.state !== "newPush")) ? "0" : root.numbers
             font.family: "Ubuntu"
         }
     }

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-09-03 08:20:41 +0000
+++ Simple/Screen.qml	2013-09-04 16:38:23 +0000
@@ -170,7 +170,7 @@
                 id: row
                 height: units.gu(4)
                 width: parent.width
-                visible: !isLastItem || newCalculation
+                visible: !isLastItem || newCalculation && formulaView.headerItem.state !== ""
                 Item {
                     id: editIcon
                     height: parent.height