Merge lp:~pkunal-parmar/ubuntu-calendar-app/eventdetails into lp:ubuntu-calendar-app

[Kunal Parmar]

event details changed to use new toolbar api

event details changed to use new toolbar api

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

PASSED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/30/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/30
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/30

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks!

review: Approve

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2013-07-09 14:39:07 +0000
+++ EventDetails.qml	2013-09-01 12:43:39 +0000
@@ -64,21 +64,24 @@
         mapImage.source=imageSrc;
     }
 
-    tools: ToolbarActions {
-        Action {
-            text: i18n.tr("Add invite");
-            onTriggered: {
-                print(text + " not implemented");
-            }
-        }
-        Action {
-            text: i18n.tr("Edit");
-            onTriggered: {
-                print(text + " not implemented");
-            }
-        }
-        active: true
-        lock: false
+    tools: ToolbarItems {
+        ToolbarButton {
+            action: Action {
+                text: i18n.tr("Add invite");
+                onTriggered: {
+                    print(text + " not implemented");
+                }
+            }
+        }
+
+        ToolbarButton {
+            action:Action {
+                text: i18n.tr("Edit");
+                onTriggered: {
+                    print(text + " not implemented");
+                }
+            }
+        }
     }
 
     Column{