Merge lp:~mihirsoni/ubuntu-calculator-app/1211262-changedVarName into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Mihir Soni]

Re-named the variable name

Re-named the variable pencilVisible to newCalculation , as the it uses for the new calculation.

[David Planella (dpm)]

Nice work!

It is just nitpicking, but we might as well get it right:

9 + text: isLast && !newCalculation ? "0" : root.numbers // print 0 if it is new calculation else the existing number.

This needs to read "if it is a new calculation" (the "a" is missing on the original comment)

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calculator-app/1211262-changedVarName]

137. By Mihir Soni on 2013-08-14

modified the comment

[David Planella (dpm)]

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-08-14 09:15:43 +0000
+++ Simple/CalcLabel.qml	2013-08-14 09:49:08 +0000
@@ -121,7 +121,7 @@
             font.pixelSize: numbersHeight
             fontSizeMode: Text.Fit
             horizontalAlignment: Text.AlignRight
-            text: isLast && !pencilVisible ? "0" : root.numbers
+            text: isLast && !newCalculation ? "0" : root.numbers // print 0 if it is a new calculation else the existing number.
             font.family: "Ubuntu"
         }
     }

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-08-09 20:35:38 +0000
+++ Simple/Screen.qml	2013-08-14 09:49:08 +0000
@@ -29,7 +29,7 @@
     transformOrigin: Item.Bottom
 
     property var ops
-    property var pencilVisible: false
+    property var newCalculation: false
     signal useAnswer(string answerToUse, string formulaData)
     signal labelTextUpdated(int idx, string newText)
     signal mainLabelUpdated(int idx, string newText)
@@ -170,7 +170,7 @@
                 id: row
                 height: units.gu(4)
                 width: parent.width
-                visible: !isLastItem || pencilVisible
+                visible: !isLastItem || newCalculation
                 Item {
                     id: editIcon
                     height: parent.height
@@ -250,7 +250,7 @@
                         }
 
                         onNumbersChanged: {
-                            pencilVisible = true
+                            newCalculation = true
                         }
                     }
                 }