Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-edit-history into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Add possibility of editing calculation from history, by swiping left and select "Edit" option.

Add possibility of editing calculation from history, by swiping left and select "Edit" option.

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-edit-history]

101. By Bartosz Kosiorek on 2015-02-13

Add semicolons

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

PASSED: Continuous integration, rev:101
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/98/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1068
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1068/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/98

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Are we sure this is what designers want?

Looking to design document seems they want a special window where you can edit the old calc, then when you save it the old calc is updated, and it isn't create a new one...

Implementation is good, anyway :-)

review: Needs Information

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This is really nice to use. Tested on my krillin and it works really well.

review: Approve

[Riccardo Padovani (rpadovani)]

With popey approvation all is better, so here we go :-)

review: Approve

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-02-10 22:12:55 +0000
+++ app/ubuntu-calculator-app.qml	2015-02-13 22:24:19 +0000
@@ -209,7 +209,6 @@
         if (!isFavourite) {
             favouriteTextField.text = "";
         }
-
         calculationHistory.addCalculationToScreen(longFormula, result, isFavourite, favouriteTextField.text);
         longFormula = result;
         shortFormula = result;
@@ -357,7 +356,7 @@
                         visualModel.selectItem(visualDelegate);
                     }
 
-                    rightSideActions: [ screenDelegateCopyAction.item ]
+                    rightSideActions: [ screenDelegateCopyAction.item, screenDelegateEditAction.item ]
                     leftSideAction: screenDelegateDeleteAction.item
 
                     Loader {
@@ -374,6 +373,21 @@
                     }
 
                     Loader {
+                        id: screenDelegateEditAction
+                        sourceComponent: Action {
+                            iconName: "edit"
+                            text: i18n.tr("Edit")
+                            onTriggered: {
+                                longFormula = model.formula;
+                                shortFormula =  model.result;
+                                displayedInputText = model.formula;
+                                isLastCalculate = false;
+                                previousVisual = "";
+                                scrollableView.scrollToBottom();
+                            }
+                        }
+                    }
+                    Loader {
                         id: screenDelegateDeleteAction
                         sourceComponent: Action {
                             iconName: "delete"

=== modified file 'app/ui/KeyboardPage.qml'
--- app/ui/KeyboardPage.qml	2015-02-10 22:12:55 +0000
+++ app/ui/KeyboardPage.qml	2015-02-13 22:24:19 +0000
@@ -121,19 +121,25 @@
                         objectName: model.objectName
                         baseSize: repeater.height
                         onClicked: {
+                            //If key pressed then scroll down
+
                             switch (model.action) {
                             case "push":
                                 formulaPush(model.pushText);
+                                scrollableView.scrollToBottom();
                                 break;
                             case "delete":
                                 deleteLastFormulaElement();
+                                scrollableView.scrollToBottom();
                                 break;
                             case "calculate":
                                 calculate();
+                                scrollableView.scrollToBottom();
                                 break;
                             }
                         }
                         onPressAndHold: {
+                            //If key pressed then scroll down
                             switch (model.secondaryAction) {
                             case "clearFormula":
                                 clearFormula();

=== modified file 'app/ui/ScrollableView.qml'
--- app/ui/ScrollableView.qml	2015-01-15 22:26:48 +0000
+++ app/ui/ScrollableView.qml	2015-02-13 22:24:19 +0000
@@ -18,11 +18,11 @@
 import QtQuick 2.3
 
 Flickable {
-    id: flickable
+    id: flickableHistory
 
     default property alias data: column.children
     property double oldContentHeight: 0
-    contentHeight: flickable.height > column.height ? flickable.height : column.height
+    contentHeight: flickableHistory.height > column.height ? flickableHistory.height : column.height
     boundsBehavior: Flickable.DragOverBounds
     property bool snap: true
 
@@ -30,19 +30,19 @@
         if (contentY <= 0 || !snap) {
             return;
         }
-        var posy = flickable.height + flickable.visibleArea.yPosition * flickable.contentHeight
+        var posy = flickableHistory.height + flickableHistory.visibleArea.yPosition * flickableHistory.contentHeight
         // FIXME see ubuntu-calculator-app:269:
         // It's column.width - units.gu(2) because of the weird alignment of TextField
         var obj = column.childAt(column.width - units.gu(2), posy)
         if (Math.abs(posy - obj.y) < obj.height / 2) {
             // scroll up
-            var destY = obj.y - flickable.height;
+            var destY = obj.y - flickableHistory.height;
             // don't go out of bound
             if (destY < 0) destY = 0;
             scrollingAnimation.to = destY;
         } else {
             // scroll down
-            scrollingAnimation.to = obj.y + obj.height - flickable.height;
+            scrollingAnimation.to = obj.y + obj.height - flickableHistory.height;
         }
         scrollingAnimation.start()
     }
@@ -60,8 +60,8 @@
     }
 
     function scrollToBottom() {
-        if (column.height > flickable.height) {
-            flickable.contentY = flickable.contentHeight - flickable.height;
+        if (column.height > flickableHistory.height) {
+            flickableHistory.contentY = flickableHistory.contentHeight - flickableHistory.height;
         }
     }
 
@@ -70,7 +70,7 @@
         onHeightChanged: {
             // scroll to bottom only when something is inserted.
             if (oldContentHeight < contentHeight) {
-                flickable.scrollToBottom();
+                flickableHistory.scrollToBottom();
             }
             oldContentHeight = contentHeight;
         }

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-01-30 21:36:04 +0000
+++ po/com.ubuntu.calculator.pot	2015-02-13 22:24:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-30 22:35+0100\n"
+"POT-Creation-Date: 2015-02-13 23:19+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,37 +17,41 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../app/engine/formula.js:145
+#: ../app/engine/formula.js:141
 msgid "NaN"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:214 ../app/ubuntu-calculator-app.qml:219
+#: ../app/ubuntu-calculator-app.qml:228 ../app/ubuntu-calculator-app.qml:233
 msgid "Favorite"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:270
+#: ../app/ubuntu-calculator-app.qml:284
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:278
+#: ../app/ubuntu-calculator-app.qml:292
 msgid "Select All"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:285 ../app/ubuntu-calculator-app.qml:352
+#: ../app/ubuntu-calculator-app.qml:299 ../app/ubuntu-calculator-app.qml:366
 msgid "Copy"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:292 ../app/ubuntu-calculator-app.qml:365
+#: ../app/ubuntu-calculator-app.qml:306 ../app/ubuntu-calculator-app.qml:394
 msgid "Delete"
 msgstr ""
 
+#: ../app/ubuntu-calculator-app.qml:379
+msgid "Edit"
+msgstr ""
+
 #. TRANSLATORS: this is a time formatting string, see
 #. http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for
 #. valid expressions
 #. 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:525 ../app/ui/Screen.qml:50
+#: ../app/ubuntu-calculator-app.qml:554 ../app/ui/Screen.qml:50
 msgid "dd MMM yyyy"
 msgstr ""
 
@@ -78,14 +82,14 @@
 msgid "Yesterday"
 msgstr ""
 
-#: /tmp/tmp.OLyVDpDzrv/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /tmp/tmp.RkXdmNBKKn/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /tmp/tmp.OLyVDpDzrv/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /tmp/tmp.RkXdmNBKKn/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /tmp/tmp.OLyVDpDzrv/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /tmp/tmp.RkXdmNBKKn/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""