Merge lp:~nik90/ubuntu-clock-app/remove-timer-hour into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Removed hour support from timer as requested by design.

This MP removed hour support from timer as requested by design. The autopilot tests have also been fixed due to the design change.

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

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

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

review: Approve (continuous-integration)

[Paolo Rotolo (paolorotolo)]

lgtm!

review: Approve

=== modified file 'common/ClockUtils.js'
--- common/ClockUtils.js	2013-08-09 23:00:57 +0000
+++ common/ClockUtils.js	2013-09-12 17:50:28 +0000
@@ -29,13 +29,6 @@
     console.debug(LOG_PREFIX + "[ERROR] " + message);
 }
 
-function formatNow ( now ) {
-    var hours = now.getHours();
-    var minutes = now.getMinutes();
-    var seconds = now.getSeconds();
-    return hmsToString(hours, minutes, seconds)
-}
-
 function zeroleft ( n, z ) {
     var resstring = numberToLocaleString(n.toString());
     var numchart = z;
@@ -50,27 +43,3 @@
 function numberToLocaleString( num ) {
     return Number(num).toLocaleString(Qt.locale(), "f", 0)
 }
-
-// Function to convert time into a proper string format
-function hmsToString(hours, minutes, seconds)
-{
-    var timeString = zeroleft(hours, 2) + ":" + zeroleft(minutes, 2) + ":" + zeroleft(seconds, 2);
-    return timeString;
-}
-
-// Function to print timer label (format mm:ss and hh:mm:ss when hh > 0) at top
-function intervalToString(hours, minutes, seconds)
-{
-    var locale = Qt.locale();
-
-    if (hours > 0) {
-        return zeroleft(hours, 2) + ":" + zeroleft(minutes, 2) + ":" + zeroleft(seconds, 2);
-    } else {
-        return zeroleft(minutes, 2) + ":" + zeroleft(seconds, 2);
-    }
-}
-
-// Function to return total seconds.
-function totalSeconds(hours, minutes, seconds) {
-    return( (hours * 60 * 60) + (minutes * 60) + seconds );
-}

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2013-08-15 19:27:03 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2013-09-12 17:50:28 +0000
@@ -60,9 +60,9 @@
         """Returns the TextField where insert the name of the preset"""
         return self.select_single("TextField", objectName="namePreset")
 
-    def get_timer_hour_hand(self):
+    def get_timer_minute_hand(self):
         """Returns the hour hand of clock in timer tab"""
-        return self.select_single("AnalogTouchHand", objectName="hourHand")
+        return self.select_single("AnalogTouchHand", objectName="minuteHand")
 
     def get_preset_label_text(self):
         """Returns the label with the preset text"""

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-09-05 02:53:54 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-09-12 17:50:28 +0000
@@ -98,12 +98,20 @@
 
         self.drag_page_down_to_previous_state()
 
-        # Set hour
-        self.assertThat(self.main_view.get_timer_hour_hand, Eventually(Not(Is(None))))
-        hour = self.main_view.get_timer_hour_hand()
-        x, y, w, h = hour.globalRect
+        # Set minute
+        self.assertThat(self.main_view.get_timer_minute_hand, Eventually(Not(Is(None))))
+        minute = self.main_view.get_timer_minute_hand()
+
+        timeout = 0        
+        while label.focus == True and timeout < 10:
+            TimerLabel = self.main_view.get_label_timer()
+            self.pointing_device.click_object(TimerLabel)
+            sleep(1)
+            timeout += 1
+
+        x, y, w, h = minute.globalRect
         tx = x + (w / 2)
-        ty = y + (h / 2)
+        ty = y + (h / 2.5)
         self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
 
         self.assertThat(self.main_view.get_num_of_presets, Eventually(Not(Is(None))))
@@ -145,7 +153,7 @@
 
         # Check has been deleted
         self.assertThat(self.main_view.get_num_of_presets,
-                Eventually(Equals(num_of_presets_old-1)))
+                Eventually(Equals(num_of_presets_old-1)))        
 
     def test_run_preset(self):
         """Tests if a preset can runs"""
@@ -175,4 +183,4 @@
         self.assertThat(self.main_view.get_label_timer, Eventually(Not(Is(None))))
         label_timer = self.main_view.get_label_timer()
         self.pointing_device.click_object(label_timer)
-        self.assertThat(label_timer.text, Eventually(NotEquals("23:00:00")))
+        self.assertThat(label_timer.text, Eventually(NotEquals("21:00")))

=== modified file 'timer/AnalogTimer.qml'
--- timer/AnalogTimer.qml	2013-09-05 17:00:26 +0000
+++ timer/AnalogTimer.qml	2013-09-12 17:50:28 +0000
@@ -29,8 +29,7 @@
 
     // Properties to store/set the time variables
     property int seconds: 0;
-    property int minutes: 0;
-    property int hours: 0;
+    property int minutes: 0;    
     property int totalTime: 0;
     property int pauseTime: 0;
 
@@ -57,11 +56,9 @@
     function ssToTime(time) {
         seconds = time % 60
         time = Math.floor(time / 60)
-        minutes = time % 60
-        hours = Math.floor(time / 60)
+        minutes = time % 60        
         secondHand.rotationValue = seconds * 6;
-        minuteHand.rotationValue = minutes * 6;
-        hourHand.rotationValue = hours * 6;
+        minuteHand.rotationValue = minutes * 6;        
     }
 
     // Function to disable timer and reset time
@@ -72,7 +69,7 @@
         repeat: false
         onTriggered: {
             inProgressFlag = true;
-            hourHand.rotationValue = minuteHand.rotationValue = secondHand.rotationValue = 0;
+            minuteHand.rotationValue = secondHand.rotationValue = 0;
             inProgressFlag = false;
         }
     }
@@ -82,8 +79,8 @@
         timerOn = false;
         state = "";
         startTime = remTime = pauseTime = 0;
-        hours = minutes = seconds = totalTime = 0;
-        hourHand.timerValue = minuteHand.timerValue = secondHand.timerValue = 0;
+        minutes = seconds = totalTime = 0;
+        minuteHand.timerValue = secondHand.timerValue = 0;
     }
 
     Repeater {
@@ -95,23 +92,10 @@
         }
     }
 
-    // Hour hand with touch/mouse drag support
-    AnalogTouchHand {
-        id: hourHand
-        objectName: "hourHand"
-
-        onTimerValueChanged: hours = timerValue;
-
-        handHeight: units.gu(12.5); handWidth: units.gu(1);
-        z: minuteHand.z + 1;
-        animateFlag: inProgressFlag;
-        enabled: !inProgressFlag;
-        grabMargin: units.gu(3);
-    }
-
     // Minute hand with touch/mouse drag support
     AnalogTouchHand {
         id: minuteHand
+        objectName: "minuteHand"
 
         onTimerValueChanged: minutes = timerValue;
 

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-09-09 18:06:30 +0000
+++ timer/TimerPage.qml	2013-09-12 17:50:28 +0000
@@ -29,7 +29,6 @@
 
     flickable: null
 
-    property alias hours: analogTimer.hours;
     property alias minutes: analogTimer.minutes;
     property alias seconds: analogTimer.seconds;
     property alias totalTime: analogTimer.totalTime;
@@ -54,8 +53,8 @@
             id: saveTimerAction
             iconSource: Qt.resolvedUrl("../images/select_icon.png")
             text: i18n.tr("Save")
-            onTriggered: {
-                presetModel.appendPreset(tempNamePreset, namePreset.text, Utils.totalSeconds(hours, minutes, seconds), listTimerPreset.currentIndex)
+            onTriggered: {                
+                presetModel.appendPreset(tempNamePreset, namePreset.text, ((minutes * 60) + seconds), listTimerPreset.currentIndex)
                 namePreset.focus = false
                 if (listTimerPreset.currentIndex == -1) {
                     reset()
@@ -105,6 +104,12 @@
         analogTimer.onTimerUpdate();
     }
 
+    // Function to print timer label (format mm:ss and hh:mm:ss when hh > 0) at top
+    function intervalToString(minutes, seconds)
+    {
+        return Utils.zeroleft(minutes, 2) + ":" + Utils.zeroleft(seconds, 2);
+    }
+
     function reset() {
         analogTimer.reset();
         listTimerPreset.currentIndex = -1;
@@ -112,21 +117,18 @@
         tempNamePreset = "";
     }
 
-    // Function to calculate and print the hours, minutes and seconds from the total time as a string
+    // Function to calculate and print the minutes and seconds from the total time as a string
     function getstringTimer(time) {
-        var hours, minutes, seconds;
+        var minutes, seconds;
 
         seconds = time % 60
         time = Math.floor(time / 60)
-        minutes = time % 60
-        hours = Math.floor(time / 60)
-
-        return Utils.hmsToString(hours, minutes, seconds);
-    }
-
-    Component.onCompleted: {
-        Utils.log("TimerPage loaded");
-    }
+        minutes = time % 60        
+
+        return Utils.zeroleft(minutes, 2) + ":" + Utils.zeroleft(seconds, 2);
+    }
+
+    Component.onCompleted: Utils.log("TimerPage loaded");
 
     AnimationContainer {
         id: timerAnimationContainer
@@ -152,7 +154,7 @@
                 color: Theme.palette.normal.baseText
 
                 fontSize: "x-large"
-                text: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+                text: labelTimer.text = intervalToString(minutes, seconds);
             }
         }
 
@@ -165,7 +167,7 @@
 
                 interval: 500
                 repeat: true
-                onTriggered: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+                onTriggered: labelTimer.text = intervalToString(minutes, seconds);
             }
 
             AnalogGlowEffect {
@@ -179,10 +181,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: if (timerOn == true) seconds_timer.restart()
-                              else labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+                              else labelTimer.text = intervalToString(minutes, seconds);
 
-            onMinutesChanged: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
-            onHoursChanged: labelTimer.text = Utils.intervalToString(hours, minutes, seconds);
+            onMinutesChanged: labelTimer.text = intervalToString(minutes, seconds);
 
             states:[
                 State { name: "STOP" },
@@ -203,8 +204,8 @@
                     switch (analogTimer.state) {
 
                     case "":
-                        if ((seconds != 0 || hours != 0 || minutes != 0) || timerOn) {
-                            totalTime = Utils.totalSeconds(hours, minutes, seconds);
+                        if ((seconds != 0 || minutes != 0) || timerOn) {
+                            totalTime = (minutes * 60) + seconds;
                             analogTimer.startTime = new Date();
                             timerOn = true;
                             analogTimer.state = "STOP";
@@ -280,7 +281,7 @@
             anchors { top: analogTimer.bottom; topMargin: units.gu(7); horizontalCenter: analogTimer.horizontalCenter; leftMargin: units.gu(4) }
             buttonImage: Qt.resolvedUrl("../images/reset_icon.svg");
             buttonLabel: i18n.tr("Reset");
-            visible: timerOn || (hours != 0 || minutes != 0 || seconds != 0)? true : false;
+            visible: timerOn || (minutes != 0 || seconds != 0)? true : false;
             enabled: true
 
             onClicked: {