1
=== modified file 'AgendaView.qml'
2
--- AgendaView.qml	2014-06-17 22:24:41 +0000
3
+++ AgendaView.qml	2014-07-17 13:35:28 +0000
4
@@ -17,25 +17,10 @@
5
17
    }
17
    }
6
18
18
7
19
    EventListModel {
19
    EventListModel {
9
20
        id: eventModel
20
        id: eventListModel
10
21
        startPeriod: currentDay.midnight();
21
        startPeriod: currentDay.midnight();
11
22
        endPeriod: currentDay.addDays(30).endOfDay()
22
        endPeriod: currentDay.addDays(30).endOfDay()
28
23
        filter: UnionFilter{
23
        filter: eventModel.filter
13
24
            filters: [
14
25
                DetailFieldFilter{
15
26
                    detail: Detail.ItemType
16
27
                    field: Type.FieldType
17
28
                    value: Type.Event
18
29
                    matchFlags: Filter.MatchExactly
19
30
                },
20
31
                DetailFieldFilter{
21
32
                    detail: Detail.ItemType
22
33
                    field: Type.FieldType
23
34
                    value: Type.EventOccurrence
24
35
                    matchFlags: Filter.MatchExactly
25
36
                }
26
37
            ]
27
38
        }
29
39
24
30
40
        sortOrders: [
25
        sortOrders: [
31
41
            SortOrder{
26
            SortOrder{
32
@@ -49,22 +34,22 @@
33
49
34
34
50
    ActivityIndicator {
35
    ActivityIndicator {
35
51
        visible: running
36
        visible: running
37
52
        running: eventModel.isLoading
37
        running: eventListModel.isLoading
38
53
        anchors.centerIn: parent
38
        anchors.centerIn: parent
39
54
        z:2
39
        z:2
40
55
    }
40
    }
41
56
41
42
57
    Label{
42
    Label{
43
58
        text: i18n.tr("No upcoming events")
43
        text: i18n.tr("No upcoming events")
45
59
        visible: eventModel.itemCount == 0
44
        visible: eventModel.itemCount === 0
46
60
        anchors.centerIn: parent
45
        anchors.centerIn: parent
47
61
    }
46
    }
48
62
47
49
63
    ListView{
48
    ListView{
50
64
        id: eventList
49
        id: eventList
52
65
        model: eventModel
50
        model: eventListModel
53
66
        anchors.fill: parent
51
        anchors.fill: parent
55
67
        visible: eventModel.itemCount > 0
52
        visible: eventListModel.itemCount > 0
56
68
53
57
69
        delegate: listDelegate
54
        delegate: listDelegate
58
70
    }
55
    }
59
@@ -79,7 +64,7 @@
60
79
64
61
80
        Item {
65
        Item {
62
81
            id: root
66
            id: root
64
82
            property var event: eventModel.items[index];
67
            property var event: eventListModel.items[index];
65
83
68
66
84
            width: parent.width
69
            width: parent.width
67
85
            height: container.height
70
            height: container.height
68
@@ -97,7 +82,7 @@
69
97
                if( index == 0 ) {
82
                if( index == 0 ) {
70
98
                    headerContainer.visible = true;
83
                    headerContainer.visible = true;
71
99
                } else {
84
                } else {
73
100
                    var prevEvent = eventModel.items[index-1];
85
                    var prevEvent = eventListModel.items[index-1];
74
101
                    if( prevEvent.startDateTime.midnight() < event.startDateTime.midnight()) {
86
                    if( prevEvent.startDateTime.midnight() < event.startDateTime.midnight()) {
75
102
                        headerContainer.visible = true;
87
                        headerContainer.visible = true;
76
103
                    }
88
                    }
77
@@ -193,7 +178,7 @@
78
193
                    MouseArea{
178
                    MouseArea{
79
194
                        anchors.fill: parent
179
                        anchors.fill: parent
80
195
                        onClicked: {
180
                        onClicked: {
82
196
                            pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":eventModel});
181
                            pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":eventListModel});
83
197
                        }
182
                        }
84
198
                    }
183
                    }
85
199
                }
184
                }
86
200
185
87
=== added file 'CalendarChoicePopup.qml'
88
--- CalendarChoicePopup.qml	1970-01-01 00:00:00 +0000
89
+++ CalendarChoicePopup.qml	2014-07-17 13:35:28 +0000
90
@@ -0,0 +1,115 @@
91
1
import QtQuick 2.0
92
2
import Ubuntu.Components 0.1
93
3
import Ubuntu.Components.Popups 0.1
94
4
import Ubuntu.Components.ListItems 0.1
95
5
import QtOrganizer 5.0
96
6
97
7
Page {
98
8
    id: root
99
9
    title: i18n.tr("Calendars")
100
10
101
11
    property var model;
102
12
103
13
    signal collectionUpdated();
104
14
105
15
    ToolbarItems {
106
16
        id: pickerModeToolbar
107
17
108
18
        back: ToolbarButton {
109
19
            action: Action {
110
20
                text: i18n.tr("Back");
111
21
                iconName: "back"
112
22
                onTriggered: {
113
23
                    pageStack.pop();
114
24
                }
115
25
            }
116
26
        }
117
27
118
28
        ToolbarButton {
119
29
            action: Action {
120
30
                text: i18n.tr("Save");
121
31
                iconSource: Qt.resolvedUrl("save.svg");
122
32
                onTriggered: {
123
33
                    root.collectionUpdated();
124
34
                    pageStack.pop();
125
35
                }
126
36
            }
127
37
        }
128
38
    }
129
39
130
40
    tools: pickerModeToolbar
131
41
132
42
    ListView {
133
43
        id: calendarsList
134
44
135
45
        anchors {
136
46
            top: parent.top
137
47
            bottom: parent.bottom
138
48
            left: parent.left
139
49
            right: parent.right
140
50
            topMargin: units.gu(2)
141
51
            leftMargin: units.gu(2)
142
52
            rightMargin: units.gu(2)
143
53
        }
144
54
145
55
        model : root.model.getCollections();
146
56
        delegate: delegateComp
147
57
148
58
        Component{
149
59
            id: delegateComp
150
60
            Empty{
151
61
                Row{
152
62
                    width: parent.width
153
63
                    height:checkBox.height + units.gu(2)
154
64
                    spacing: units.gu(1)
155
65
156
66
                    UbuntuShape{
157
67
                        width: parent.height
158
68
                        height: parent.height - units.gu(2)
159
69
                        color: modelData.color
160
70
                        anchors.verticalCenter: parent.verticalCenter
161
71
                        MouseArea{
162
72
                            anchors.fill: parent
163
73
                            onClicked: {
164
74
                                //popup dialog
165
75
                                var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root);
166
76
                                dialog.accepted.connect(function(color) {
167
77
                                    var collection = root.model.collection(modelData.collectionId);
168
78
                                    collection.color = color;
169
79
                                    root.model.saveCollection(collection);
170
80
                                })
171
81
                            }
172
82
                        }
173
83
                    }
174
84
                    Label{
175
85
                        text: modelData.name
176
86
                        fontSize: "medium"
177
87
                        width: parent.width - (parent.height*2)
178
88
                        anchors.verticalCenter: parent.verticalCenter
179
89
180
90
                        MouseArea{
181
91
                            anchors.fill: parent
182
92
                            onClicked: {
183
93
                                checkBox.checked = !checkBox.checked
184
94
                                modelData.setExtendedMetaData("collection-selected",checkBox.checked)
185
95
                                var collection = root.model.collection(modelData.collectionId);
186
96
                                root.model.saveCollection(collection);
187
97
                            }
188
98
                        }
189
99
                    }
190
100
                    CheckBox {
191
101
                        id: checkBox
192
102
                        checked: modelData.extendedMetaData("collection-selected")
193
103
                        anchors.verticalCenter: parent.verticalCenter
194
104
                        visible:  !root.isInEditMode
195
105
                        onCheckedChanged: {
196
106
                            modelData.setExtendedMetaData("collection-selected",checkBox.checked)
197
107
                            var collection = root.model.collection(modelData.collectionId);
198
108
                            root.model.saveCollection(collection);
199
109
                        }
200
110
                    }
201
111
                }
202
112
            }
203
113
        }
204
114
    }
205
115
}
206
0
116
207
=== added file 'ColorPickerDialog.qml'
208
--- ColorPickerDialog.qml	1970-01-01 00:00:00 +0000
209
+++ ColorPickerDialog.qml	2014-07-17 13:35:28 +0000
210
@@ -0,0 +1,45 @@
211
1
import QtQuick 2.0
212
2
import Ubuntu.Components 0.1
213
3
import Ubuntu.Components.Popups 0.1
214
4
215
5
Dialog {
216
6
    id: root
217
7
    title: i18n.tr("Select Color")
218
8
    height: units.gu(100)
219
9
220
10
    signal accepted(var color)
221
11
    signal rejected()
222
12
223
13
    contents: [
224
14
        Grid{
225
15
            height: units.gu(25)
226
16
            rows: 3
227
17
            columns: 5
228
18
            Repeater{
229
19
                model: ["#2C001E","#333333","#DD4814","#DF382C","#EFB73E","#19B6EE","#38B44A","#001F5C"];
230
20
                delegate:UbuntuShape{
231
21
                    width: (parent.width/5)
232
22
                    height: width
233
23
                    color: modelData
234
24
235
25
                    MouseArea{
236
26
                        anchors.fill: parent
237
27
                        onClicked: {
238
28
                            root.accepted(modelData)
239
29
                            PopupUtils.close(root)
240
30
                        }
241
31
                    }
242
32
                }
243
33
            }
244
34
        },
245
35
        Button {
246
36
            objectName: "TimePickerCancelButton"
247
37
            text: i18n.tr("Cancel")
248
38
            onClicked: {
249
39
                root.rejected()
250
40
                PopupUtils.close(root)
251
41
            }
252
42
            width: (parent.width) / 2
253
43
        }
254
44
    ]
255
45
}
256
0
46
257
=== modified file 'DayView.qml'
258
--- DayView.qml	2014-07-02 17:37:22 +0000
259
+++ DayView.qml	2014-07-17 13:35:28 +0000
260
@@ -12,6 +12,7 @@
261
12
    property bool isCurrentPage: false
12
    property bool isCurrentPage: false
262
13
13
263
14
    Keys.forwardTo: [dayViewPath]
14
    Keys.forwardTo: [dayViewPath]
264
15
    flickable: null
265
15
16
266
16
    Column {
17
    Column {
267
17
        id: column
18
        id: column
268
18
19
269
=== modified file 'EventListModel.qml'
270
--- EventListModel.qml	2014-04-26 06:36:48 +0000
271
+++ EventListModel.qml	2014-07-17 13:35:28 +0000
272
@@ -33,6 +33,18 @@
273
33
        }
33
        }
274
34
    }
34
    }
275
35
35
276
36
    function getCollections(){
277
37
        var cals = [];
278
38
        var collections = eventModel.collections;
279
39
        for(var i = 0 ; i < collections.length ; ++i) {
280
40
            var cal = collections[i];
281
41
            if( cal.extendedMetaData("collection-type") === "Calendar" ) {
282
42
                cals.push(cal);
283
43
            }
284
44
        }
285
45
        return cals;
286
46
	}
287
47
288
36
    onStartPeriodChanged: {
48
    onStartPeriodChanged: {
289
37
        isLoading = true
49
        isLoading = true
290
38
    }
50
    }
291
39
51
292
=== modified file 'MonthComponent.qml'
293
--- MonthComponent.qml	2014-05-24 07:00:58 +0000
294
+++ MonthComponent.qml	2014-07-17 13:35:28 +0000
295
@@ -36,7 +36,7 @@
296
36
            id: mainModel
36
            id: mainModel
297
37
            startPeriod: intern.monthStart.midnight();
37
            startPeriod: intern.monthStart.midnight();
298
38
            endPeriod: intern.monthStart.addDays((monthGrid.weekCount*7)-1).endOfDay()
38
            endPeriod: intern.monthStart.addDays((monthGrid.weekCount*7)-1).endOfDay()
300
39
39
            filter: eventModel.filter
301
40
            onModelChanged: {
40
            onModelChanged: {
302
41
                intern.eventStatus = Qt.binding(function() { return mainModel.containsItems(startPeriod,endPeriod,24*60*60)});
41
                intern.eventStatus = Qt.binding(function() { return mainModel.containsItems(startPeriod,endPeriod,24*60*60)});
303
42
            }
42
            }
304
43
43
305
=== modified file 'NewEvent.qml'
306
--- NewEvent.qml	2014-07-17 13:27:55 +0000
307
+++ NewEvent.qml	2014-07-17 13:35:28 +0000
308
@@ -88,6 +88,10 @@
309
88
        if( e.description ) {
88
        if( e.description ) {
310
89
            messageEdit.text = e.description;
89
            messageEdit.text = e.description;
311
90
        }
90
        }
312
91
313
92
        allDayEventCheckbox.checked = e.allDay;
314
93
        var index = 0;
315
94
316
91
        if( e.itemType === Type.Event ) {
95
        if( e.itemType === Type.Event ) {
317
92
            if(e.attendees){
96
            if(e.attendees){
318
93
                for( var j = 0 ; j < e.attendees.length ; ++j ) {
97
                for( var j = 0 ; j < e.attendees.length ; ++j ) {
319
@@ -97,7 +101,7 @@
320
97
                }
101
                }
321
98
            }
102
            }
322
99
103
324
100
            var index = 0;
104
            index = 0;
325
101
            if(e.recurrence ) {
105
            if(e.recurrence ) {
326
102
                var recurrenceRule = e.recurrence.recurrenceRules;
106
                var recurrenceRule = e.recurrence.recurrenceRules;
327
103
                index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
107
                index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
328
@@ -141,6 +145,15 @@
329
141
            index = foundIndex != -1 ? foundIndex : 0;
145
            index = foundIndex != -1 ? foundIndex : 0;
330
142
        }
146
        }
331
143
        reminderOption.selectedIndex = index;
147
        reminderOption.selectedIndex = index;
332
148
333
149
        index = 0;
334
150
        for(var i=0; i < calendarsOption.model.length; ++i){
335
151
            if(calendarsOption.model[i].collectionId === e.collectionId){
336
152
                index = i;
337
153
                break;
338
154
            }
339
155
        }
340
156
        calendarsOption.selectedIndex = index
341
144
    }
157
    }
342
145
    function getWeekDaysIndex(daysOfWeek){
158
    function getWeekDaysIndex(daysOfWeek){
343
146
        var index = 0;
159
        var index = 0;
344
@@ -229,10 +242,15 @@
345
229
                audibleReminder.secondsBeforeStart = reminderTime;
242
                audibleReminder.secondsBeforeStart = reminderTime;
346
230
                event.setDetail(audibleReminder);
243
                event.setDetail(audibleReminder);
347
231
            }
244
            }
348
245
349
246
            event.collectionId = calendarsOption.model[calendarsOption.selectedIndex].collectionId;
350
247
351
232
            model.saveItem(event);
248
            model.saveItem(event);
352
249
353
233
            pageStack.pop();
250
            pageStack.pop();
354
234
        }
251
        }
355
235
    }
252
    }
356
253
357
236
    function getDaysOfWeek(){
254
    function getDaysOfWeek(){
358
237
        var daysOfWeek = [];
255
        var daysOfWeek = [];
359
238
        switch(recurrenceOption.selectedIndex){
256
        switch(recurrenceOption.selectedIndex){
360
@@ -434,6 +452,37 @@
361
434
                }
452
                }
362
435
            }
453
            }
363
436
454
364
455
            Item{
365
456
                width: parent.width
366
457
                height: calendarsOption.height
367
458
                Label{
368
459
                    id: calendarLabel
369
460
                    text: i18n.tr("Calendar ");
370
461
                    anchors.verticalCenter: parent.verticalCenter
371
462
                }
372
463
373
464
                OptionSelector{
374
465
                    id: calendarsOption
375
466
                    anchors.right: parent.right
376
467
                    width: parent.width - calendarLabel.width - units.gu(1)
377
468
                    containerHeight: itemHeight * 4
378
469
                    model: root.model.getCollections();
379
470
                    delegate: OptionSelectorDelegate{
380
471
                        text: modelData.name
381
472
382
473
                        UbuntuShape{
383
474
                            id: calColor
384
475
                            width: height
385
476
                            height: parent.height - units.gu(2)
386
477
                            color: modelData.color
387
478
                            anchors.right: parent.right
388
479
                            anchors.rightMargin: units.gu(1)
389
480
                            anchors.verticalCenter: parent.verticalCenter
390
481
                        }
391
482
                    }
392
483
                }
393
484
            }
394
485
395
437
            Row {
486
            Row {
396
438
                width: parent.width
487
                width: parent.width
397
439
                spacing: units.gu(1)
488
                spacing: units.gu(1)
398
440
489
399
=== modified file 'TimeLineBase.qml'
400
--- TimeLineBase.qml	2014-06-25 00:37:43 +0000
401
+++ TimeLineBase.qml	2014-07-17 13:35:28 +0000
402
@@ -8,7 +8,6 @@
403
8
    property var delegate;
8
    property var delegate;
404
9
    property var day;
9
    property var day;
405
10
    property int hourHeight: units.gu(10)
10
    property int hourHeight: units.gu(10)
406
11
407
12
    property var model;
11
    property var model;
408
13
12
409
14
    MouseArea {
13
    MouseArea {
410
@@ -67,6 +66,8 @@
411
67
            return;
66
            return;
412
68
        }
67
        }
413
69
68
414
69
        destroyAllChildren();
415
70
416
70
        var eventMap = {};
71
        var eventMap = {};
417
71
        var allSchs = [];
72
        var allSchs = [];
418
72
73
419
@@ -100,6 +101,7 @@
420
100
            }
101
            }
421
101
            children[i].visible = false;
102
            children[i].visible = false;
422
102
            if( children[i].objectName !== "separator") {
103
            if( children[i].objectName !== "separator") {
423
104
                children[i].clicked.disconnect( bubbleOverLay.showEventDetails );
424
103
                intern.unUsedEvents.push(children[i])
105
                intern.unUsedEvents.push(children[i])
425
104
            }
106
            }
426
105
        }
