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
=== modified file 'AgendaView.qml'
--- AgendaView.qml 2014-11-11 15:16:12 +0000
+++ AgendaView.qml 2015-02-18 19:34:22 +0000
@@ -59,7 +59,8 @@
59 calendarTodayAction,59 calendarTodayAction,
60 commonHeaderActions.newEventAction,60 commonHeaderActions.newEventAction,
61 commonHeaderActions.showCalendarAction,61 commonHeaderActions.showCalendarAction,
62 commonHeaderActions.reloadAction62 commonHeaderActions.reloadAction,
63 commonHeaderActions.syncCalendarAction
63 ]64 ]
6465
65 EventListModel {66 EventListModel {
6667
=== modified file 'DayView.qml'
--- DayView.qml 2014-11-29 05:15:13 +0000
+++ DayView.qml 2015-02-18 19:34:22 +0000
@@ -48,7 +48,8 @@
48 calendarTodayAction,48 calendarTodayAction,
49 commonHeaderActions.newEventAction,49 commonHeaderActions.newEventAction,
50 commonHeaderActions.showCalendarAction,50 commonHeaderActions.showCalendarAction,
51 commonHeaderActions.reloadAction51 commonHeaderActions.reloadAction,
52 commonHeaderActions.syncCalendarAction
52 ]53 ]
5354
54 contents: Label {55 contents: Label {
5556
=== modified file 'EventActions.qml'
--- EventActions.qml 2014-11-06 15:14:30 +0000
+++ EventActions.qml 2015-02-18 19:34:22 +0000
@@ -18,12 +18,30 @@
1818
19import QtQuick 2.319import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import Ubuntu.SyncMonitor 0.1
2122
22Item {23Item {
23 id: actionPool24 id: actionPool
2425
25 property alias newEventAction: _newEventAction26 property alias newEventAction: _newEventAction
26 property alias showCalendarAction: _showCalendarAction27 property alias showCalendarAction: _showCalendarAction
28 property alias syncCalendarAction: _syncCalendarAction
29
30 Action {
31 id: _syncCalendarAction
32 objectName: "syncbutton"
33 iconName: "reload"
34 // TRANSLATORS: Please translate this string to 15 characters only.
35 // Currently ,there is no way we can increase width of action menu currently.
36 text: enabled ? i18n.tr("Sync") : i18n.tr("Syncing")
37 onTriggered: syncMonitor.sync(["calendar"])
38 enabled: (syncMonitor.state !== "syncing")
39 visible: syncMonitor.enabledServices ? syncMonitor.serviceIsEnabled("calendar") : false
40 }
41
42 SyncMonitor {
43 id: syncMonitor
44 }
2745
28 Action {46 Action {
29 id: _newEventAction47 id: _newEventAction
3048
=== modified file 'MonthView.qml'
--- MonthView.qml 2014-10-22 18:39:27 +0000
+++ MonthView.qml 2015-02-18 19:34:22 +0000
@@ -45,7 +45,8 @@
45 calendarTodayAction,45 calendarTodayAction,
46 commonHeaderActions.newEventAction,46 commonHeaderActions.newEventAction,
47 commonHeaderActions.showCalendarAction,47 commonHeaderActions.showCalendarAction,
48 commonHeaderActions.reloadAction48 commonHeaderActions.reloadAction,
49 commonHeaderActions.syncCalendarAction
49 ]50 ]
5051
51 contents: Label {52 contents: Label {
5253
=== modified file 'WeekView.qml'
--- WeekView.qml 2014-11-29 07:14:05 +0000
+++ WeekView.qml 2015-02-18 19:34:22 +0000
@@ -50,7 +50,8 @@
50 calendarTodayAction,50 calendarTodayAction,
51 commonHeaderActions.newEventAction,51 commonHeaderActions.newEventAction,
52 commonHeaderActions.showCalendarAction,52 commonHeaderActions.showCalendarAction,
53 commonHeaderActions.reloadAction53 commonHeaderActions.reloadAction,
54 commonHeaderActions.syncCalendarAction
54 ]55 ]
5556
56 contents: Label {57 contents: Label {
5758
=== modified file 'YearView.qml'
--- YearView.qml 2014-10-24 14:30:20 +0000
+++ YearView.qml 2015-02-18 19:34:22 +0000
@@ -44,7 +44,8 @@
44 calendarTodayAction,44 calendarTodayAction,
45 commonHeaderActions.newEventAction,45 commonHeaderActions.newEventAction,
46 commonHeaderActions.showCalendarAction,46 commonHeaderActions.showCalendarAction,
47 commonHeaderActions.reloadAction47 commonHeaderActions.reloadAction,
48 commonHeaderActions.syncCalendarAction
48 ]49 ]
49 contents: Label {50 contents: Label {
50 id:year51 id:year

Subscribers

People subscribed via source and target branches

to status/vote changes: