Merge lp:~ubuntu-calendar-dev/ubuntu-calendar-app/move-save-cancel-buttons into lp:ubuntu-calendar-app

[Nekhelesh Ramananthan]

Moved the save and cancel buttons in the NewEvent Page to the header.

Moved the save and cancel buttons in the NewEvent Page to the header. Did not notice any regressions. Still need to fix AP tests.

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

FAILED: Continuous integration, rev:414
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/704/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1663
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1663/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/262

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

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-calendar-dev/ubuntu-calendar-app/move-save-cancel-buttons]

415. By Nekhelesh Ramananthan on 2014-08-22

Proposing a AP fix without testing it

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

PASSED: Continuous integration, rev:415
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/706/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1667
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1667/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/264

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks Nik90.

Thanks for the AP modification too.

review: Approve

=== removed file 'EditToolbar.qml'
--- EditToolbar.qml	2014-08-18 16:48:54 +0000
+++ EditToolbar.qml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2013-2014 Canonical Ltd
- *
- * This file is part of Ubuntu Calendar App
- *
- * Ubuntu Calendar App is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Ubuntu Calendar App is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Rectangle {
-    id: root
-
-    signal reject()
-    signal accept()
-
-    property alias acceptAction: accept.action
-    property alias rejectAction: reject.action
-
-    color: "grey"
-
-    Button {
-        id: reject
-        objectName: "reject"
-
-        action: Action {
-            text: i18n.tr("Cancel")
-        }
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        onClicked: root.reject()
-    }
-
-    Button {
-        id: accept
-        objectName: "accept"
-
-        action: Action {
-            text: i18n.tr("Done")
-        }
-        anchors {
-            right: parent.right
-            rightMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        onClicked: root.accept()
-    }
-}

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-08-21 14:23:21 +0000
+++ NewEvent.qml	2014-08-22 11:41:15 +0000
@@ -15,13 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.0
+
+import QtQuick 2.2
 import QtOrganizer 5.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1
-import Ubuntu.Components.Themes.Ambiance 0.1
-import Ubuntu.Components.Pickers 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Themes.Ambiance 1.0
+import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0
 
 import "Defines.js" as Defines
@@ -51,6 +52,22 @@
         endTimeInput.text = Qt.formatDateTime(endDate, "hh:mm");
     }
 
+    head {
+        backAction: Action {
+            iconName: "close"
+            onTriggered: pageStack.pop();
+        }
+
+        actions: [
+            Action {
+                iconName: "ok"
+                objectName: "save"
+                text: i18n.tr("Save")
+                onTriggered: saveToQtPim();
+            }
+        ]
+    }
+
     Component.onCompleted: {
         //If current date is setted by an argument we don't have to change it.
         if(typeof(date) === 'undefined'){
@@ -370,7 +387,7 @@
         anchors.margins: units.gu(2)
 
         contentWidth: width
-        contentHeight: column.height + toolbar.height
+        contentHeight: column.height
 
         Column {
             id: column
@@ -717,24 +734,6 @@
         }
     }
 
-    EditToolbar {
-        id: toolbar
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: units.gu(6)
-        acceptAction: Action {
-            text: i18n.tr("Save")
-            onTriggered: saveToQtPim();
-        }
-        rejectAction: Action {
-            text: i18n.tr("Cancel")
-            onTriggered: pageStack.pop();
-        }
-    }
-
     // used to keep the field visible when the keyboard appear or dismiss
     KeyboardRectangle {
         id: keyboard

=== modified file 'tests/autopilot/calendar_app/emulators.py'
--- tests/autopilot/calendar_app/emulators.py	2014-08-18 18:36:35 +0000
+++ tests/autopilot/calendar_app/emulators.py	2014-08-22 11:41:15 +0000
@@ -530,8 +530,9 @@
     @autopilot.logging.log_action(logger.info)
     def _save(self):
         """Save the new event."""
-        save_button = self.select_single('Button', objectName='accept')
-        self.pointing_device.click_object(save_button)
+        root = self.get_root_instance()
+        header = root.select_single(MainView).get_header()
+        header.click_action_button('save')
 
 
 class NewEventEntryField(ubuntuuitoolkit.TextField):