107
        }
427
@@ -127,7 +129,6 @@
428
127
        eventBubble.x = x;
129
        eventBubble.x = x;
429
128
        eventBubble.width = width;
130
        eventBubble.width = width;
430
129
        eventBubble.event = event
131
        eventBubble.event = event
431
130
432
131
        eventBubble.visible = true;
132
        eventBubble.visible = true;
433
132
        eventBubble.clicked.connect( bubbleOverLay.showEventDetails );
133
        eventBubble.clicked.connect( bubbleOverLay.showEventDetails );
434
133
    }
134
    }
435
134
135
436
=== modified file 'TimeLineBaseComponent.qml'
437
--- TimeLineBaseComponent.qml	2014-06-21 03:37:43 +0000
438
+++ TimeLineBaseComponent.qml	2014-07-17 13:35:28 +0000
439
@@ -60,6 +60,7 @@
440
60
        id: mainModel
60
        id: mainModel
441
61
        startPeriod: startDay.midnight();
61
        startPeriod: startDay.midnight();
442
62
        endPeriod: type == ViewType.ViewTypeWeek ? startPeriod.addDays(7).endOfDay(): startPeriod.endOfDay()
62
        endPeriod: type == ViewType.ViewTypeWeek ? startPeriod.addDays(7).endOfDay(): startPeriod.endOfDay()
