Merge lp:~rpadovani/ubuntu-clock-app/1166264 into lp:ubuntu-clock-app/saucy

[Riccardo Padovani]

Added possibility to pause timer
Added reset button to timer
See #1166264

Added possibility to pause timer
Added reset button to timer
See #1166264

[Nekhelesh Ramananthan (nik90)]

Nice work. There are some things which need fixing.

It is not required to copy ImageButton.qml from the stopwatch folder to the timer folder. In the timerpage.qml file where you used it, you can just add a statement "import ../stopwatch". This avoid code duplication. Ideally speaking the ImageButton.qml file needs to be moved to the common folder since it is now being used by both Timer and Stopwatch, but this can be addressed in another commit.

review: Needs Fixing

[lp:~rpadovani/ubuntu-clock-app/1166264]

139. By Riccardo Padovani on 2013-07-12

Moved ImageButton.qml to common

140. By Riccardo Padovani on 2013-07-12

Bugfix for reset code. Centered reset button

141. By Riccardo Padovani on 2013-07-12

update reset function

[Nekhelesh Ramananthan (nik90)]

Could you move the pauseTime = 0, to AnalogTimer.qml? There is a reset function in that file where you can append it by,

startTime = remTime = pauseTime = 0.

This would make them all be in one central place.

Proceeding to test bug fix in all scenarios. Otherwise it looks good.

[Nekhelesh Ramananthan (nik90)]

lgtm! No regressions during my testing. Code style is clean.

review: Approve

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

review: Approve (continuous-integration)

=== renamed file 'stopwatch/ImageButton.qml' => 'common/ImageButton.qml'
=== modified file 'timer/AnalogTimer.qml'
--- timer/AnalogTimer.qml	2013-07-09 20:26:23 +0000
+++ timer/AnalogTimer.qml	2013-07-12 17:11:34 +0000
@@ -33,6 +33,7 @@
     property int minutes: 0;
     property int hours: 0;
     property int totalTime: 0;
+    property int pauseTime: 0;
 
     // Property to activate/deactivate the timer
     property bool timerOn: false;
@@ -41,7 +42,7 @@
     // Timer function called by the main clock loop
     function onTimerUpdate () {
         if( timerOn ) {
-            remTime = totalTime - Math.floor((new Date() - startTime)/ 1000);
+            remTime = totalTime - Math.floor((new Date() - startTime)/ 1000) - pauseTime;
 
             if (remTime < 0) {
                 timerOn = false
@@ -66,7 +67,7 @@
     // Function to disable timer and reset time
     function reset() {
         timerOn = false;
-        startTime = remTime = 0;
+        startTime = remTime = pauseTime = 0;
         hourHand.rotationValue = minuteHand.rotationValue = secondHand.rotationValue = 0;
         hours = minutes = seconds = totalTime = 0;
         hourHand.timerValue = minuteHand.timerValue = secondHand.timerValue = 0;
 
=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-07-09 20:26:23 +0000
+++ timer/TimerPage.qml	2013-07-12 17:11:34 +0000
@@ -131,6 +131,7 @@
 
             states:[
                 State { name: "STOP" },
+                State { name: "PAUSE"},
                 State {
                     name: "DONE"
                     when: (totalTime == -1 && timerOn == false)
@@ -157,19 +158,42 @@
                         break;
 
                     case "STOP":
-                        reset();
-                        analogTimer.state = "";
+                        timerOn = false;
+                        analogTimer.pauseTime = analogTimer.totalTime - analogTimer.remTime + 1; // +1 is necessary to start immediately the timer when finish a pause
+                        analogTimer.state = "PAUSE";
                         break;
 
                     case "DONE":
                         reset();
                         analogTimer.state = "";
                         break;
+
+                    case "PAUSE":
+                        analogTimer.startTime = new Date();
+                        timerOn = true;
+                        analogTimer.state = "STOP";
+                        break;
                     }
                 }
             }
         }
 
+        ImageButton {
+            id: resetButtonTimer
+            objectName: "resetButtonTimer"
+
+            anchors { top: analogTimer.bottom; topMargin: units.gu(4); horizontalCenter: analogTimer.horizontalCenter; leftMargin: units.gu(4) }
+            buttonImage: Qt.resolvedUrl("../images/reset_icon.png");
+            buttonLabel: i18n.tr("Reset");
+
+            activated: true
+
+            onClicked: {
+                reset();
+                analogTimer.state = "";
+            }
+        }
+
         // Column element to hold the saved presets
         Column {
             id: listPreset