Merge lp:~nik90/ubuntu-clock-app/fix-hud-actions into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Removed HUD actions for generic functions such as save and cancel.

This MP removes HUD actions for generic toolbar functions such as "Save", "Cancel". This was approved by design.

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

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

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

review: Approve (continuous-integration)

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-09-12 17:22:30 +0000
+++ timer/TimerPage.qml	2013-09-14 10:25:58 +0000
@@ -36,7 +36,7 @@
     property string tempNamePreset
     property int pagePostion
 
-    actions: [
+    actions:
         Action {
             id: addTimerAction
             iconSource: Qt.resolvedUrl("../images/add_icon.png")
@@ -47,36 +47,7 @@
                 reset()
                 state = "addPreset"
             }
-        },
-
-        Action {
-            id: saveTimerAction
-            iconSource: Qt.resolvedUrl("../images/select_icon.png")
-            text: i18n.tr("Save")
-            onTriggered: {                
-                presetModel.appendPreset(tempNamePreset, namePreset.text, ((minutes * 60) + 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/cancel_icon.svg")
-            text: i18n.tr("Cancel")
-            onTriggered: {
-                reset()
-                state = "";
-                toolbarTimer.opened = false;
-                timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
-            }
         }
-    ]
 
     states: [
         State {
@@ -378,7 +349,18 @@
             id: editPresetToolbarButton
             objectName: "savePresetButton"
             visible: false
-            action: saveTimerAction
+            iconSource: Qt.resolvedUrl("../images/select_icon.png")
+            text: i18n.tr("Save")
+            onTriggered: {
+                presetModel.appendPreset(tempNamePreset, namePreset.text, ((minutes * 60) + seconds), listTimerPreset.currentIndex)
+                namePreset.focus = false
+                if (listTimerPreset.currentIndex == -1) {
+                    reset()
+                    timerPage.state = "";
+                    timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
+                }
+                toolbarTimer.opened = false;
+            }
         }
 
         ToolbarButton {
@@ -391,7 +373,14 @@
             id: cancelPresetToolbarButton
             objectName: "cancelPresetButton"
             visible: false;
-            action: cancelTimerAction
+            iconSource: Qt.resolvedUrl("../images/cancel_icon.svg")
+            text: i18n.tr("Cancel")
+            onTriggered: {
+                reset()
+                timerPage.state = "";
+                toolbarTimer.opened = false;
+                timerAnimationContainer.contentY = presetModel.count != 0 ? units.gu(87) - timerPage.height : 0;
+            }
         }
     }
 }