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
=== modified file 'Simple/CalcKeyboard.qml'
--- Simple/CalcKeyboard.qml 2013-09-23 20:29:34 +0000
+++ Simple/CalcKeyboard.qml 2013-09-26 05:09:35 +0000
@@ -110,7 +110,6 @@
110 text: Number(7).toLocaleString(Qt.locale(), "f", 0)110 text: Number(7).toLocaleString(Qt.locale(), "f", 0)
111 onClicked: {111 onClicked: {
112 formulaPush(text);112 formulaPush(text);
113 hasToAddDot = false;
114 }113 }
115 }114 }
116115
@@ -121,7 +120,6 @@
121 text: Number(8).toLocaleString(Qt.locale(), "f", 0)120 text: Number(8).toLocaleString(Qt.locale(), "f", 0)
122 onClicked: {121 onClicked: {
123 formulaPush(text);122 formulaPush(text);
124 hasToAddDot = false;
125 }123 }
126 }124 }
127125
@@ -132,7 +130,6 @@
132 text: Number(9).toLocaleString(Qt.locale(), "f", 0)130 text: Number(9).toLocaleString(Qt.locale(), "f", 0)
133 onClicked: {131 onClicked: {
134 formulaPush(text);132 formulaPush(text);
135 hasToAddDot = false;
136 }133 }
137 }134 }
138135
@@ -154,7 +151,6 @@
154 text: Number(4).toLocaleString(Qt.locale(), "f", 0)151 text: Number(4).toLocaleString(Qt.locale(), "f", 0)
155 onClicked: {152 onClicked: {
156 formulaPush(text);153 formulaPush(text);
157 hasToAddDot = false;
158 }154 }
159 }155 }
160156
@@ -165,7 +161,6 @@
165 text: Number(5).toLocaleString(Qt.locale(), "f", 0)161 text: Number(5).toLocaleString(Qt.locale(), "f", 0)
166 onClicked: {162 onClicked: {
167 formulaPush(text);163 formulaPush(text);
168 hasToAddDot = false;
169 }164 }
170 }165 }
171166
@@ -176,7 +171,6 @@
176 text: Number(6).toLocaleString(Qt.locale(), "f", 0)171 text: Number(6).toLocaleString(Qt.locale(), "f", 0)
177 onClicked: {172 onClicked: {
178 formulaPush(text);173 formulaPush(text);
179 hasToAddDot = false;
180 }174 }
181 }175 }
182176
@@ -198,7 +192,6 @@
198 text: Number(1).toLocaleString(Qt.locale(), "f", 0)192 text: Number(1).toLocaleString(Qt.locale(), "f", 0)
199 onClicked: {193 onClicked: {
200 formulaPush(text);194 formulaPush(text);
201 hasToAddDot = false;
202 }195 }
203 }196 }
204197
@@ -209,7 +202,6 @@
209 text: Number(2).toLocaleString(Qt.locale(), "f", 0)202 text: Number(2).toLocaleString(Qt.locale(), "f", 0)
210 onClicked: {203 onClicked: {
211 formulaPush(text);204 formulaPush(text);
212 hasToAddDot = false;
213 }205 }
214 }206 }
215207
@@ -219,8 +211,7 @@
219 y: (calcGridUnit*8)*3211 y: (calcGridUnit*8)*3
220 text: Number(3).toLocaleString(Qt.locale(), "f", 0)212 text: Number(3).toLocaleString(Qt.locale(), "f", 0)
221 onClicked: {213 onClicked: {
222 formulaPush(text);214 formulaPush(text);
223 hasToAddDot = false;
224 }215 }
225 }216 }
226217
@@ -247,7 +238,6 @@
247 text: Number(0).toLocaleString(Qt.locale(), "f", 0)238 text: Number(0).toLocaleString(Qt.locale(), "f", 0)
248 onClicked: {239 onClicked: {
249 formulaPush(text);240 formulaPush(text);
250 hasToAddDot = false;
251 }241 }
252 }242 }
253243
@@ -275,6 +265,7 @@
275 text: i18n.tr("AC")265 text: i18n.tr("AC")
276 onClicked: {266 onClicked: {
277 clear();267 clear();
268 hasToAddDot=false;
278 }269 }
279 }270 }
280 }271 }
281272
=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml 2013-09-24 19:29:44 +0000
+++ Simple/SimplePage.qml 2013-09-26 05:09:35 +0000
@@ -302,6 +302,7 @@
302 }302 }
303 clear();303 clear();
304 __toBeRefresh = false304 __toBeRefresh = false
305 hasToAddDot=false;
305 }306 }
306 }307 }
307 }308 }

Subscribers

People subscribed via source and target branches