Merge lp:~dpniel/ubuntu-calendar-app/uitk-1.3 into lp:ubuntu-calendar-app

Proposed by Dan Chapman ξƒΏ on 2016-01-22
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-01-29
Proposed branch: lp:~dpniel/ubuntu-calendar-app/uitk-1.3
Merge into: lp:ubuntu-calendar-app
Diff against target: 1583 lines (+372/-337)
49 files modified
AgendaView.qml (+2/-2)
AllDayEventComponent.qml (+2/-2)
CalendarChoicePopup.qml (+56/-60)
CalendarListButtonDelegate.qml (+28/-30)
ColorPickerDialog.qml (+3/-3)
ContactChoicePopup.qml (+2/-2)
DayHeaderBackground.qml (+1/-1)
DayView.qml (+2/-2)
DeleteConfirmationDialog.qml (+2/-2)
EditEventConfirmationDialog.qml (+2/-2)
EventActions.qml (+2/-2)
EventBubble.qml (+2/-2)
EventDetails.qml (+41/-23)
EventListModel.qml (+2/-2)
EventReminder.qml (+2/-2)
EventRepetition.qml (+8/-9)
EventUtils.qml (+2/-2)
HeaderDateComponent.qml (+2/-2)
KeyboardRectangle.qml (+1/-1)
LimitLabelModel.qml (+1/-1)
MonthComponent.qml (+2/-2)
MonthComponentDateDelegate.qml (+1/-1)
MonthView.qml (+2/-2)
NewEvent.qml (+80/-68)
NewEventEntryField.qml (+2/-2)
NewEventTimePicker.qml (+2/-2)
OnlineAccountsHelper.qml (+1/-1)
PathViewBase.qml (+1/-1)
RecurrenceLabelDefines.qml (+2/-2)
RemindersModel.qml (+1/-1)
ScrollAnimation.qml (+1/-1)
Scroller.qml (+2/-2)
SectionHeader.qml (+23/-0)
Settings.qml (+20/-31)
TimeLineBackground.qml (+2/-2)
TimeLineBase.qml (+2/-2)
TimeLineBaseComponent.qml (+10/-9)
TimeLineHeader.qml (+1/-1)
TimeLineHeaderComponent.qml (+2/-2)
TimeLineTimeScale.qml (+1/-1)
TimeSeparator.qml (+1/-1)
ViewHeader.qml (+2/-2)
WeekView.qml (+2/-2)
YearView.qml (+2/-3)
YearViewDelegate.qml (+2/-2)
calendar.qml (+4/-4)
calendarTests.qml (+2/-2)
click/manifest.json.in (+1/-1)
po/com.ubuntu.calendar.pot (+35/-35)
To merge this branch: bzr merge lp:~dpniel/ubuntu-calendar-app/uitk-1.3
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ 2016-01-22 Needs Fixing on 2016-01-23
Jenkins Bot continuous-integration Needs Fixing on 2016-01-22
Review via email: mp+283591@code.launchpad.net

Commit message

Update to UITK 1.3

Description of the change

Update Calendar to Ubuntu.Components 1.3

All imports have been changed to reflect newer uitk,
also switched all ListItems to use the new ListItem & ListItemLayouts

Not sure if the autopilot tests are working or not. I can't seem to get the environment setup correctly on xenial :-/

To post a comment you must log in.

FAILED: Continuous integration, rev:745
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dpniel/ubuntu-calendar-app/uitk-1.3/+merge/283591/+edit-commit-message

https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/161/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/442/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/161/rebuild

review: Needs Fixing (continuous-integration)

Build a click of this merge and installed on my device and it refuses to launch at all, which is odd.

review: Needs Fixing

Also, this duplicates https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/Uitk1_3/+merge/276338, but this one appears to make further changes?

Dan Chapman ξƒΏ (dpniel) wrote :

Ooops sorry guys... I totally missed kunal's branch when I scanned the current branch list.

The further changes in this branch are from upgrading the listitems to the 1.3 ListItem & ListItemLayout and lose the old Ubuntu.Components.ListItems. I see kunal has made some other changes I didn't, so really we need to get them merged together. I'll rebase this and propose a merge against kunal's that updates the ListItems.

Not sure why the click wouldn't launch :-/ Was there anything in the log?

Unmerged revisions

745. By Dan Chapman ξƒΏ on 2016-01-22

Update Calendar to Ubuntu.Components 1.3

