Merge lp:~nik90/ubuntu-clock-app/add-hud-support into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Added HUD action support to the existing toolbar buttons.

This MP adds HUD support to the existing toolbar actions.

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

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

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

review: Approve (continuous-integration)

[Paolo Rotolo (paolorotolo)]

lgtm

review: Approve

[Nekhelesh Ramananthan (nik90)]

feel free to approve it at the top (shown by status). Jenkins will then merge it :)

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-09-03 21:06:12 +0000
+++ clock/ClockPage.qml	2013-09-09 17:09:25 +0000
@@ -47,6 +47,17 @@
         updateTime();
     }
 
+    actions: [
+        Action {
+            id: addCityAction
+            text: i18n.tr("Add City")
+            keywords: i18n.tr("Add;Timezone;Timezones;World;City;Cities;Town;Towns;Place;Places;Location;Locations;Time;Locale;Local;Current")
+            description: "Add a world city"
+            iconSource: Qt.resolvedUrl("../images/add_icon.png")
+            onTriggered: pagestack.push(Qt.resolvedUrl("WorldPage.qml"))
+        }
+    ]
+
     function onTimerUpdate(now) {
         currentTimeFormatted = Qt.formatTime(new Date(currentTimeStamp + (diff * 60000)), "hh:mm")
         now.setMinutes(now.getMinutes() + diff)
@@ -59,7 +70,7 @@
     function updateTime() {
         var now = new Date();
         currentTimeStamp = now.getTime();
-    }
+    }    
 
     AnimationContainer {
         id: clockAnimationContainer
@@ -219,11 +230,7 @@
         id: toolbarClock
         ToolbarButton {
             id: addCity
-            action: Action {
-                iconSource: Qt.resolvedUrl("../images/add_icon.png")
-                text: i18n.tr("Add City")
-                onTriggered: pagestack.push(Qt.resolvedUrl("WorldPage.qml"))
-            }
+            action: addCityAction
         }
     }
 }

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-09-08 10:31:38 +0000
+++ timer/TimerPage.qml	2013-09-09 17:09:25 +0000
@@ -37,6 +37,48 @@
     property string tempNamePreset
     property int pagePostion
 
+    actions: [
+        Action {
+            id: addTimerAction
+            iconSource: Qt.resolvedUrl("../images/add_icon.png")
+            text: i18n.tr("Add Timer")
+            description: i18n.tr("Add a new timer")
+            keywords: i18n.tr("Add;Timer;Eggtimer;Preset;Ticker")
+            onTriggered: {
+                reset()
+                state = "addPreset"
+            }
+        },
+
+        Action {
+            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)
+                namePreset.focus = false
+                if (listTimerPreset.currentIndex == -1) {
+                    reset()
+                    state = "";
+                    timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
+                }
+                toolbarTimer.opened = false;
+            }
+        },
+
+        Action {
+            id: cancelTimerAction
+            iconSource: Qt.resolvedUrl("../images/add_icon.png")
+            text: i18n.tr("Cancel")
+            onTriggered: {
+                reset()
+                state = "";
+                toolbarTimer.opened = false;
+                timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
+            }
+        }
+    ]
+
     states: [
         State {
             name: "selectPreset"
@@ -335,49 +377,20 @@
             id: editPresetToolbarButton
             objectName: "savePresetButton"
             visible: false
-            action: Action {
-                iconSource: Qt.resolvedUrl("../images/select_icon.png")
-                text: i18n.tr("Save")
-                onTriggered: {
-                    presetModel.appendPreset(tempNamePreset, namePreset.text, Utils.totalSeconds(hours, minutes, seconds), listTimerPreset.currentIndex)
-                    namePreset.focus = false
-                    if (listTimerPreset.currentIndex == -1) {
-                        reset()
-                        state = "";
-                        timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
-                    }
-                    toolbarTimer.opened = false;
-                }
-            }
+            action: saveTimerAction
         }
 
         ToolbarButton {
             id: addPresetToolbarButton
             objectName: "addPresetButton"
-            action: Action {
-                iconSource: Qt.resolvedUrl("../images/add_icon.png")
-                text: i18n.tr("New")
-                onTriggered: {
-                    reset()
-                    state = "addPreset"
-                }
-            }
+            action: addTimerAction
         }
 
         ToolbarButton {
             id: cancelPresetToolbarButton
             objectName: "cancelPresetButton"
             visible: false;
-            action: Action {
-                iconSource: Qt.resolvedUrl("../images/add_icon.png")
-                text: i18n.tr("Cancel")
-                onTriggered: {
-                    reset()
-                    state = "";
-                    toolbarTimer.opened = false;
-                    timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
-                }
-            }
+            action: cancelTimerAction
         }
     }
 }