Ubuntu Calendar App

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

  1. eventdetails
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: David Planella
Approved revision: 97
Merged at revision: 97
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/eventdetails
Merge into: lp:ubuntu-calendar-app
Diff against target: 43 lines (+18/-15)
1 file modified
EventDetails.qml (+18/-15)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/eventdetails
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+183354@code.launchpad.net

Commit message

event details changed to use new toolbar api

Description of the change

event details changed to use new toolbar api

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventDetails.qml'
2--- EventDetails.qml 2013-07-09 14:39:07 +0000
3+++ EventDetails.qml 2013-09-01 12:43:39 +0000
4@@ -64,21 +64,24 @@
5 mapImage.source=imageSrc;
6 }
7
8- tools: ToolbarActions {
9- Action {
10- text: i18n.tr("Add invite");
11- onTriggered: {
12- print(text + " not implemented");
13- }
14- }
15- Action {
16- text: i18n.tr("Edit");
17- onTriggered: {
18- print(text + " not implemented");
19- }
20- }
21- active: true
22- lock: false
23+ tools: ToolbarItems {
24+ ToolbarButton {
25+ action: Action {
26+ text: i18n.tr("Add invite");
27+ onTriggered: {
28+ print(text + " not implemented");
29+ }
30+ }
31+ }
32+
33+ ToolbarButton {
34+ action:Action {
35+ text: i18n.tr("Edit");
36+ onTriggered: {
37+ print(text + " not implemented");
38+ }
39+ }
40+ }
41 }
42
43 Column{

Subscribers

People subscribed via source and target branches

to status/vote changes: