Merge lp:~nikwen/ubuntu-calculator-app/fix-desktop-shortcuts into lp:ubuntu-calculator-app

[Niklas Wenzel]

Fix typing special characters on hardware keyboards

Fix typing special characters on hardware keyboards.

Makes the app usable on the desktop. :)

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

PASSED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/324/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2906
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2906/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/46

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Thanks, this is very important with the convergence coming!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-autolanding/140/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2910
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2910/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-autolanding/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-autolanding/30

review: Needs Fixing (continuous-integration)

[Niklas Wenzel (nikwen)]

@rpadovani: Thanks for reviewing this that fast!

It's strange that it worked the first time but failed the second time. Let's check that.

[Riccardo Padovani (rpadovani)]

We have a problem with autopilot since ages, it randomly failes on phone

[Niklas Wenzel (nikwen)]

Ah, ok. Thanks. :)

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

When we approve second time, the Autopilot tests are not run and it is always passed.
@nikwen Do you know what could cause this issue?

[Niklas Wenzel (nikwen)]

@rpadovani: Thanks for approving again and merging this.

@gang65: I think there are some serious problems with running autopilot tests here.
Just compare which tests were run the first time (when it passed) and which ones were run the second time (when it failed):

http://91.189.93.70:8080/job/generic-mediumtests-utopic/2906/testReport/ubuntu_calculator_app.tests.test_main/MainTestCase/
http://91.189.93.70:8080/job/generic-mediumtests-utopic/2910/testReport/ubuntu_calculator_app.tests.test_main/MainTestCase/

These lists differ quite a lot! I'll ping popey on IRC.

And yes, I have an idea why it failed the second time. Let me check the test case but it should be unrelated to this MP.

[Niklas Wenzel (nikwen)]

I found the issue why the test failed once. I filed it as LP: #1464571 and will take care of it as soon as possible.

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-04-26 22:41:49 +0000
+++ app/ubuntu-calculator-app.qml	2015-06-11 15:45:00 +0000
@@ -287,7 +287,7 @@
                 id: calculationHistory
             }
 
-            Keys.onPressed: {
+            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
                 keyboardLoader.item.pressedKey = event.key;
                 keyboardLoader.item.pressedKeyText = event.text;
             }
@@ -630,6 +630,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;
+                        }
+
+                        Keys.onReleased: {
+                            keyboardLoader.item.pressedKey = -1;
+                            keyboardLoader.item.pressedKeyText = "";
+                        }
+
                         readOnly: true
                         selectByMouse: true
                         cursorVisible: true

=== modified file 'app/ui/LandscapeKeyboard.qml'
--- app/ui/LandscapeKeyboard.qml	2015-03-12 21:21:47 +0000
+++ app/ui/LandscapeKeyboard.qml	2015-06-11 15:45:00 +0000
@@ -10,12 +10,12 @@
         columns: 8
 
         keyboardModel: new Array(
-            { text: "←", name: "delete", wFactor: 2, action: "delete", kbdKeys: [Qt.Key_Backspace], secondaryAction: "clearFormula" },
+            { text: "←", name: "delete", wFactor: 2, action: "delete", kbdKeys: [Qt.Key_Backspace, Qt.Key_Delete], secondaryAction: "clearFormula" },
             { text: "√", name: "sqrt", pushText: "sqrt(" },
             { text: "÷", name: "divide", pushText: "/", kbdKeys: [Qt.Key_Slash] },
-            { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum] },
-            { text: "x²", name: "square", pushText: "^2" },
-            { text: "x³", name: "cube", pushText: "^3" },
+            { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum, 16781906] }, //Number needed to make key work with the German keyboard layout as that character is normally typed by pressing the circumflex key twice but that does not work here
+            { text: "x²", name: "square", pushText: "^2", kbdKeys: [Qt.Key_twosuperior] },
+            { text: "x³", name: "cube", pushText: "^3", kbdKeys: [Qt.Key_threesuperior] },
             { text: i18n.tr("log"), name: "logarithm", pushText: "log(", kbdKeys: [Qt.Key_L] },
             { number: 7, name: "seven", textColor: "#DD4814" },
             { number: 8, name: "eight", textColor: "#DD4814" },
@@ -43,9 +43,9 @@
             { text: "tan", name: "tangens", pushText: "tan(", kbdKeys: [Qt.Key_T] },
             { text: decimalPoint, name: "point", pushText: ".", textColor: "#DD4814" },
             { number: 0, name: "zero", textColor: "#DD4814", forceNumber: true },
-            { text: "( )", name: "universalBracket", pushText: "()", textColor: "#DD4814" },
+            { text: "( )", name: "universalBracket", pushText: "()", textColor: "#DD4814", kbdKeys: [Qt.Key_ParenLeft, Qt.Key_ParenRight, Qt.Key_BracketLeft, Qt.Key_BracketRight] },
             { text: "=", name: "equals", action: "calculate", kbdKeys: [Qt.Key_Enter, Qt.Key_Return] },
