Merge lp:~nik90/ubuntu-clock-app/new-headers-api into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Transitions to the new headers API and also removed the redundant back button definition in the alarm page since it is provided by the pagestack automatically.

Transitions to the new headers API. I also removed the redundant back button definition in the alarm page since it is provided by the pagestack automatically.

NOTE: With this MP, we no longer support Trusty since the new header API will require the latest SDK which in turn requires Qt 5.3 which will not be backported to Trusty.

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

FAILED: Continuous integration, rev:18
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/20/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/931/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/20/console

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/new-headers-api]

19. By Nekhelesh Ramananthan on 2014-07-09

Added the custom back button in the edit alarm page as it requires a custom icon

20. By Nekhelesh Ramananthan on 2014-07-09

Moved the header actions to the top

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

FAILED: Continuous integration, rev:20
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/21/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/932/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/21/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/21/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/new-headers-api]

21. By Nekhelesh Ramananthan on 2014-07-09

Added labels to the action

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

FAILED: Continuous integration, rev:21
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/22/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/933/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/22/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

This looks good. Could we still remove the custom back action but not introduce the Trusty regression? If you have a reason to jump forward to use the "head" property that is also fine.

review: Needs Information

[Nekhelesh Ramananthan (nik90)]

> This looks good. Could we still remove the custom back action but not
> introduce the Trusty regression? If you have a reason to jump forward to use
> the "head" property that is also fine.

I am afraid we can't :/. The design shown at https://docs.google.com/presentation/d/1Kkl7xT8BYo9mT8i3IXh6rPrDlNg6cBxTajahlRYIGlI/edit#slide=id.g18883f09d_2108 requires the back button to look like a close button and for that we need to have a custom back action. I could request the designers to consider using the default back button, but I notice that when adding a new contact in the address book, it also uses a custom back button to show the close button. So I think we should stick to the design specs.

The Trusty support is being dropped since when working on the next main feature which is the world clocks, the add city page will use the new header search mode which requires the new header API. So we break Trusty compatibility either now or a few days later.

I say we go ahead with this, but will wait for your approval before merging.

[lp:~nik90/ubuntu-clock-app/new-headers-api]

22. By Nekhelesh Ramananthan on 2014-07-11

merged parent branch

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

FAILED: Continuous integration, rev:22
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/29/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/968/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/29/console

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Lgtm!

review: Approve

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-06-25 20:52:33 +0000
+++ app/alarm/AlarmPage.qml	2014-07-11 10:08:56 +0000
@@ -23,6 +23,14 @@
 
     flickable: null
 
+    head.actions: Action {
+        iconName: "add"
+        text: i18n.tr("Alarm")
+        onTriggered: {
+            mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
+        }
+    }
+
     Component.onCompleted: Utils.log(debugMode, "Alarm Page loaded")
 
     AlarmList{
@@ -30,24 +38,4 @@
         model: alarmModel
         anchors.fill: parent
     }
-
-    tools: ToolbarItems {
-        back: Button {
-            action: Action {
-                iconName: "back"
-                onTriggered: {
-                    mainStack.pop()
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                iconName: "add"
-                onTriggered: {
-                    mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
-                }
-            }
-        }
-    }
 }

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-07-07 09:04:08 +0000
+++ app/alarm/EditAlarmPage.qml	2014-07-11 10:08:56 +0000
@@ -35,6 +35,28 @@
     title: isNewAlarm ? i18n.tr("New Alarm") : i18n.tr("Edit Alarm")
     visible: false
 
+    head {
+        backAction: Action {
+            iconName: "close"
+            onTriggered: {
+                mainStack.pop()
+            }
+        }
+
+        actions: Action {
+            iconName: "save"
+            text: i18n.tr("Alarm")
+            onTriggered: {
+                if(isNewAlarm) {
+                    saveNewAlarm()
+                }
+                else {
+                    updateAlarm()
+                }
+            }
+        }
+    }
+
     Component.onCompleted: {
         if(!isNewAlarm) {
             readAlarm()
@@ -175,29 +197,4 @@
                                       {"alarmSound": _alarmSound})
         }
     }
-
-    tools: ToolbarItems {
-        back: Button {
-            action: Action {
-                iconName: "close"
-                onTriggered: {
-                    mainStack.pop()
-                }
-            }
-        }
-
-        ToolbarButton {
-            action: Action {
-                iconName: "save"
-                onTriggered: {
-                    if(isNewAlarm) {
-                        saveNewAlarm()
-                    }
-                    else {
-                        updateAlarm()
-                    }
-                }
-            }
-        }
-    }
 }