443
63
        filter: eventModel.filter
444
63
    }
64
    }
445
64
65
446
65
    ActivityIndicator {
66
    ActivityIndicator {
447
66
67
448
=== modified file 'WeekView.qml'
449
--- WeekView.qml	2014-07-01 20:26:51 +0000
450
+++ WeekView.qml	2014-07-17 13:35:28 +0000
451
@@ -16,6 +16,8 @@
452
16
16
453
17
    Keys.forwardTo: [weekViewPath]
17
    Keys.forwardTo: [weekViewPath]
454
18
18
455
19
    flickable: null
456
20
457
19
    Column {
21
    Column {
458
20
        anchors.fill: parent
22
        anchors.fill: parent
459
21
        anchors.top: parent.top
23
        anchors.top: parent.top
460
22
24
461
=== modified file 'calendar.qml'
462
--- calendar.qml	2014-06-10 13:53:23 +0000
463
+++ calendar.qml	2014-07-17 13:35:28 +0000
464
@@ -1,13 +1,20 @@
465
1
import QtQuick 2.0
1
import QtQuick 2.0
466
2
import Ubuntu.Components 0.1
2
import Ubuntu.Components 0.1
467
3
import Ubuntu.Components.Popups 0.1
3
import Ubuntu.Components.Popups 0.1
468
4
import QtOrganizer 5.0
469
4
import Ubuntu.SyncMonitor 0.1
5
import Ubuntu.SyncMonitor 0.1
470
6
471
5
import "dateExt.js" as DateExt
7
import "dateExt.js" as DateExt
472
6
8
473
7
MainView {
9
MainView {
474
8
    id: mainView
10
    id: mainView
475
9
    useDeprecatedToolbar: false
11
    useDeprecatedToolbar: false
476
10
12
477
13
    // Work-around until this branch lands:
478
14
    // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496 
479
15
    //property bool windowActive: typeof window != 'undefined'
480
16
    //onWindowActiveChanged: window.title = i18n.tr("Calendar")
481
17
482
11
    // Argument during startup
18
    // Argument during startup
483
12
    Arguments {
19
    Arguments {
484
13
        id: args;
20
        id: args;
485
@@ -90,13 +97,66 @@
486
90
            }
97
            }
487
91
        }
98
        }
488
92
99
489
100
        Timer {
490
101
            id: applyFilterTimer
491
102
            interval: 200; running: false; repeat: false
492
103
            onTriggered: {
493
104
                eventModel.applyFilterFinal();
494
105
            }
495
106
        }
496
107
497
108
        DetailFieldFilter{
498
109
            id: eventFilter
499
110
            detail: Detail.ItemType;
500
111
            field: Type.FieldType
501
112
            value: Type.Event
502
113
            matchFlags: Filter.MatchExactly
503
114
        }
504
115
505
116
        DetailFieldFilter{
506
117
            id: eventOccurenceFilter
507
118
            detail: Detail.ItemType;
508
119
            field: Type.FieldType
509
120
            value: Type.EventOccurrence
510
121
            matchFlags: Filter.MatchExactly
511
122
        }
512
123
513
124
        CollectionFilter{
514
125
            id: collectionFilter
515
126
        }
516
127
517
93
        EventListModel{
128
        EventListModel{
518
94
            id: eventModel
129
            id: eventModel
522
95
            //This model is just for newevent
130
523
96
            //so we dont need any update
131
            autoUpdate: true
524
97
            autoUpdate: false
132
            startPeriod: tabs.currentDay
525
133
            endPeriod: tabs.currentDay
526
134
527
135
            //FIXME: seems like union filter is not working when we use DetailFieldFilter and CollectionFilter
528
136
            //Currently only using collectionFilter
529
137
            filter: UnionFilter {
530
138
                filters: [ collectionFilter /*,eventFilter ,eventOccurenceFilter*/ ]
531
139
            }
532
140
533
141
            function delayedApplyFilter() {
534
142
                applyFilterTimer.restart();
535
143
            }
536
144
537
145
            function applyFilterFinal() {
538
146
                var collectionIds = [];
539
147
                var collections = eventModel.getCollections();
540
148
                for(var i=0; i < collections.length ; ++i) {
541
149
                    var collection = collections[i]
542
150
                    if(collection.extendedMetaData("collection-selected") === true) {
543
151
                        collectionIds.push(collection.collectionId);
544
152
                    }
545
153
                }
546
154
                collectionFilter.ids = collectionIds;
547
155
            }
548
98
156
549
99
            Component.onCompleted: {
157
            Component.onCompleted: {
550
158
                delayedApplyFilter();
551
159
552
100
                if (args.values.eventid) {
160
                if (args.values.eventid) {
553
101
                    var requestId = "";
161
                    var requestId = "";
554
102
                    eventModel.onItemsFetched.connect( function(id,fetchedItems) {
162
                    eventModel.onItemsFetched.connect( function(id,fetchedItems) {
555
@@ -247,6 +307,16 @@
556
247
                        }
307
                        }
557
248
                    }
308
                    }
558
249
                }
309
                }
559
310
                ToolbarButton{
560
311
                    action:Action{
561
312
                        iconName: "new-event"
562
313
                        text: i18n.tr("Calendars");
563
314
                        onTriggered: {
564
315
                            pageStack.push(Qt.resolvedUrl("CalendarChoicePopup.qml"),{"model":eventModel});
565
316
                            pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);
566
317
                        }
567
318
                    }
568
319
                }
569
250
                ToolbarButton {
320
                ToolbarButton {
570
251
                    objectName: "syncbutton"
321
                    objectName: "syncbutton"
571
252
                    visible: syncMonitor.enabledServices ? syncMonitor.serviceIsEnabled("calendar") : false
322
                    visible: syncMonitor.enabledServices ? syncMonitor.serviceIsEnabled("calendar") : false
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-07-17
David Planella			Needs Information on 2014-04-29
Renato Araujo Oliveira Filho (community)		2014-03-29	Approve on 2014-04-17
Review via email: mp+213355@code.launchpad.net