Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-euler-number into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Change Euler number display character.

Change Euler number display character.

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

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good, thanks.

review: Approve

=== modified file 'app/engine/formula.js'
--- app/engine/formula.js	2014-12-10 08:11:03 +0000
+++ app/engine/formula.js	2015-01-30 23:37:23 +0000
@@ -99,6 +99,7 @@
         '\\*': '×',
         '\\.': decimalPoint,
         'NaN': i18n.tr("NaN"),
+        'E': 'ℯ',
         'Infinity': '∞'
     }
 
 
=== modified file 'app/ui/LandscapeKeyboard.qml'
--- app/ui/LandscapeKeyboard.qml	2015-01-29 21:06:53 +0000
+++ app/ui/LandscapeKeyboard.qml	2015-01-30 23:37:23 +0000
@@ -22,7 +22,7 @@
             { number: 8, name: "eight" },
             { number: 9, name: "nine" },
             { text: "−", name: "minus", pushText: "-", kbdKeys: [Qt.Key_Minus] },
-            { text: "e", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
+            { 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] },
 
=== modified file 'app/ui/PortraitKeyboard.qml'
--- app/ui/PortraitKeyboard.qml	2015-01-30 10:41:31 +0000
+++ app/ui/PortraitKeyboard.qml	2015-01-30 23:37:23 +0000
@@ -39,7 +39,7 @@
             { text: "x²", name: "square", pushText: "^2" },
             { text: "x³", name: "cube", pushText: "^3" },
             { text: i18n.tr("log"), name: "logarithm", pushText: "log(", kbdKeys: [Qt.Key_L] },
-            { text: "e", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
+            { 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] },