Merge lp:~paolorotolo/ubuntu-clock-app/fix-for-1172869 into lp:ubuntu-clock-app/saucy

[Paolo Rotolo]

Fix early timer label update.

Fix early timer label update.
Please see: https://bugs.launchpad.net/ubuntu-clock-app/+bug/1172869

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

PASSED: Continuous integration, rev:191
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/17/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/306
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/17

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Wow that fixes the issue. I guess we needed to look at how long the animation took and then update the work. Nice logic! I am however concerned about the performance of the app since we have added several qml timers now. After testing the issue on the desktop and phone, I can confirm this MP fixes the issue.

Can you do on small code fix though? Could you change,

13 + onTriggered: {
14 + labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
15 + }

to just

onTriggered: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);

We do this when there is only statement in the function. Also apply similar fix to the if-else statement below as well.

review: Needs Fixing (minor code fix)

[lp:~paolorotolo/ubuntu-clock-app/fix-for-1172869]

192. By Paolo Rotolo on 2013-09-08

Removed { }.

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

PASSED: Continuous integration, rev:192
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/18/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/307
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/18
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/18

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-09-07 19:09:03 +0000
+++ timer/TimerPage.qml	2013-09-08 10:32:52 +0000
@@ -118,6 +118,14 @@
         AnalogTimer {
             id: analogTimer
 
+            Timer {
+                id: seconds_timer
+
+                interval: 500
+                repeat: true
+                onTriggered: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+            }
+
             AnalogGlowEffect {
                 id: glowEffect
 
@@ -128,7 +136,9 @@
 
             anchors { top: parent.top; topMargin: presetModel.count != 0 ? units.gu(9) : units.gu(12); horizontalCenter: parent.horizontalCenter }
             inProgressFlag: (timerOn == true || analogTimer.state == "DONE") ? true : false;
-            onSecondsChanged: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+            onSecondsChanged: if (timerOn == true) seconds_timer.restart()
+                              else labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+
             onMinutesChanged: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
             onHoursChanged: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);