Ubuntu Calculator App

Merge lp:~mihirsoni/ubuntu-calculator-app/1229859 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

  1. 1229859
  2. Merge into old_trunk
Proposed by Mihir Soni
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 160
Merged at revision: 159
Proposed branch: lp:~mihirsoni/ubuntu-calculator-app/1229859
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 105 lines (+3/-11)
2 files modified
Simple/CalcKeyboard.qml (+2/-11)
Simple/SimplePage.qml (+1/-0)
To merge this branch: bzr merge lp:~mihirsoni/ubuntu-calculator-app/1229859
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+187460@code.launchpad.net

Commit message

Fixed multiple dots issue

Description of the change

Fixed bug #1229859

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:159
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/108/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/471
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-precise-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-quantal-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/107

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

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks for your time Mihir :)
There is only a little issue:
- Press a number
- Press dot
- Tear off to start a new calc
- Press a number
- Press dot

The dot doesn't appear

Revision history for this message
Riccardo Padovani (rpadovani) :
review: Needs Fixing
lp:~mihirsoni/ubuntu-calculator-app/1229859 updated
160. By Mihir Soni

allowing dot after tearing off calculation

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Great work Mihir :)
Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Simple/CalcKeyboard.qml'
2--- Simple/CalcKeyboard.qml 2013-09-23 20:29:34 +0000
3+++ Simple/CalcKeyboard.qml 2013-09-26 05:09:35 +0000
4@@ -110,7 +110,6 @@
5 text: Number(7).toLocaleString(Qt.locale(), "f", 0)
6 onClicked: {
7 formulaPush(text);
8- hasToAddDot = false;
9 }
10 }
11
12@@ -121,7 +120,6 @@
13 text: Number(8).toLocaleString(Qt.locale(), "f", 0)
14 onClicked: {
15 formulaPush(text);
16- hasToAddDot = false;
17 }
18 }
19
20@@ -132,7 +130,6 @@
21 text: Number(9).toLocaleString(Qt.locale(), "f", 0)
22 onClicked: {
23 formulaPush(text);
24- hasToAddDot = false;
25 }
26 }
27
28@@ -154,7 +151,6 @@
29 text: Number(4).toLocaleString(Qt.locale(), "f", 0)
30 onClicked: {
31 formulaPush(text);
32- hasToAddDot = false;
33 }
34 }
35
36@@ -165,7 +161,6 @@
37 text: Number(5).toLocaleString(Qt.locale(), "f", 0)
38 onClicked: {
39 formulaPush(text);
40- hasToAddDot = false;
41 }
42 }
43
44@@ -176,7 +171,6 @@
45 text: Number(6).toLocaleString(Qt.locale(), "f", 0)
46 onClicked: {
47 formulaPush(text);
48- hasToAddDot = false;
49 }
50 }
51
52@@ -198,7 +192,6 @@
53 text: Number(1).toLocaleString(Qt.locale(), "f", 0)
54 onClicked: {
55 formulaPush(text);
56- hasToAddDot = false;
57 }
58 }
59
60@@ -209,7 +202,6 @@
61 text: Number(2).toLocaleString(Qt.locale(), "f", 0)
62 onClicked: {
63 formulaPush(text);
64- hasToAddDot = false;
65 }
66 }
67
68@@ -219,8 +211,7 @@
69 y: (calcGridUnit*8)*3
70 text: Number(3).toLocaleString(Qt.locale(), "f", 0)
71 onClicked: {
72- formulaPush(text);
73- hasToAddDot = false;
74+ formulaPush(text);
75 }
76 }
77
78@@ -247,7 +238,6 @@
79 text: Number(0).toLocaleString(Qt.locale(), "f", 0)
80 onClicked: {
81 formulaPush(text);
82- hasToAddDot = false;
83 }
84 }
85
86@@ -275,6 +265,7 @@
87 text: i18n.tr("AC")
88 onClicked: {
89 clear();
90+ hasToAddDot=false;
91 }
92 }
93 }
94
95=== modified file 'Simple/SimplePage.qml'
96--- Simple/SimplePage.qml 2013-09-24 19:29:44 +0000
97+++ Simple/SimplePage.qml 2013-09-26 05:09:35 +0000
98@@ -302,6 +302,7 @@
99 }
100 clear();
101 __toBeRefresh = false
102+ hasToAddDot=false;
103 }
104 }
105 }

Subscribers

People subscribed via source and target branches