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

[Bartosz Kosiorek]

Fix keyboard shortcuts (eg. Ctrl+C)

Fix keyboard shortcuts

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

PASSED: Continuous integration, rev:196
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/337/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2964
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/116
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/59

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Good catch, thanks!

review: Approve

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-06-17 20:11:29 +0000
+++ app/ubuntu-calculator-app.qml	2015-06-20 10:58:10 +0000
@@ -290,7 +290,9 @@
                 id: calculationHistory
             }
 
-            Keys.onPressed: { //Some special keys like backspace captured in TextField below as they are for some reason not sent to the application but to the text input
+            // Some special keys like backspace captured in TextField,
+            // are for some reason not sent to the application but to the text input
+            Keys.onPressed: {                 
                 keyboardLoader.item.pressedKey = event.key;
                 keyboardLoader.item.pressedKeyText = event.text;
             }
@@ -633,9 +635,16 @@
                             rightMargin: units.gu(1)
                         }
 
-                        Keys.onPressed: { //Need to capture special keys like backspace here as they are for some reason not sent to the application but to the text input
-                            keyboardLoader.item.pressedKey = event.key;
-                            keyboardLoader.item.pressedKeyText = event.text;
+                        // Need to capture special keys like backspace here,
+                        // as they are for some reason not sent to the application but to the text input
+                        Keys.onPressed: { 
+                            // Don't press calculator's visual keys, when modifiers are pressed
+                            // to allow work keyboard shortcuts (eg. Ctrl+C)
+                            if (event.modifiers & Qt.NoModifier) {
+                                
+                                keyboardLoader.item.pressedKey = event.key;
+                                keyboardLoader.item.pressedKeyText = event.text;
+                            }
                         }
 
                         Keys.onReleased: {