-            { text: "|x|", name: "abs", pushText: "abs(", kbdKeys: [Qt.Key_A] },
+            { text: "|x|", name: "abs", pushText: "abs(", kbdKeys: [Qt.Key_A, Qt.Key_Bar] },
             { text: "sin⁻¹", name: "arcsinus", pushText: "asin(" },
             { text: "cos⁻¹", name: "arccos", pushText: "acos(" },
             { text: "tan⁻¹", name: "arctangens", pushText: "atan(" }

=== modified file 'app/ui/PortraitKeyboard.qml'
--- app/ui/PortraitKeyboard.qml	2015-03-12 21:21:47 +0000
+++ app/ui/PortraitKeyboard.qml	2015-06-11 15:45:00 +0000
@@ -9,7 +9,7 @@
         buttonMaxHeight: scrollableView.height / 10.0
 
         keyboardModel: new Array(
-            { text: "←", name: "delete", wFactor: 2, action: "delete", kbdKeys: [Qt.Key_Backspace], secondaryAction: "clearFormula" },
+            { text: "←", name: "delete", wFactor: 2, action: "delete", kbdKeys: [Qt.Key_Backspace, Qt.Key_Delete], secondaryAction: "clearFormula" },
             { text: "√", name: "sqrt", pushText: "sqrt("},
             { text: "÷", name: "divide", pushText: "/", kbdKeys: [Qt.Key_Slash] },
             { number: 7, name: "seven", textColor: "#DD4814" },
@@ -26,7 +26,7 @@
             { text: "+", name: "plus" },
             { text: decimalPoint, name: "point", pushText: ".", textColor: "#DD4814" },
             { number: 0, name: "zero", textColor: "#DD4814", forceNumber: true },
-            { text: "( )", name: "universalBracket", pushText: "()", textColor: "#DD4814" },
+            { text: "( )", name: "universalBracket", pushText: "()", textColor: "#DD4814", kbdKeys: [Qt.Key_ParenLeft, Qt.Key_ParenRight, Qt.Key_BracketLeft, Qt.Key_BracketRight] },
             { text: "=", name: "equals", action: "calculate", kbdKeys: [Qt.Key_Enter, Qt.Key_Return] }
         )
     }
@@ -36,15 +36,15 @@
         buttonMaxHeight: scrollableView.height / 10.0
 
         keyboardModel: new Array(
-            { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum] },
-            { text: "x²", name: "square", pushText: "^2" },
-            { text: "x³", name: "cube", pushText: "^3" },
+            { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum, 16781906] }, //Number needed to make key work with the German keyboard layout as that character is normally typed by pressing the circumflex key twice but that does not work here
+            { text: "x²", name: "square", pushText: "^2", kbdKeys: [Qt.Key_twosuperior] },
+            { text: "x³", name: "cube", pushText: "^3", kbdKeys: [Qt.Key_threesuperior] },
             { text: i18n.tr("log"), name: "logarithm", pushText: "log(", kbdKeys: [Qt.Key_L] },
             { text: "ℯ", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
             { text: "π", name: "piNumber", pushText: "pi", kbdKeys: [Qt.Key_P] },
             { text: i18n.tr("mod"), name: "modulo", pushText: "%", kbdKeys: [Qt.Key_Percent] },
             { text: "!", name: "factorialNumber", kbdKeys: [Qt.Key_Exclam] },
-            { text: "ℯⁿ", name: "exp", pushText: "E^"},
+            { text: "ℯⁿ", name: "exp", pushText: "E^" },
             { text: "1/x", name: "multiplicativeInverse", pushText: "^-1" },
             { text: "1/x²", name: "multiplicativeInverse2", pushText: "^-2" },
             { text: "1/x³", name: "multiplicativeInverse3", pushText: "^-3" },
@@ -52,7 +52,7 @@
             { text: "sin", name: "sinus", pushText: "sin(", kbdKeys: [Qt.Key_S] },
             { text: "cos", name: "cos", pushText: "cos(", kbdKeys: [Qt.Key_C]  },
             { text: "tan", name: "tangens", pushText: "tan(", kbdKeys: [Qt.Key_T]  },
-            { text: "|x|", name: "abs", pushText: "abs(", kbdKeys: [Qt.Key_A] },
+            { text: "|x|", name: "abs", pushText: "abs(", kbdKeys: [Qt.Key_A, Qt.Key_Bar] },
             { text: "sin⁻¹", name: "arcsinus", pushText: "asin(" },
             { text: "cos⁻¹", name: "arccos", pushText: "acos(" },
             { text: "tan⁻¹", name: "arctangens", pushText: "atan(" }