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

[Riccardo Padovani]

Fixed #1207679 "Pencils appear before calculations are made"

Fixed #1207679 "Pencils appear before calculations are made"

[lp:~rpadovani/ubuntu-calculator-app/1207679]

120. By Riccardo Padovani on 2013-08-08

Resolved conflict

121. By Riccardo Padovani on 2013-08-08

Fixed typo

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

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

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

review: Approve (continuous-integration)

[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/63/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/63
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/63
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/55

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Hi ,

I am unable to add comment In operands

Try following scenario :-

1. Try any new calculation
2. I am unable to write on any operand.

review: Needs Fixing

[lp:~rpadovani/ubuntu-calculator-app/1207679]

122. By Riccardo Padovani on 2013-08-08

Fix a bug

[Mihir Soni (mihirsoni)]

Looks good :) Thank you

review: Approve

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

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

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Works well here now, nice work!

review: Approve

=== modified file 'Simple/CalcLabel.qml'
--- Simple/CalcLabel.qml	2013-08-07 19:48:44 +0000
+++ Simple/CalcLabel.qml	2013-08-08 14:10:49 +0000
@@ -54,13 +54,16 @@
             Image {
                 anchors.verticalCenter: parent.verticalCenter
                 source: Qt.resolvedUrl("images/edit.png")
+                visible: root.numbers || root.operation
             }
 
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    numberName.focus = true;
-                    numberName.forceActiveFocus();
+                    if (root.numbers || root.operation) {
+                        numberName.focus = true;
+                        numberName.forceActiveFocus();
+                    }
                 }
             }
         }
@@ -78,15 +81,18 @@
                     background: Item {}
                 }
 
+                visible: root.numbers || root.operation
+
                 readOnly: labelReadOnly
                 text: labelText
                 color: "#FEFEFE"
                 onTextChanged: { labelText = numberName.text }
                 hasClearButton: false
+
             }
 
             Image {
-                visible: numberName.focus
+                visible: numberName.focus && (root.numbers || root.operation)
                 anchors.bottom: parent.bottom
                 source: Qt.resolvedUrl("images/dot.png")
                 fillMode: Image.Tile

=== modified file 'Simple/Screen.qml'
--- Simple/Screen.qml	2013-08-07 19:48:44 +0000
+++ Simple/Screen.qml	2013-08-08 14:10:49 +0000
@@ -29,6 +29,7 @@
     transformOrigin: Item.Bottom
 
     property var ops
+    property var pencilVisible: false
     signal useAnswer(string answerToUse, string formulaData)
     signal labelTextUpdated(int idx, string newText)
     signal mainLabelUpdated(int idx, string newText)
@@ -169,6 +170,7 @@
                 id: row
                 height: units.gu(4)
                 width: parent.width
+                visible: !isLastItem || pencilVisible
                 Item {
                     id: editIcon
                     height: parent.height
@@ -245,6 +247,10 @@
                         onLabelTextChanged: {
                             root.labelTextUpdated(index, labelText)
                         }
+
+                        onNumbersChanged: {
+                            pencilVisible = true
+                        }
                     }
                 }
             }