Ubuntu Calendar App

Merge lp:~ahayzen/ubuntu-calendar-app/fix-1419676-sync-button into lp:ubuntu-calendar-app

  1. fix-1419676-sync-button
  2. Merge into trunk
Proposed by Andrew Hayzen
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 582
Merged at revision: 584
Proposed branch: lp:~ahayzen/ubuntu-calendar-app/fix-1419676-sync-button
Merge into: lp:ubuntu-calendar-app
Diff against target: 104 lines (+28/-5)
6 files modified
AgendaView.qml (+2/-1)
DayView.qml (+2/-1)
EventActions.qml (+18/-0)
MonthView.qml (+2/-1)
WeekView.qml (+2/-1)
YearView.qml (+2/-1)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-calendar-app/fix-1419676-sync-button
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Kunal Parmar Approve
Review via email: mp+250196@code.launchpad.net

Commit message

* Add sync header action to AgendaView.qml DayView.qml MonthView.qml WeekView.qml YearView.qml

Description of the change

* Add sync header action to AgendaView.qml DayView.qml MonthView.qml WeekView.qml YearView.qml

To post a comment you must log in.
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

code wise looks good to me, I am not able to test it now, I am approving the code.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:582
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1078/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1106/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/75

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:582
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1080/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1111
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/77

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AgendaView.qml'
2--- AgendaView.qml 2014-11-11 15:16:12 +0000
3+++ AgendaView.qml 2015-02-18 19:34:22 +0000
4@@ -59,7 +59,8 @@
5 calendarTodayAction,
6 commonHeaderActions.newEventAction,
7 commonHeaderActions.showCalendarAction,
8- commonHeaderActions.reloadAction
9+ commonHeaderActions.reloadAction,
10+ commonHeaderActions.syncCalendarAction
11 ]
12
13 EventListModel {
14
15=== modified file 'DayView.qml'
16--- DayView.qml 2014-11-29 05:15:13 +0000
17+++ DayView.qml 2015-02-18 19:34:22 +0000
18@@ -48,7 +48,8 @@
19 calendarTodayAction,
20 commonHeaderActions.newEventAction,
21 commonHeaderActions.showCalendarAction,
22- commonHeaderActions.reloadAction
23+ commonHeaderActions.reloadAction,
24+ commonHeaderActions.syncCalendarAction
25 ]
26
27 contents: Label {
28
29=== modified file 'EventActions.qml'
30--- EventActions.qml 2014-11-06 15:14:30 +0000
31+++ EventActions.qml 2015-02-18 19:34:22 +0000
32@@ -18,12 +18,30 @@
33
34 import QtQuick 2.3
35 import Ubuntu.Components 1.1
36+import Ubuntu.SyncMonitor 0.1
37
38 Item {
39 id: actionPool
40
41 property alias newEventAction: _newEventAction
42 property alias showCalendarAction: _showCalendarAction
43+ property alias syncCalendarAction: _syncCalendarAction
44+
45+ Action {
46+ id: _syncCalendarAction
47+ objectName: "syncbutton"
48+ iconName: "reload"
49+ // TRANSLATORS: Please translate this string to 15 characters only.
50+ // Currently ,there is no way we can increase width of action menu currently.
51+ text: enabled ? i18n.tr("Sync") : i18n.tr("Syncing")
52+ onTriggered: syncMonitor.sync(["calendar"])
53+ enabled: (syncMonitor.state !== "syncing")
54+ visible: syncMonitor.enabledServices ? syncMonitor.serviceIsEnabled("calendar") : false
55+ }
56+
57+ SyncMonitor {
58+ id: syncMonitor
59+ }
60
61 Action {
62 id: _newEventAction
63
64=== modified file 'MonthView.qml'
65--- MonthView.qml 2014-10-22 18:39:27 +0000
66+++ MonthView.qml 2015-02-18 19:34:22 +0000
67@@ -45,7 +45,8 @@
68 calendarTodayAction,
69 commonHeaderActions.newEventAction,
70 commonHeaderActions.showCalendarAction,
71- commonHeaderActions.reloadAction
72+ commonHeaderActions.reloadAction,
73+ commonHeaderActions.syncCalendarAction
74 ]
75
76 contents: Label {
77
78=== modified file 'WeekView.qml'
79--- WeekView.qml 2014-11-29 07:14:05 +0000
80+++ WeekView.qml 2015-02-18 19:34:22 +0000
81@@ -50,7 +50,8 @@
82 calendarTodayAction,
83 commonHeaderActions.newEventAction,
84 commonHeaderActions.showCalendarAction,
85- commonHeaderActions.reloadAction
86+ commonHeaderActions.reloadAction,
87+ commonHeaderActions.syncCalendarAction
88 ]
89
90 contents: Label {
91
92=== modified file 'YearView.qml'
93--- YearView.qml 2014-10-24 14:30:20 +0000
94+++ YearView.qml 2015-02-18 19:34:22 +0000
95@@ -44,7 +44,8 @@
96 calendarTodayAction,
97 commonHeaderActions.newEventAction,
98 commonHeaderActions.showCalendarAction,
99- commonHeaderActions.reloadAction
100+ commonHeaderActions.reloadAction,
101+ commonHeaderActions.syncCalendarAction
102 ]
103 contents: Label {
104 id:year

Subscribers

People subscribed via source and target branches

to status/vote changes: