Merge lp:~nik90/ubuntu-calendar-app/replace-x-icon into lp:ubuntu-calendar-app

[Nekhelesh Ramananthan]

Replaces the "X" icon in the NewEvent page with the standard "<" icon as requested by design for clock app.

This MP replaces the "X" icon in the NewEvent page with the standard "<" icon as requested by design for clock app. However this should also apply for the calendar app. hence proposing it here.

[lp:~nik90/ubuntu-calendar-app/replace-x-icon]

453. By Nekhelesh Ramananthan on 2014-09-16

Small code refactor

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

PASSED: Continuous integration, rev:453
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/803/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/341
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/361

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks tested and working as expected.

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-09-16 14:13:17 +0000
+++ NewEvent.qml	2014-09-16 17:14:22 +0000
@@ -53,21 +53,12 @@
         endTimeInput.text = Qt.formatTime(endDate);
     }
 
-    head {
-        backAction: Action {
-            iconName: "close"
-            onTriggered: pageStack.pop();
-        }
-
-        actions: [
-            Action {
-                iconName: "ok"
-                objectName: "save"
-                text: i18n.tr("Save")
-                enabled: !!titleEdit.text.trim()
-                onTriggered: saveToQtPim();
-            }
-        ]
+    head.actions: Action {
+        iconName: "ok"
+        objectName: "save"
+        text: i18n.tr("Save")
+        enabled: !!titleEdit.text.trim()
+        onTriggered: saveToQtPim();
     }
 
     Component.onCompleted: {