Ubuntu Calculator App

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

  1. ubuntu-calculator-app-euler-number
  2. Merge into trunk
Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 86
Merged at revision: 91
Proposed branch: lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-euler-number
Merge into: lp:ubuntu-calculator-app
Diff against target: 37 lines (+3/-2)
3 files modified
app/engine/formula.js (+1/-0)
app/ui/LandscapeKeyboard.qml (+1/-1)
app/ui/PortraitKeyboard.qml (+1/-1)
To merge this branch: bzr merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-euler-number
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+248184@code.launchpad.net

Commit message

Change Euler number display character.

Description of the change

Change Euler number display character.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/engine/formula.js'
2--- app/engine/formula.js 2014-12-10 08:11:03 +0000
3+++ app/engine/formula.js 2015-01-30 23:37:23 +0000
4@@ -99,6 +99,7 @@
5 '\\*': 'Γ—',
6 '\\.': decimalPoint,
7 'NaN': i18n.tr("NaN"),
8+ 'E': 'β„―',
9 'Infinity': '∞'
10 }
11
12
13=== modified file 'app/ui/LandscapeKeyboard.qml'
14--- app/ui/LandscapeKeyboard.qml 2015-01-29 21:06:53 +0000
15+++ app/ui/LandscapeKeyboard.qml 2015-01-30 23:37:23 +0000
16@@ -22,7 +22,7 @@
17 { number: 8, name: "eight" },
18 { number: 9, name: "nine" },
19 { text: "βˆ’", name: "minus", pushText: "-", kbdKeys: [Qt.Key_Minus] },
20- { text: "e", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
21+ { text: "β„―", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
22 { text: "Ο€", name: "piNumber", pushText: "pi", kbdKeys: [Qt.Key_P] },
23 { text: i18n.tr("mod"), name: "modulo", pushText: "%", kbdKeys: [Qt.Key_Percent] },
24 { text: "!", name: "factorialNumber", kbdKeys: [Qt.Key_Exclam] },
25
26=== modified file 'app/ui/PortraitKeyboard.qml'
27--- app/ui/PortraitKeyboard.qml 2015-01-30 10:41:31 +0000
28+++ app/ui/PortraitKeyboard.qml 2015-01-30 23:37:23 +0000
29@@ -39,7 +39,7 @@
30 { text: "xΒ²", name: "square", pushText: "^2" },
31 { text: "xΒ³", name: "cube", pushText: "^3" },
32 { text: i18n.tr("log"), name: "logarithm", pushText: "log(", kbdKeys: [Qt.Key_L] },
33- { text: "e", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
34+ { text: "β„―", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
35 { text: "Ο€", name: "piNumber", pushText: "pi", kbdKeys: [Qt.Key_P] },
36 { text: i18n.tr("mod"), name: "modulo", pushText: "%", kbdKeys: [Qt.Key_Percent] },
37 { text: "!", name: "factorialNumber", kbdKeys: [Qt.Key_Exclam] },

Subscribers

People subscribed via source and target branches