Merge lp:~gang65/ubuntu-calculator-app/reboot_copy_selected_calculation into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Add feature to copy selected calculation from the history

Add feature to copy selected calculation from the history

[Giulio Collura (gcollura)]

We need to set action names for our actions, otherwise we end up with a empty label in overflow action menu, see http://i.imgur.com/oqc9gSQ.png

Thanks!

Giulio

review: Needs Fixing

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

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

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Thanks Giulio.

I was wondering why we need these additional text caption, while we are using icons :-P

[lp:~gang65/ubuntu-calculator-app/reboot_copy_selected_calculation]

63. By Bartosz Kosiorek on 2015-01-14

Add captions to action buttons

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

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

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

review: Approve (continuous-integration)

[Giulio Collura (gcollura)]

Do we really need to copy the date in the clipboard?
I copied a couple of calculation as test and the date just stand in the way without a real meaning, see:
[Wed Jan 14 23:20:19 2015 GMT+0100] 2+6=8
[Wed Jan 14 23:20:19 2015 GMT+0100] -10^2/5=-20
The actual calculation is short, while the date and time takes a lot of space. I'd like also to discuss about this with rpadovani :)

Also, we may want to support the "copy to clipboard" for a single entry, be swiping the list item to the left, similarly to delete, which is shown with a swipe to right gesture.

I also left a comment inline.

review: Needs Information

[Riccardo Padovani (rpadovani)]

I agree with Giulio, I think we don't need the date in the clipboard or, if we want it, we definitely need to change the format

[Bartosz Kosiorek (gang65)]

Ok. I will remove date.

[lp:~gang65/ubuntu-calculator-app/reboot_copy_selected_calculation]

64. By Bartosz Kosiorek on 2015-01-14

Remove date from copied data

[Bartosz Kosiorek (gang65)]

As you already noticed, copied data is in engine format, without formatting.
In my opinion is simpler to modify ASCII data, rather than UTF-8 chars.

For example:

1/0=Infinity

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

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

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

As I remember, according to design swipe to left was reserved for adding calculation to favourites.

Favourites is not implemented yet. In my opinion copy has higher priority.

[Giulio Collura (gcollura)]

We can have two rightSideActions in ListItemWithActions, one action for copy another for favouring, because it can be tedious to start the selection mode, just to copy a single calculation. Anyway if this a design pattern and since I'm not a designer, I can't judge :)

I almost forgot, we have to filter out the entries in the model which have been hidden and have a dbId < 0, otherwise a empty calculation will be copied, if these get selected when selecting all the entries (I know this may be a bug in MultipleSelectionVisualModel, but it's better to workaround it here in this case). Just put a 'if (items.get(j).model.dbId !== -1)' before adding the calculations to mimeData.text.

Thank you!

Giulio

review: Needs Fixing

[lp:~gang65/ubuntu-calculator-app/reboot_copy_selected_calculation]

65. By Bartosz Kosiorek on 2015-01-15

Do not copy calculation with dbId === -1

[Bartosz Kosiorek (gang65)]

Nice catch Giulio.

Please also review other Merge Reqest.

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

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

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

review: Approve (continuous-integration)

[Giulio Collura (gcollura)]

Ok thank you for the patience and the merge proposal :)
Approved!

review: Approve

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-01-14 14:47:03 +0000
+++ app/ubuntu-calculator-app.qml	2015-01-15 18:57:16 +0000
@@ -62,6 +62,9 @@
 
     property var decimalPoint: Qt.locale().decimalPoint
 
+    // By default we delete selected calculation from history
+    property bool deleteSelectedCalculation: true;
+
     state: visualModel.isInSelectionMode ? "selection" : "default"
     states: [
         State {
@@ -227,16 +230,25 @@
             }
             actions: [
                 Action {
+                    id: copySelectedAction
+                    objectName: "copySelectedAction"
+                    iconName: "edit-copy"
+                    text: i18n.tr("Copy")
+                    onTriggered: copySelectedCalculations()
+                },
+                Action {
                     id: selectAllAction
                     objectName: "selectAllAction"
                     iconName: "select"
+                    text: i18n.tr("Select All")
                     onTriggered: visualModel.selectAll()
                 },
                 Action {
                     id: multiDeleteAction
                     objectName: "multiDeleteAction"
                     iconName: "delete"
-                    onTriggered: visualModel.endSelection()
+                    text: i18n.tr("Delete")
+                    onTriggered: deleteSelectedCalculations()
                 }
             ]
         }
@@ -254,7 +266,7 @@
             width: parent ? parent.width : 0
 
             property var model: itemModel
-            visible: model.dbId != -1
+            visible: model.dbId !== -1
 
             selectionMode: visualModel.isInSelectionMode
             selected: visualModel.isSelected(visualDelegate)
@@ -327,13 +339,34 @@
         }
     }
 
+    function deleteSelectedCalculations() {
+        deleteSelectedCalculation = true;
+        visualModel.endSelection();
+    }
+
+    function copySelectedCalculations() {
+        deleteSelectedCalculation = false;
+        visualModel.endSelection();
+    }
+
     MultipleSelectionVisualModel {
         id: visualModel
         model: calculationHistory.getContents()
 
         onSelectionDone: {
-            for (var i = 0; i < items.count; i++) {
-                calculationHistory.deleteCalc(items.get(i).model.dbId, items.get(i).model.index);
+            if(deleteSelectedCalculation === true) {
+                for(var i = 0; i < items.count; i++) {
+                    calculationHistory.deleteCalc(items.get(i).model.dbId, items.get(i).model.index);
+                }
+            } else {
+                var mimeData = Clipboard.newData();
+                mimeData.text = "";
+                for(var j = 0; j < items.count; j++) {
+                    if (items.get(j).model.dbId !== -1) {
+                        mimeData.text = mimeData.text + items.get(j).model.formula + "=" + items.get(j).model.result + "\n";
+                    }
+                }
+                Clipboard.push(mimeData);
             }
         }
 
@@ -341,11 +374,11 @@
             Loader {
                 property var itemModel: model
                 width: parent.width
-                height: model.dbId != -1 ? item.height : 0;
+                height: model.dbId !== -1 ? item.height : 0;
                 sourceComponent: screenDelegateComponent
-                opacity: ((y+height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
+                opacity: ((y + height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
                 onOpacityChanged: {
-                    if (this.hasOwnProperty('item') && this.item != null) {
+                    if (this.hasOwnProperty('item') && this.item !== null) {
                         if (opacity > 0) {
                             sourceComponent = screenDelegateComponent;
                         } else {