All imports have been changed to reflect newer uitk,
also switched all ListItems to use the new ListItem & ListItemLayouts

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 2015-07-11 02:18:03 +0000
3+++ AgendaView.qml 2016-01-22 10:25:36 +0000
4@@ -16,9 +16,9 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.3
9+import QtQuick 2.4
10 import QtOrganizer 5.0
11-import Ubuntu.Components 1.1
12+import Ubuntu.Components 1.3
13 import Ubuntu.Components.ListItems 1.0 as ListItem
14 import "dateExt.js" as DateExt
15
16
17=== modified file 'AllDayEventComponent.qml'
18--- AllDayEventComponent.qml 2015-08-07 06:20:23 +0000
19+++ AllDayEventComponent.qml 2016-01-22 10:25:36 +0000
20@@ -15,8 +15,8 @@
21 * You should have received a copy of the GNU General Public License
22 * along with this program. If not, see <http://www.gnu.org/licenses/>.
23 */
24-import QtQuick 2.3
25-import Ubuntu.Components 1.1
26+import QtQuick 2.4
27+import Ubuntu.Components 1.3
28 import Ubuntu.Components.Popups 1.0
29 import QtOrganizer 5.0
30
31
32=== modified file 'CalendarChoicePopup.qml'
33--- CalendarChoicePopup.qml 2015-05-28 13:56:12 +0000
34+++ CalendarChoicePopup.qml 2016-01-22 10:25:36 +0000
35@@ -15,10 +15,9 @@
36 * You should have received a copy of the GNU General Public License
37 * along with this program. If not, see <http://www.gnu.org/licenses/>.
38 */
39-import QtQuick 2.3
40-import Ubuntu.Components 1.1
41-import Ubuntu.Components.Popups 1.0
42-import Ubuntu.Components.ListItems 1.0 as ListItem
43+import QtQuick 2.4
44+import Ubuntu.Components 1.3
45+import Ubuntu.Components.Popups 1.1
46 import QtOrganizer 5.0
47 import Ubuntu.SyncMonitor 0.1
48
49@@ -74,72 +73,69 @@
50 }
51
52 model : root.model.getCollections();
53- delegate: ListItem.Standard {
54+ delegate: ListItem {
55 id: delegateComp
56 objectName: "calendarItem"
57-
58- Rectangle {
59- id: calendarColorCode
60- objectName: "calendarColorCode"
61-
62- width: parent.height - units.gu(2)
63- height: width
64-
65- anchors {
66- left: parent.left
67- leftMargin: units.gu(2)
68- verticalCenter: parent.verticalCenter
69- }
70-
71- color: modelData.color
72- opacity: checkBox.checked ? 1.0 : 0.8
73-
74- MouseArea{
75- anchors.fill: parent
76- onClicked: {
77- //popup dialog
78- var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root);
79- dialog.accepted.connect(function(color) {
80- var collection = root.model.collection(modelData.collectionId);
81- collection.color = color;
82- root.model.saveCollection(collection);
83- })
84- }
85- }
86- }
87-
88- Label{
89- objectName: "calendarName"
90- text: modelData.name
91- elide: Text.ElideRight
92- opacity: checkBox.checked ? 1.0 : 0.8
93- color: UbuntuColors.midAubergine
94- width: parent.width - calendarColorCode.width - checkBox.width - units.gu(6) /*margins*/
95- anchors {
96- left: calendarColorCode.right
97- margins: units.gu(2)
98- verticalCenter: parent.verticalCenter
99- }
100- }
101-
102- control: CheckBox {
103- id: checkBox
104- objectName: "checkBox"
105- checked: modelData.extendedMetaData("collection-selected")
106- enabled: !root.isInEditMode
107- onCheckedChanged: {
108- modelData.setExtendedMetaData("collection-selected",checkBox.checked)
109+ height: layout.implicitHeight
110+
111+ ListItemLayout {
112+ id: layout
113+ title.text: modelData.name
114+ title.wrapMode: Text.WrapAnywhere
115+ title.color: UbuntuColors.midAubergine
116+
117+ UbuntuShape {
118+ id: calendarColorCode
119+ objectName: "calendarColorCode"
120+ height: units.gu(3)
121+ width: height
122+ aspect: UbuntuShape.Flat
123+ radius: "small"
124+ backgroundColor: modelData.color
125+ opacity: checkBox.checked ? 1.0 : 0.8
126+
127+ SlotsLayout.position: SlotsLayout.Leading
128+
129+ MouseArea{
130+ anchors.fill: parent
131+ onClicked: {
132+ //popup dialog
133+ var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root);
134+ dialog.accepted.connect(function(color) {
135+ var collection = root.model.collection(modelData.collectionId);
136+ collection.color = color;
137+ root.model.saveCollection(collection);
138+ })
139+ }
140+ }
141+ }
142+
143+ CheckBox {
144+ id: checkBox
145+ objectName: "checkBox"
146+ checked: modelData.extendedMetaData("collection-selected")
147+ enabled: !root.isInEditMode
148+ onCheckedChanged: {
149+ modelData.setExtendedMetaData("collection-selected",checkBox.checked)
150+ var collection = root.model.collection(modelData.collectionId);
151+ root.model.saveCollection(collection);
152+ }
153+ }
154+ }
155+ onClicked: {
156+ //popup dialog
157+ var dialog = PopupUtils.open(Qt.resolvedUrl("ColorPickerDialog.qml"),root);
158+ dialog.accepted.connect(function(color) {
159 var collection = root.model.collection(modelData.collectionId);
160+ collection.color = color;
161 root.model.saveCollection(collection);
162- }
163+ })
164 }
165-
166 }
167 }
168
169 Loader {
170 id: onlineAccountHelper
171-
172 // if running on test mode does not load online account modules
173 property string sourceFile: Qt.resolvedUrl("OnlineAccountsHelper.qml")
174
175
176=== modified file 'CalendarListButtonDelegate.qml'
177--- CalendarListButtonDelegate.qml 2015-05-28 13:58:30 +0000
178+++ CalendarListButtonDelegate.qml 2016-01-22 10:25:36 +0000
179@@ -14,38 +14,36 @@
180 * along with this program. If not, see <http://www.gnu.org/licenses/>.
181 */
182
183-import QtQuick 2.0
184-import Ubuntu.Components 1.1
185-import Ubuntu.Components.ListItems 1.0 as ListItem
186+import QtQuick 2.4
187+import Ubuntu.Components 1.3
188
189-ListItem.Standard {
190+ListItem {
191 id: root
192
193- property alias iconSource: uShape.source
194- property alias labelText: name.text
195-
196- Image {
197- id: uShape
198-
199- width: parent.height - units.gu(2)
200- height: width
201-
202- anchors {
203- left: parent.left
204- leftMargin: units.gu(2)
205- verticalCenter: parent.verticalCenter
206- }
207- }
208-
209- Label {
210- id: name
211-
212- anchors {
213- left: uShape.right
214- margins: units.gu(2)
215- verticalCenter: parent.verticalCenter
216- }
217- color: UbuntuColors.midAubergine
218- elide: Text.ElideRight
219+ property alias iconSource: inner_image.source
220+ property string labelText: ""
221+
222+ height: layout.implicitHeight
223+
224+ ListItemLayout {
225+ id: layout
226+ title.text: labelText
227+ title.wrapMode: Text.NoWrap
228+ title.color: UbuntuColors.midAubergine
229+
230+ UbuntuShape {
231+ aspect: UbuntuShape.Flat
232+ width: units.gu(5)
233+ height: width
234+ source: Image {
235+ id: inner_image
236+ anchors.fill: parent
237+ smooth: true
238+ visible: false
239+ asynchronous: true
240+ }
241+
242+ SlotsLayout.position: SlotsLayout.Leading
243+ }
244 }
245 }
246
247=== modified file 'ColorPickerDialog.qml'
248--- ColorPickerDialog.qml 2015-04-14 19:52:04 +0000
249+++ ColorPickerDialog.qml 2016-01-22 10:25:36 +0000
250@@ -15,9 +15,9 @@
251 * You should have received a copy of the GNU General Public License
252 * along with this program. If not, see <http://www.gnu.org/licenses/>.
253 */
254-import QtQuick 2.3
255-import Ubuntu.Components 1.1
256-import Ubuntu.Components.Popups 1.0
257+import QtQuick 2.4
258+import Ubuntu.Components 1.3
259+import Ubuntu.Components.Popups 1.1
260
261 Dialog {
262 id: root
263
264=== modified file 'ContactChoicePopup.qml'
265--- ContactChoicePopup.qml 2015-05-14 03:36:22 +0000
266+++ ContactChoicePopup.qml 2016-01-22 10:25:36 +0000
267@@ -15,8 +15,8 @@
268 * You should have received a copy of the GNU General Public License
269 * along with this program. If not, see <http://www.gnu.org/licenses/>.
270 */
271-import QtQuick 2.3
272-import Ubuntu.Components 1.1
273+import QtQuick 2.4
274+import Ubuntu.Components 1.3
275 import Ubuntu.Components.Popups 1.0
276 import Ubuntu.Components.ListItems 1.0
277 import Ubuntu.Components.Themes.Ambiance 1.0
278
279=== modified file 'DayHeaderBackground.qml'
280--- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000
281+++ DayHeaderBackground.qml 2016-01-22 10:25:36 +0000
282@@ -15,7 +15,7 @@
283 * You should have received a copy of the GNU General Public License
284 * along with this program. If not, see <http://www.gnu.org/licenses/>.
285 */
286-import QtQuick 2.3
287+import QtQuick 2.4
288
289 Item {
290 width: parent.width
291
292=== modified file 'DayView.qml'
293--- DayView.qml 2015-11-23 07:15:20 +0000
294+++ DayView.qml 2016-01-22 10:25:36 +0000
295@@ -16,8 +16,8 @@
296 * along with this program. If not, see <http://www.gnu.org/licenses/>.
297 */
298
299-import QtQuick 2.3
300-import Ubuntu.Components 1.1
301+import QtQuick 2.4
302+import Ubuntu.Components 1.3
303 import "dateExt.js" as DateExt
304 import "ViewType.js" as ViewType
305
306
307=== modified file 'DeleteConfirmationDialog.qml'
308--- DeleteConfirmationDialog.qml 2014-10-14 17:20:13 +0000
309+++ DeleteConfirmationDialog.qml 2016-01-22 10:25:36 +0000
310@@ -15,8 +15,8 @@
311 * You should have received a copy of the GNU General Public License
312 * along with this program. If not, see <http://www.gnu.org/licenses/>.
313 */
314-import QtQuick 2.3
315-import Ubuntu.Components 1.1
316+import QtQuick 2.4
317+import Ubuntu.Components 1.3
318 import Ubuntu.Components.Popups 1.0
319
320 Dialog {
321
322=== modified file 'EditEventConfirmationDialog.qml'
323--- EditEventConfirmationDialog.qml 2014-10-14 17:20:13 +0000
324+++ EditEventConfirmationDialog.qml 2016-01-22 10:25:36 +0000
325@@ -15,8 +15,8 @@
326 * You should have received a copy of the GNU General Public License
327 * along with this program. If not, see <http://www.gnu.org/licenses/>.
328 */
329-import QtQuick 2.3
330-import Ubuntu.Components 1.1
331+import QtQuick 2.4
332+import Ubuntu.Components 1.3
333 import Ubuntu.Components.Popups 1.0
334
335 Dialog {
336
337=== modified file 'EventActions.qml'
338--- EventActions.qml 2015-07-11 02:18:03 +0000
339+++ EventActions.qml 2016-01-22 10:25:36 +0000
340@@ -16,8 +16,8 @@
341 * along with this program. If not, see <http://www.gnu.org/licenses/>.
342 */
343
344-import QtQuick 2.3
345-import Ubuntu.Components 1.1
346+import QtQuick 2.4
347+import Ubuntu.Components 1.3
348 import Ubuntu.SyncMonitor 0.1
349
350 Item {
351
352=== modified file 'EventBubble.qml'
353--- EventBubble.qml 2015-11-29 03:17:30 +0000
354+++ EventBubble.qml 2016-01-22 10:25:36 +0000
355@@ -16,8 +16,8 @@
356 * along with this program. If not, see <http://www.gnu.org/licenses/>.
357 */
358
359-import QtQuick 2.3
360-import Ubuntu.Components 1.1
361+import QtQuick 2.4
362+import Ubuntu.Components 1.3
363 import QtOrganizer 5.0
364
365 Item{
366
367=== modified file 'EventDetails.qml'
368--- EventDetails.qml 2015-08-03 04:47:59 +0000
369+++ EventDetails.qml 2016-01-22 10:25:36 +0000
370@@ -15,9 +15,8 @@
371 * You should have received a copy of the GNU General Public License
372 * along with this program. If not, see <http://www.gnu.org/licenses/>.
373 */
374-import QtQuick 2.3
375-import Ubuntu.Components 1.1
376-import Ubuntu.Components.ListItems 1.0 as ListItem
377+import QtQuick 2.4
378+import Ubuntu.Components 1.3
379 import Ubuntu.Components.Themes.Ambiance 1.0
380 import Ubuntu.Components.Popups 1.0
381 import QtOrganizer 5.0
382@@ -350,9 +349,23 @@
383 margins: units.gu(-2)
384 }
385
386- ListItem.Header {
387- text: i18n.tr("Guests")
388- visible: contactModel.count !== 0
389+ ListItem {
390+ height: sectionLabel.height
391+ Label {
392+ id: sectionLabel
393+ text: i18n.tr("Guests")
394+ visible: contactModel.count !== 0
395+ anchors {
396+ left: parent.left
397+ leftMargin: units.gu(2)
398+ right: parent.right
399+ rightMargin: units.gu(2)
400+ }
401+ height: units.gu(4)
402+ fontSize: "medium"
403+ font.weight: Font.DemiBold
404+ verticalAlignment: Text.AlignVCenter
405+ }
406 }
407
408 //Guest Entery Model starts
409@@ -371,30 +384,35 @@
410
411 Repeater{
412 model: contactModel
413- delegate: ListItem.Standard {
414- Label {
415- text: name
416- objectName: "eventGuest%1".arg(index)
417- color: UbuntuColors.midAubergine
418- anchors {
419- left: parent.left
420- leftMargin: units.gu(2)
421- verticalCenter: parent.verticalCenter
422+ delegate: ListItem {
423+ objectName: "eventGuest%1".arg(index)
424+ height: layout.implicitHeight
425+ ListItemLayout {
426+ id: layout
427+ title.text: name
428+ title.color: UbuntuColors.midAubergine
429+ title.wrapMode: Text.NoWrap
430+ CheckBox {
431+ enabled: false
432+ checked: participationStatus
433 }
434 }
435-
436- control: CheckBox {
437- enabled: false
438- checked: participationStatus
439- }
440 }
441 }
442 }
443 //Guest Entries ends
444-
445- ListItem.Subtitled {
446+ ListItem {
447 id: reminderHeader
448- text: i18n.tr("Reminder")
449+ height: layout2.implicitHeight
450+ ListItemLayout {
451+ id: layout2
452+ title.text: i18n.tr("Reminder")
453+ title.wrapMode: Text.NoWrap
454+ CheckBox {
455+ enabled: false
456+ checked: participationStatus
457+ }
458+ }
459 }
460 }
461 }
462
463=== modified file 'EventListModel.qml'
464--- EventListModel.qml 2015-08-24 05:08:46 +0000
465+++ EventListModel.qml 2016-01-22 10:25:36 +0000
466@@ -15,7 +15,7 @@
467 * You should have received a copy of the GNU General Public License
468 * along with this program. If not, see <http://www.gnu.org/licenses/>.
469 */
470-import QtQuick 2.3
471+import QtQuick 2.4
472 import QtOrganizer 5.0
473
474 OrganizerModel {
475@@ -41,7 +41,7 @@
476 }
477
478 function startLoadingTimer() {
479- var newObject = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: 1000; running: true; repeat: false;}",
480+ var newObject = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: 1000; running: true; repeat: false;}",
481 eventModel, "EventListMode.qml");
482 newObject.onTriggered.connect( function(){
483 var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod);
484
485=== modified file 'EventReminder.qml'
486--- EventReminder.qml 2015-07-12 03:39:07 +0000
487+++ EventReminder.qml 2016-01-22 10:25:36 +0000
488@@ -16,8 +16,8 @@
489 * along with this program. If not, see <http://www.gnu.org/licenses/>.
490 */
491
492-import QtQuick 2.3
493-import Ubuntu.Components 1.1
494+import QtQuick 2.4
495+import Ubuntu.Components 1.3
496 import Ubuntu.Components.ListItems 1.0 as ListItem
497
498 Page{
499
500=== modified file 'EventRepetition.qml'
501--- EventRepetition.qml 2015-07-11 11:33:00 +0000
502+++ EventRepetition.qml 2016-01-22 10:25:36 +0000
503@@ -16,11 +16,10 @@
504 * along with this program. If not, see <http://www.gnu.org/licenses/>.
505 */
506
507-import QtQuick 2.3
508+import QtQuick 2.4
509 import QtOrganizer 5.0
510-import Ubuntu.Components 1.1
511-import Ubuntu.Components.ListItems 1.0 as ListItem
512-import Ubuntu.Components.Pickers 1.0
513+import Ubuntu.Components 1.3
514+import Ubuntu.Components.Pickers 1.1
515 import QtOrganizer 5.0
516 import "Defines.js" as Defines
517 import "Recurrence.js" as Recurrence
518@@ -151,7 +150,7 @@
519 anchors.fill: parent
520 spacing: units.gu(1)
521
522- ListItem.Header{
523+ SectionHeader{
524 text: i18n.tr("Repeat")
525 }
526
527@@ -170,7 +169,7 @@
528 onExpandedChanged: Qt.inputMethod.hide();
529 }
530
531- ListItem.Header{
532+ SectionHeader{
533 text: i18n.tr("Repeats On:")
534 visible: recurrenceOption.selectedIndex == 5
535 }
536@@ -215,7 +214,7 @@
537 }
538 }
539
540- ListItem.Header {
541+ SectionHeader {
542 text: i18n.tr("Recurring event ends")
543 visible: recurrenceOption.selectedIndex != 0
544 }
545@@ -235,7 +234,7 @@
546 onExpandedChanged: Qt.inputMethod.hide()
547 }
548
549- ListItem.Header{
550+ SectionHeader{
551 // TRANSLATORS: this refers to how often a recurrent event repeats
552 // and it is shown as the header of the option selector to choose
553 // its repetition
554@@ -263,7 +262,7 @@
555 }
556 }
557
558- ListItem.Header{
559+ SectionHeader{
560 text:i18n.tr("Date")
561 visible: recurrenceOption.selectedIndex != 0 && limitOptions.selectedIndex == 2
562 }
563
564=== modified file 'EventUtils.qml'
565--- EventUtils.qml 2014-10-04 04:37:34 +0000
566+++ EventUtils.qml 2016-01-22 10:25:36 +0000
567@@ -16,8 +16,8 @@
568 * along with this program. If not, see <http://www.gnu.org/licenses/>.
569 */
570
571-import QtQuick 2.3
572-import Ubuntu.Components 1.1
573+import QtQuick 2.4
574+import Ubuntu.Components 1.3
575 import QtOrganizer 5.0
576 import "Defines.js" as Defines
577 import "Recurrence.js" as Recurrence
578
579=== modified file 'HeaderDateComponent.qml'
580--- HeaderDateComponent.qml 2015-05-14 13:03:02 +0000
581+++ HeaderDateComponent.qml 2016-01-22 10:25:36 +0000
582@@ -16,8 +16,8 @@
583 * along with this program. If not, see <http://www.gnu.org/licenses/>.
584 */
585
586-import QtQuick 2.3
587-import Ubuntu.Components 1.1
588+import QtQuick 2.4
589+import Ubuntu.Components 1.3
590
591 Item {
592 id: root
593
594=== modified file 'KeyboardRectangle.qml'
595--- KeyboardRectangle.qml 2014-09-20 10:45:35 +0000
596+++ KeyboardRectangle.qml 2016-01-22 10:25:36 +0000
597@@ -16,7 +16,7 @@
598 * along with this program. If not, see <http://www.gnu.org/licenses/>.
599 */
600
601-import QtQuick 2.3
602+import QtQuick 2.4
603
604 Item {
605 id: keyboardRect
606
607=== modified file 'LimitLabelModel.qml'
608--- LimitLabelModel.qml 2014-10-22 17:32:15 +0000
609+++ LimitLabelModel.qml 2016-01-22 10:25:36 +0000
610@@ -15,7 +15,7 @@
611 * You should have received a copy of the GNU General Public License
612 * along with this program. If not, see <http://www.gnu.org/licenses/>.
613 */
614-import QtQuick 2.3;
615+import QtQuick 2.4;
616
617 ListModel {
618 id:limitLables
619
620=== modified file 'MonthComponent.qml'
621--- MonthComponent.qml 2015-11-23 07:15:20 +0000
622+++ MonthComponent.qml 2016-01-22 10:25:36 +0000
623@@ -15,8 +15,8 @@
624 * You should have received a copy of the GNU General Public License
625 * along with this program. If not, see <http://www.gnu.org/licenses/>.
626 */
627-import QtQuick 2.3
628-import Ubuntu.Components 1.1
629+import QtQuick 2.4
630+import Ubuntu.Components 1.3
631 import "dateExt.js" as DateExt
632 import "colorUtils.js" as Color
633
634
635=== modified file 'MonthComponentDateDelegate.qml'
636--- MonthComponentDateDelegate.qml 2015-09-05 05:30:23 +0000
637+++ MonthComponentDateDelegate.qml 2016-01-22 10:25:36 +0000
638@@ -1,5 +1,5 @@
639 import QtQuick 2.0
640-import Ubuntu.Components 1.1
641+import Ubuntu.Components 1.3
642
643 Item{
644 id: dateRootItem
645
646=== modified file 'MonthView.qml'
647--- MonthView.qml 2015-11-23 07:15:20 +0000
648+++ MonthView.qml 2016-01-22 10:25:36 +0000
649@@ -15,8 +15,8 @@
650 * You should have received a copy of the GNU General Public License
651 * along with this program. If not, see <http://www.gnu.org/licenses/>.
652 */
653-import QtQuick 2.3
654-import Ubuntu.Components 1.1
655+import QtQuick 2.4
656+import Ubuntu.Components 1.3
657 import "dateExt.js" as DateExt
658 import "colorUtils.js" as Color
659
660
661=== modified file 'NewEvent.qml'
662--- NewEvent.qml 2015-08-24 05:08:46 +0000
663+++ NewEvent.qml 2016-01-22 10:25:36 +0000
664@@ -16,13 +16,12 @@
665 * along with this program. If not, see <http://www.gnu.org/licenses/>.
666 */
667
668-import QtQuick 2.3
669+import QtQuick 2.4
670 import QtOrganizer 5.0
671-import Ubuntu.Components 1.1
672-import Ubuntu.Components.Popups 1.0
673-import Ubuntu.Components.ListItems 1.0 as ListItem
674+import Ubuntu.Components 1.3
675+import Ubuntu.Components.Popups 1.1
676 import Ubuntu.Components.Themes.Ambiance 1.0
677-import Ubuntu.Components.Pickers 1.0
678+import Ubuntu.Components.Pickers 1.1
679 import QtOrganizer 5.0
680 import "Defines.js" as Defines
681
682@@ -410,29 +409,24 @@
683 endDate = dateTime;
684 }
685 }
686-
687- ListItem.Standard {
688- anchors {
689- left: parent.left
690- right: parent.right
691- }
692-
693- text: i18n.tr("All day event")
694- showDivider: false
695- control: CheckBox {
696- objectName: "allDayEventCheckbox"
697- id: allDayEventCheckbox
698- checked: false
699+ ListItem {
700+ height: layout1.implicitHeight
701+ ListItemLayout {
702+ id: layout1
703+ title.text: i18n.tr("All day event")
704+ CheckBox {
705+ objectName: "allDayEventCheckbox"
706+ id: allDayEventCheckbox
707+ checked: false
708+ }
709 }
710 }
711
712- ListItem.ThinDivider {}
713-
714 Column {
715 width: parent.width
716 spacing: units.gu(1)
717
718- ListItem.Header{
719+ SectionHeader{
720 text: i18n.tr("Event Details")
721 }
722
723@@ -496,7 +490,7 @@
724 width: parent.width
725 spacing: units.gu(1)
726
727- ListItem.Header {
728+ SectionHeader {
729 text: i18n.tr("Calendar")
730 }
731
732@@ -534,7 +528,7 @@
733 width: parent.width
734 spacing: units.gu(1)
735
736- ListItem.Header {
737+ SectionHeader {
738 text: i18n.tr("Guests")
739 }
740
741@@ -585,82 +579,100 @@
742
743 Repeater{
744 model: contactModel
745- delegate: ListItem.Standard {
746+ delegate: ListItem {
747 objectName: "eventGuest%1".arg(index)
748- height: units.gu(4)
749- text: name
750- removable: true
751- onItemRemoved: {
752- contactList.array.splice(index, 1)
753- contactModel.remove(index)
754+ height: layout.implicitHeight
755+ ListItemLayout {
756+ id: layout2
757+ title.text: name
758+ }
759+ leadingActions: ListItemActions {
760+ actions: [
761+ Action {
762+ iconName: "delete"
763+ onTriggered: {
764+ contactList.array.splice(index, 1)
765+ contactModel.remove(index)
766+ }
767+ }
768+ ]
769 }
770 }
771 }
772 }
773 }
774-
775- ListItem.ThinDivider {
776- visible: event.itemType === Type.Event
777- }
778-
779 }
780
781- ListItem.Subtitled{
782+ ListItem {
783 id:thisHappens
784 objectName :"thisHappens"
785
786- anchors {
787- left: parent.left
788+ height: layout3.height
789+ divider.visible: event.itemType === Type.Event
790+ visible: event.itemType === Type.Event
791+ ListItemLayout {
792+ id: layout3
793+ title.text: i18n.tr("Repeats")
794+ subtitle.text: event.itemType === Type.Event ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
795+ Item {
796+ height: units.gu(4)
797+ width: height
798+ Icon {
799+ name: "next"
800+ height: units.gu(2.5)
801+ width: height
802+ anchors.centerIn: parent
803+ }
804+ }
805 }
806-
807- showDivider: false
808- progression: true
809- visible: event.itemType === Type.Event
810- text: i18n.tr("Repeats")
811- subText: event.itemType === Type.Event ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
812 onClicked: pageStack.push(Qt.resolvedUrl("EventRepetition.qml"),{"eventRoot": root,"isEdit":isEdit});
813 }
814
815- ListItem.ThinDivider {
816- visible: event.itemType === Type.Event
817- }
818-
819- ListItem.Subtitled{
820+ ListItem {
821 id:eventReminder
822- objectName : "eventReminder"
823-
824- anchors.left:parent.left
825- showDivider: false
826- progression: true
827- text: i18n.tr("Reminder")
828+ objectName :"eventReminder"
829+ height: layout4.height
830+ divider.visible: true
831+ visible: event.itemType === Type.Event
832
833 RemindersModel {
834 id: reminderModel
835 }
836
837- subText:{
838- if(visualReminder.secondsBeforeStart !== -1) {
839- for( var i=0; i<reminderModel.count; i++ ) {
840- if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) {
841- return reminderModel.get(i).label
842+ ListItemLayout {
843+ id: layout4
844+ title.text: i18n.tr("Reminder")
845+ subtitle.text: {
846+ if(visualReminder.secondsBeforeStart !== -1) {
847+ for( var i=0; i<reminderModel.count; i++ ) {
848+ if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) {
849+ return reminderModel.get(i).label
850+ }
851 }
852- }
853- } else {
854- return reminderModel.get(0).label
855- }
856-
857+ } else {
858+ return reminderModel.get(0).label
859+ }
860+ }
861+ Item {
862+ height: units.gu(4)
863+ width: height
864+ Icon {
865+ name: "next"
866+ height: units.gu(2.5)
867+ width: height
868+ anchors.centerIn: parent
869+ }
870+ }
871 }
872-
873 onClicked: pageStack.push(Qt.resolvedUrl("EventReminder.qml"),
874 {"visualReminder": visualReminder,
875 "audibleReminder": audibleReminder,
876 "reminderModel": reminderModel,
877 "eventTitle": titleEdit.text})
878 }
879-
880- ListItem.ThinDivider {}
881 }
882 }
883+
884 // used to keep the field visible when the keyboard appear or dismiss
885 KeyboardRectangle {
886 id: keyboard
887
888=== modified file 'NewEventEntryField.qml'
889--- NewEventEntryField.qml 2015-02-17 05:53:42 +0000
890+++ NewEventEntryField.qml 2016-01-22 10:25:36 +0000
891@@ -16,8 +16,8 @@
892 * along with this program. If not, see <http://www.gnu.org/licenses/>.
893 */
894
895-import QtQuick 2.3
896-import Ubuntu.Components 1.1
897+import QtQuick 2.4
898+import Ubuntu.Components 1.3
899
900 Label {
901 id: root
902
903=== modified file 'NewEventTimePicker.qml'
904--- NewEventTimePicker.qml 2014-10-21 18:58:31 +0000
905+++ NewEventTimePicker.qml 2016-01-22 10:25:36 +0000
906@@ -1,4 +1,4 @@
907-import QtQuick 2.3
908+import QtQuick 2.4
909 import Ubuntu.Components.ListItems 1.0 as ListItem
910 import Ubuntu.Components.Themes.Ambiance 1.0
911 import Ubuntu.Components.Pickers 1.0
912@@ -29,7 +29,7 @@
913 timeInput.text = Qt.formatTime(dateTime);
914 }
915
916- ListItem.Header {
917+ SectionHeader {
918 id: listHeader
919 }
920
921
922=== modified file 'OnlineAccountsHelper.qml'
923--- OnlineAccountsHelper.qml 2015-03-28 11:31:47 +0000
924+++ OnlineAccountsHelper.qml 2016-01-22 10:25:36 +0000
925@@ -15,7 +15,7 @@
926 */
927
928 import QtQuick 2.2
929-import Ubuntu.Components 1.1
930+import Ubuntu.Components 1.3
931 import Ubuntu.OnlineAccounts 0.1
932 import Ubuntu.OnlineAccounts.Client 0.1
933
934
935=== modified file 'PathViewBase.qml'
936--- PathViewBase.qml 2015-08-29 08:59:47 +0000
937+++ PathViewBase.qml 2016-01-22 10:25:36 +0000
938@@ -15,7 +15,7 @@
939 * You should have received a copy of the GNU General Public License
940 * along with this program. If not, see <http://www.gnu.org/licenses/>.
941 */
942-import QtQuick 2.3
943+import QtQuick 2.4
944
945 PathView {
946 id: root
947
948=== modified file 'RecurrenceLabelDefines.qml'
949--- RecurrenceLabelDefines.qml 2014-10-17 05:42:34 +0000
950+++ RecurrenceLabelDefines.qml 2016-01-22 10:25:36 +0000
951@@ -16,8 +16,8 @@
952 * along with this program. If not, see <http://www.gnu.org/licenses/>.
953 */
954
955-import QtQuick 2.3
956-import Ubuntu.Components 1.1
957+import QtQuick 2.4
958+import Ubuntu.Components 1.3
959
960 QtObject {
961 property var recurrenceLabel:[i18n.tr("Once"),
962
963=== modified file 'RemindersModel.qml'
964--- RemindersModel.qml 2014-10-17 05:42:34 +0000
965+++ RemindersModel.qml 2016-01-22 10:25:36 +0000
966@@ -16,7 +16,7 @@
967 * along with this program. If not, see <http://www.gnu.org/licenses/>.
968 */
969
970-import QtQuick 2.3
971+import QtQuick 2.4
972
973 ListModel {
974 id: reminderModel
975
976=== modified file 'ScrollAnimation.qml'
977--- ScrollAnimation.qml 2014-09-20 10:45:35 +0000
978+++ ScrollAnimation.qml 2016-01-22 10:25:36 +0000
979@@ -1,4 +1,4 @@
980-import QtQuick 2.3
981+import QtQuick 2.4
982
983 PropertyAnimation {
984 duration: 500
985
986=== modified file 'Scroller.qml'
987--- Scroller.qml 2014-09-20 10:45:35 +0000
988+++ Scroller.qml 2016-01-22 10:25:36 +0000
989@@ -16,8 +16,8 @@
990 * along with this program. If not, see <http://www.gnu.org/licenses/>.
991 */
992
993-import QtQuick 2.3
994-import Ubuntu.Components 1.1
995+import QtQuick 2.4
996+import Ubuntu.Components 1.3
997 import Ubuntu.Components.ListItems 1.0 as ListItems
998
999 Item {
1000
1001=== added file 'SectionHeader.qml'
1002--- SectionHeader.qml 1970-01-01 00:00:00 +0000
1003+++ SectionHeader.qml 2016-01-22 10:25:36 +0000
1004@@ -0,0 +1,23 @@
1005+import QtQuick 2.4
1006+import Ubuntu.Components 1.3
1007+
1008+ListItem {
1009+
1010+ property alias text: sectionLabel.text
1011+
1012+ height: sectionLabel.height
1013+ Label {
1014+ id: sectionLabel
1015+ anchors {
1016+ left: parent.left
1017+ leftMargin: units.gu(2)
1018+ right: parent.right
1019+ rightMargin: units.gu(2)
1020+ }
1021+ height: units.gu(4)
1022+ fontSize: "medium"
1023+ font.weight: Font.DemiBold
1024+ verticalAlignment: Text.AlignVCenter
1025+ }
1026+}
1027+
1028
1029=== modified file 'Settings.qml'
1030--- Settings.qml 2015-11-23 07:15:20 +0000
1031+++ Settings.qml 2016-01-22 10:25:36 +0000
1032@@ -15,10 +15,9 @@
1033 * You should have received a copy of the GNU General Public License
1034 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1035 */
1036-import QtQuick 2.3
1037-import Ubuntu.Components 1.1
1038-import Ubuntu.Components.Popups 1.0
1039-import Ubuntu.Components.ListItems 1.0 as ListItem
1040+import QtQuick 2.4
1041+import Ubuntu.Components 1.3
1042+import Ubuntu.Components.Popups 1.1
1043
1044 Page {
1045 id: root
1046@@ -46,40 +45,30 @@
1047 objectName: "settingsColumn"
1048 spacing: units.gu(0.5)
1049 anchors {
1050- margins: units.gu(2)
1051 fill: parent
1052 }
1053
1054- Item{
1055+ ListItem{
1056+ id: weekNumber;
1057+ objectName: "weekNumber"
1058 width: parent.width;
1059- height: Math.max(weekNumber.height, weekCheckBox.height)
1060-
1061- Label{
1062- id: weekNumber;
1063- objectName: "weekNumber"
1064- text: i18n.tr("Show week numbers");
1065- elide: Text.ElideRight
1066- opacity: weekCheckBox.checked ? 1.0 : 0.8
1067- color: UbuntuColors.midAubergine
1068- anchors {
1069- left: parent.left
1070- right: weekCheckBox.left;
1071- margins: units.gu(2)
1072- verticalCenter: parent.verticalCenter
1073- }
1074- }
1075-
1076- CheckBox {
1077- id: weekCheckBox
1078- objectName: "weekCheckBox"
1079- anchors.right:parent.right;
1080- onCheckedChanged: {
1081- mainView.displayWeekNumber = weekCheckBox.checked;
1082+ height: layout.implicitHeight
1083+ opacity: weekCheckBox.checked ? 1.0 : 0.8
1084+
1085+ ListItemLayout {
1086+ id: layout
1087+ title.text: i18n.tr("Show week numbers");
1088+ title.elide: Text.ElideRight
1089+ title.color: UbuntuColors.midAubergine
1090+ CheckBox {
1091+ id: weekCheckBox
1092+ objectName: "weekCheckBox"
1093+ onCheckedChanged: {
1094+ mainView.displayWeekNumber = weekCheckBox.checked;
1095+ }
1096 }
1097 }
1098 }
1099-
1100- ListItem.ThinDivider {}
1101 }
1102
1103 Component.onCompleted: {
1104
1105=== modified file 'TimeLineBackground.qml'
1106--- TimeLineBackground.qml 2014-11-29 05:15:13 +0000
1107+++ TimeLineBackground.qml 2016-01-22 10:25:36 +0000
1108@@ -16,8 +16,8 @@
1109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1110 */
1111
1112-import QtQuick 2.3
1113-import Ubuntu.Components 1.1
1114+import QtQuick 2.4
1115+import Ubuntu.Components 1.3
1116
1117 Column {
1118 width: parent.width
1119
1120=== modified file 'TimeLineBase.qml'
1121--- TimeLineBase.qml 2015-08-20 12:27:59 +0000
1122+++ TimeLineBase.qml 2016-01-22 10:25:36 +0000
1123@@ -15,8 +15,8 @@
1124 * You should have received a copy of the GNU General Public License
1125 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1126 */
1127-import QtQuick 2.3
1128-import Ubuntu.Components 1.1
1129+import QtQuick 2.4
1130+import Ubuntu.Components 1.3
1131 import QtOrganizer 5.0
1132
1133 import "dateExt.js" as DateExt
1134
1135=== modified file 'TimeLineBaseComponent.qml'
1136--- TimeLineBaseComponent.qml 2015-10-31 18:47:23 +0000
1137+++ TimeLineBaseComponent.qml 2016-01-22 10:25:36 +0000
1138@@ -16,9 +16,9 @@
1139 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1140 */
1141
1142-import QtQuick 2.3
1143+import QtQuick 2.4
1144 import QtQuick.Layouts 1.1
1145-import Ubuntu.Components 1.1
1146+import Ubuntu.Components 1.3
1147 import Ubuntu.Components.Popups 1.0
1148 import QtOrganizer 5.0
1149
1150@@ -112,11 +112,11 @@
1151 }
1152
1153 Timer{
1154- interval: 200; running: true; repeat: false
1155- onTriggered: {
1156- mainModel = modelComponent.createObject();
1157- activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;});
1158- }
1159+ interval: 200; running: true; repeat: false
1160+ onTriggered: {
1161+ mainModel = modelComponent.createObject();
1162+ activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;});
1163+ }
1164 }
1165
1166 Component {
1167@@ -177,6 +177,7 @@
1168 id: timeLineView
1169 objectName: "timelineview"
1170
1171+
1172 height: parent.height
1173 width: parent.width - units.gu(6)
1174
1175@@ -242,7 +243,7 @@
1176 objectName: "mouseArea"
1177 anchors.fill: parent
1178
1179- function modifyEventForDrag(drag) {
1180+ function modifyEventForDrag(drag) {
1181 var event = drag.source.event;
1182 var diff = event.endDateTime.getTime() - event.startDateTime.getTime();
1183
1184@@ -252,7 +253,7 @@
1185 event.startDateTime = startDate;
1186 event.endDateTime = endDate;
1187
1188- return event;
1189+ return event;
1190 }
1191
1192 onDropped: {
1193
1194=== modified file 'TimeLineHeader.qml'
1195--- TimeLineHeader.qml 2015-09-05 05:30:23 +0000
1196+++ TimeLineHeader.qml 2016-01-22 10:25:36 +0000
1197@@ -17,7 +17,7 @@
1198 */
1199
1200 import QtQuick 2.0
1201-import Ubuntu.Components 1.1
1202+import Ubuntu.Components 1.3
1203 import QtQuick.Layouts 1.1
1204
1205 import "ViewType.js" as ViewType
1206
1207=== modified file 'TimeLineHeaderComponent.qml'
1208--- TimeLineHeaderComponent.qml 2015-09-05 05:30:23 +0000
1209+++ TimeLineHeaderComponent.qml 2016-01-22 10:25:36 +0000
1210@@ -16,8 +16,8 @@
1211 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1212 */
1213
1214-import QtQuick 2.3
1215-import Ubuntu.Components 1.1
1216+import QtQuick 2.4
1217+import Ubuntu.Components 1.3
1218 import "dateExt.js" as DateExt
1219 import "ViewType.js" as ViewType
1220
1221
1222=== modified file 'TimeLineTimeScale.qml'
1223--- TimeLineTimeScale.qml 2014-12-11 20:29:27 +0000
1224+++ TimeLineTimeScale.qml 2016-01-22 10:25:36 +0000
1225@@ -17,7 +17,7 @@
1226 */
1227
1228 import QtQuick 2.0
1229-import Ubuntu.Components 1.1
1230+import Ubuntu.Components 1.3
1231
1232 Flickable{
1233 id: timeFlickble
1234
1235=== modified file 'TimeSeparator.qml'
1236--- TimeSeparator.qml 2014-09-20 10:45:35 +0000
1237+++ TimeSeparator.qml 2016-01-22 10:25:36 +0000
1238@@ -15,7 +15,7 @@
1239 * You should have received a copy of the GNU General Public License
1240 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1241 */
1242-import QtQuick 2.3
1243+import QtQuick 2.4
1244
1245 Rectangle {
1246 id: separator
1247
1248=== modified file 'ViewHeader.qml'
1249--- ViewHeader.qml 2014-11-29 09:40:53 +0000
1250+++ ViewHeader.qml 2016-01-22 10:25:36 +0000
1251@@ -15,8 +15,8 @@
1252 * You should have received a copy of the GNU General Public License
1253 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1254 */
1255-import QtQuick 2.3
1256-import Ubuntu.Components 1.1
1257+import QtQuick 2.4
1258+import Ubuntu.Components 1.3
1259
1260 Item{
1261 id: header
1262
1263=== modified file 'WeekView.qml'
1264--- WeekView.qml 2015-10-28 02:12:50 +0000
1265+++ WeekView.qml 2016-01-22 10:25:36 +0000
1266@@ -16,8 +16,8 @@
1267 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1268 */
1269
1270-import QtQuick 2.3
1271-import Ubuntu.Components 1.1
1272+import QtQuick 2.4
1273+import Ubuntu.Components 1.3
1274 import "dateExt.js" as DateExt
1275 import "ViewType.js" as ViewType
1276
1277
1278=== modified file 'YearView.qml'
1279--- YearView.qml 2015-11-23 07:15:20 +0000
1280+++ YearView.qml 2016-01-22 10:25:36 +0000
1281@@ -16,8 +16,8 @@
1282 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1283 */
1284
1285-import QtQuick 2.3
1286-import Ubuntu.Components 1.1
1287+import QtQuick 2.4
1288+import Ubuntu.Components 1.3
1289
1290 import "dateExt.js" as DateExt
1291 Page {
1292@@ -86,7 +86,6 @@
1293
1294 Component{
1295 id: delegateComponent
1296-
1297 YearViewDelegate{
1298 focus: index == yearPathView.currentIndex
1299
1300
1301=== modified file 'YearViewDelegate.qml'
1302--- YearViewDelegate.qml 2015-11-23 07:15:20 +0000
1303+++ YearViewDelegate.qml 2016-01-22 10:25:36 +0000
1304@@ -1,5 +1,5 @@
1305-import QtQuick 2.0
1306-import Ubuntu.Components 1.1
1307+import QtQuick 2.4
1308+import Ubuntu.Components 1.3
1309
1310 GridView{
1311 id: yearView
1312
1313=== modified file 'calendar.qml'
1314--- calendar.qml 2015-11-23 07:15:20 +0000
1315+++ calendar.qml 2016-01-22 10:25:36 +0000
1316@@ -15,9 +15,9 @@
1317 * You should have received a copy of the GNU General Public License
1318 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1319 */
1320-import QtQuick 2.3
1321-import Ubuntu.Components 1.1
1322-import Ubuntu.Components.Popups 1.0
1323+import QtQuick 2.4
1324+import Ubuntu.Components 1.3
1325+import Ubuntu.Components.Popups 1.1
1326 import QtOrganizer 5.0
1327 import Qt.labs.settings 1.0
1328 import "dateExt.js" as DateExt
1329@@ -27,7 +27,7 @@
1330
1331 property bool displayWeekNumber: false;
1332
1333- useDeprecatedToolbar: false
1334+// useDeprecatedToolbar: false
1335
1336 // Work-around until this branch lands:
1337 // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
1338
1339=== modified file 'calendarTests.qml'
1340--- calendarTests.qml 2014-09-20 10:45:35 +0000
1341+++ calendarTests.qml 2016-01-22 10:25:36 +0000
1342@@ -15,8 +15,8 @@
1343 * You should have received a copy of the GNU General Public License
1344 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1345 */
1346-import QtQuick 2.3
1347-import Ubuntu.Components 1.1
1348+import QtQuick 2.4
1349+import Ubuntu.Components 1.3
1350
1351 MainView {
1352 width: units.gu(20)
1353
1354=== modified file 'click/manifest.json.in'
1355--- click/manifest.json.in 2014-12-28 23:12:44 +0000
1356+++ click/manifest.json.in 2016-01-22 10:25:36 +0000
1357@@ -1,7 +1,7 @@
1358 {
1359 "architecture": "all",
1360 "description": "A calendar for Ubuntu which syncs with online accounts",
1361- "framework": "ubuntu-sdk-14.10-qml",
1362+ "framework": "ubuntu-sdk-15.04.2-qml",
1363 "hooks": {
1364 "calendar": {
1365 "account-application": "@PROJECT_NAME@_@APP_NAME@.application",
1366
1367=== modified file 'po/com.ubuntu.calendar.pot'
1368--- po/com.ubuntu.calendar.pot 2015-11-23 07:15:20 +0000
1369+++ po/com.ubuntu.calendar.pot 2016-01-22 10:25:36 +0000
1370@@ -1,6 +1,6 @@
1371 # SOME DESCRIPTIVE TITLE.
1372 # Copyright (C) YEAR Canonical Ltd.
1373-# This file is distributed under the same license as the PACKAGE package.
1374+# This file is distributed under the same license as the package.
1375 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
1376 #
1377 #, fuzzy
1378@@ -8,7 +8,7 @@
1379 msgstr ""
1380 "Project-Id-Version: \n"
1381 "Report-Msgid-Bugs-To: \n"
1382-"POT-Creation-Date: 2015-11-23 15:14+0800\n"
1383+"POT-Creation-Date: 2016-01-22 09:46+0000\n"
1384 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1385 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1386 "Language-Team: LANGUAGE <LL@li.org>\n"
1387@@ -59,25 +59,25 @@
1388 msgstr[0] ""
1389 msgstr[1] ""
1390
1391-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61
1392+#: ../CalendarChoicePopup.qml:32 ../EventActions.qml:61
1393 msgid "Calendars"
1394 msgstr ""
1395
1396-#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
1397+#: ../CalendarChoicePopup.qml:36 ../Settings.qml:31
1398 msgid "Back"
1399 msgstr ""
1400
1401 #. TRANSLATORS: Please translate this string to 15 characters only.
1402 #. Currently ,there is no way we can increase width of action menu currently.
1403-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
1404+#: ../CalendarChoicePopup.qml:50 ../EventActions.qml:37
1405 msgid "Sync"
1406 msgstr ""
1407
1408-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
1409+#: ../CalendarChoicePopup.qml:50 ../EventActions.qml:37
1410 msgid "Syncing"
1411 msgstr ""
1412
1413-#: ../CalendarChoicePopup.qml:70
1414+#: ../CalendarChoicePopup.qml:69
1415 msgid "Add online Calendar"
1416 msgstr ""
1417
1418@@ -132,11 +132,11 @@
1419 msgid "Delete this"
1420 msgstr ""
1421
1422-#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:68
1423+#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:67
1424 msgid "Delete"
1425 msgstr ""
1426
1427-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
1428+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
1429 msgid "Edit Event"
1430 msgstr ""
1431
1432@@ -154,11 +154,11 @@
1433 msgid "Edit this"
1434 msgstr ""
1435
1436-#: ../EventActions.qml:51 ../NewEvent.qml:325
1437+#: ../EventActions.qml:51 ../NewEvent.qml:324
1438 msgid "New Event"
1439 msgstr ""
1440
1441-#: ../EventActions.qml:72 ../Settings.qml:28
1442+#: ../EventActions.qml:72 ../Settings.qml:27
1443 msgid "Settings"
1444 msgstr ""
1445
1446@@ -169,35 +169,35 @@
1447 msgid "%1 <b>%2</b>"
1448 msgstr ""
1449
1450-#: ../EventDetails.qml:43 ../NewEvent.qml:436
1451+#: ../EventDetails.qml:42 ../NewEvent.qml:430
1452 msgid "Event Details"
1453 msgstr ""
1454
1455 #. TRANSLATORS: the first parameter refers to the name of event calendar.
1456-#: ../EventDetails.qml:68
1457+#: ../EventDetails.qml:67
1458 #, qt-format
1459 msgid "%1 Calendar"
1460 msgstr ""
1461
1462-#: ../EventDetails.qml:129
1463+#: ../EventDetails.qml:128
1464 #, qt-format
1465 msgid "%1 - %2 (All Day)"
1466 msgstr ""
1467
1468-#: ../EventDetails.qml:133
1469+#: ../EventDetails.qml:132
1470 #, qt-format
1471 msgid "%1 (All Day)"
1472 msgstr ""
1473
1474-#: ../EventDetails.qml:203
1475+#: ../EventDetails.qml:202
1476 msgid "Edit"
1477 msgstr ""
1478
1479-#: ../EventDetails.qml:354 ../NewEvent.qml:538
1480+#: ../EventDetails.qml:356 ../NewEvent.qml:532
1481 msgid "Guests"
1482 msgstr ""
1483
1484-#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:635
1485+#: ../EventDetails.qml:409 ../EventReminder.qml:35 ../NewEvent.qml:644
1486 msgid "Reminder"
1487 msgstr ""
1488
1489@@ -205,26 +205,26 @@
1490 #. and it is shown as the header of the page to choose repetition
1491 #. and as the header of the list item that shows the repetition
1492 #. summary in the page that displays the event details
1493-#: ../EventRepetition.qml:40 ../EventRepetition.qml:155
1494+#: ../EventRepetition.qml:39 ../EventRepetition.qml:154
1495 msgid "Repeat"
1496 msgstr ""
1497
1498-#: ../EventRepetition.qml:174
1499+#: ../EventRepetition.qml:173
1500 msgid "Repeats On:"
1501 msgstr ""
1502
1503-#: ../EventRepetition.qml:219
1504+#: ../EventRepetition.qml:218
1505 msgid "Recurring event ends"
1506 msgstr ""
1507
1508 #. TRANSLATORS: this refers to how often a recurrent event repeats
1509 #. and it is shown as the header of the option selector to choose
1510 #. its repetition
1511-#: ../EventRepetition.qml:242 ../NewEvent.qml:619
1512+#: ../EventRepetition.qml:241 ../NewEvent.qml:615
1513 msgid "Repeats"
1514 msgstr ""
1515
1516-#: ../EventRepetition.qml:267
1517+#: ../EventRepetition.qml:266
1518 msgid "Date"
1519 msgstr ""
1520
1521@@ -267,51 +267,51 @@
1522 msgid "Wk"
1523 msgstr ""
1524
1525-#: ../NewEvent.qml:84
1526+#: ../NewEvent.qml:83
1527 msgid "Save"
1528 msgstr ""
1529
1530-#: ../NewEvent.qml:192
1531+#: ../NewEvent.qml:191
1532 msgid "End time can't be before start time"
1533 msgstr ""
1534
1535-#: ../NewEvent.qml:335
1536+#: ../NewEvent.qml:334
1537 msgid "Error"
1538 msgstr ""
1539
1540-#: ../NewEvent.qml:337
1541+#: ../NewEvent.qml:336
1542 msgid "OK"
1543 msgstr ""
1544
1545-#: ../NewEvent.qml:390
1546+#: ../NewEvent.qml:389
1547 msgid "From"
1548 msgstr ""
1549
1550-#: ../NewEvent.qml:403
1551+#: ../NewEvent.qml:402
1552 msgid "To"
1553 msgstr ""
1554
1555-#: ../NewEvent.qml:420
1556+#: ../NewEvent.qml:416
1557 msgid "All day event"
1558 msgstr ""
1559
1560-#: ../NewEvent.qml:449
1561+#: ../NewEvent.qml:443
1562 msgid "Event Name"
1563 msgstr ""
1564
1565-#: ../NewEvent.qml:467
1566+#: ../NewEvent.qml:461
1567 msgid "Description"
1568 msgstr ""
1569
1570-#: ../NewEvent.qml:485
1571+#: ../NewEvent.qml:479
1572 msgid "Location"
1573 msgstr ""
1574
1575-#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
1576+#: ../NewEvent.qml:494 com.ubuntu.calendar_calendar.desktop.in.in.h:1
1577 msgid "Calendar"
1578 msgstr ""
1579
1580-#: ../NewEvent.qml:542
1581+#: ../NewEvent.qml:536
1582 msgid "Add Guest"
1583 msgstr ""
1584

Subscribers

People subscribed via source and target branches

to status/vote changes: