Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-display-fix into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Fix display issue

Fix display issue

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

PASSED: Continuous integration, rev:191
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/331/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2944
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2944/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/110
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/53

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

review: Approve (continuous-integration)

[Niklas Wenzel (nikwen)]

Works fine, thanks. :)

review: Approve

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-06-11 15:40:14 +0000
+++ app/ubuntu-calculator-app.qml	2015-06-17 20:18:25 +0000
@@ -78,6 +78,7 @@
      * place the result in right vars
      */
     function deleteLastFormulaElement() {
+        isFormulaIsValidToCalculate = false;
         if (textInputField.cursorPosition === textInputField.length) {
             longFormula = Formula.deleteLastFormulaElement(isLastCalculate, longFormula)
         } else {
@@ -96,6 +97,7 @@
      * Function to clear formula in input text field
      */
     function clearFormula() {
+        isFormulaIsValidToCalculate = false;
         shortFormula = "";
         longFormula = "";
         displayedInputText = "";
@@ -135,6 +137,7 @@
         // If the user press a number after the press of "=" we start a new
         // formula, otherwise we continue with the old one
         if (!isNaN(visual) && isLastCalculate) {
+            isFormulaIsValidToCalculate = false;
             longFormula = displayedInputText = shortFormula = "";
         }
         isLastCalculate = false;

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-06-12 01:55:49 +0000
+++ po/com.ubuntu.calculator.pot	2015-06-17 20:18:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-11 20:53-0500\n"
+"POT-Creation-Date: 2015-06-17 22:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,35 +21,35 @@
 msgid "NaN"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:252 ../app/ubuntu-calculator-app.qml:257
+#: ../app/ubuntu-calculator-app.qml:255 ../app/ubuntu-calculator-app.qml:260
 msgid "Favorite"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:310
+#: ../app/ubuntu-calculator-app.qml:313
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:324
+#: ../app/ubuntu-calculator-app.qml:327
 msgid "Select All"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:324
+#: ../app/ubuntu-calculator-app.qml:327
 msgid "Select None"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:331 ../app/ubuntu-calculator-app.qml:402
+#: ../app/ubuntu-calculator-app.qml:334 ../app/ubuntu-calculator-app.qml:405
 msgid "Copy"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:339 ../app/ubuntu-calculator-app.qml:454
+#: ../app/ubuntu-calculator-app.qml:342 ../app/ubuntu-calculator-app.qml:457
 msgid "Delete"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:415
+#: ../app/ubuntu-calculator-app.qml:418
 msgid "Edit"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:431
+#: ../app/ubuntu-calculator-app.qml:434
 msgid "Add to favorites"
 msgstr ""
 
@@ -59,8 +59,8 @@
 #. TRANSLATORS: this is a time formatting string, see
 #. http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid
 #. expressions
-#: ../app/ubuntu-calculator-app.qml:585 ../app/ui/FavouritePage.qml:89
-#: ../app/ui/Screen.qml:50
+#: ../app/ubuntu-calculator-app.qml:588 ../app/ui/FavouritePage.qml:89
+#: ../app/ui/Screen.qml:51
 msgid "dd MMM yyyy"
 msgstr ""
 
@@ -82,33 +82,33 @@
 msgid "mod"
 msgstr ""
 
-#: ../app/ui/Screen.qml:36
+#: ../app/ui/Screen.qml:37
 msgid "Just now"
 msgstr ""
 
-#: ../app/ui/Screen.qml:38
+#: ../app/ui/Screen.qml:39
 msgid "Today "
 msgstr ""
 
 #. TRANSLATORS: this is a time formatting string, see
 #. http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for
 #. valid expressions
-#: ../app/ui/Screen.qml:42
+#: ../app/ui/Screen.qml:43
 msgid "hh:mm"
 msgstr ""
 
-#: ../app/ui/Screen.qml:44
+#: ../app/ui/Screen.qml:45
 msgid "Yesterday"
 msgstr ""
 
-#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /tmp/tmp.9RSzhUvMx8/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /tmp/tmp.9RSzhUvMx8/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /tmp/tmp.9RSzhUvMx8/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""