Merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3 into lp:ubuntu-calendar-app

Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp:~renatofilho/ubuntu-calendar-app/sdk-1-3
Merge into: lp:ubuntu-calendar-app
Prerequisite: lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix
Diff against target: 1053 lines (+193/-126)
49 files modified
AgendaView.qml (+17/-9)
AllDayEventComponent.qml (+1/-1)
CalendarChoicePopup.qml (+1/-1)
CalendarListButtonDelegate.qml (+1/-1)
ColorPickerDialog.qml (+1/-1)
ContactChoicePopup.qml (+1/-1)
DayHeaderBackground.qml (+1/-1)
DayView.qml (+18/-10)
Defines.js (+1/-1)
DeleteConfirmationDialog.qml (+1/-1)
EditEventConfirmationDialog.qml (+1/-1)
EventActions.qml (+5/-4)
EventBubble.qml (+1/-1)
EventDetails.qml (+2/-2)
EventListModel.qml (+3/-3)
EventReminder.qml (+1/-1)
EventRepetition.qml (+1/-1)
EventUtils.qml (+1/-1)
HeaderDateComponent.qml (+1/-1)
KeyboardRectangle.qml (+1/-1)
LimitLabelModel.qml (+1/-1)
MonthComponent.qml (+1/-1)
MonthComponentDateDelegate.qml (+1/-1)
MonthView.qml (+16/-13)
NewEvent.qml (+1/-1)
NewEventEntryField.qml (+1/-1)
NewEventTimePicker.qml (+1/-1)
OnlineAccountsHelper.qml (+1/-1)
PathViewBase.qml (+1/-1)
RecurrenceLabelDefines.qml (+1/-1)
RemindersModel.qml (+1/-1)
ScrollAnimation.qml (+1/-1)
Scroller.qml (+1/-1)
Settings.qml (+1/-1)
SimpleDivider.qml (+1/-1)
TimeLineBackground.qml (+1/-1)
TimeLineBase.qml (+1/-1)
TimeLineBaseComponent.qml (+1/-2)
TimeLineHeader.qml (+2/-3)
TimeLineHeaderComponent.qml (+1/-1)
TimeLineTimeScale.qml (+1/-1)
TimeSeparator.qml (+1/-1)
ViewHeader.qml (+1/-1)
WeekView.qml (+18/-10)
YearView.qml (+13/-10)
YearViewDelegate.qml (+1/-1)
calendar.qml (+40/-10)
calendarTests.qml (+1/-1)
tests/autopilot/calendar_app/__init__.py (+21/-13)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-calendar-app/sdk-1-3
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+284454@code.launchpad.net

This proposal has been superseded by a proposal from 2016-02-01.

Commit message

Update to qtquick 2.4

Description of the change

Update to qtquick 2.4

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
749. By Renato Araujo Oliveira Filho

Use new page header API.

750. By Renato Araujo Oliveira Filho

Put new event action back to the header.

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Perfect, thanks Renato!

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
751. By Renato Araujo Oliveira Filho

Remove extra component on MonthView header.

752. By Renato Araujo Oliveira Filho

Use hardcoded tab list to avoid problems when running on slow devices.

753. By Renato Araujo Oliveira Filho

Update autopilot tests to work with the new header API.

754. By Renato Araujo Oliveira Filho

Trunk merged.

755. By Renato Araujo Oliveira Filho

Hardcoded tabs actions to avoid problems with the SDK header.

756. By Renato Araujo Oliveira Filho

Removed missing function call.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Unmerged revisions

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-12-06 20:06:50 +0000
3+++ AgendaView.qml 2016-02-01 23:36:27 +0000
4@@ -16,7 +16,7 @@
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.3
12 import Ubuntu.Components.ListItems 1.0 as ListItem
13@@ -55,13 +55,21 @@
14 }
15 }
16
17- head.actions: [
18- calendarTodayAction,
19- commonHeaderActions.showCalendarAction,
20- commonHeaderActions.reloadAction,
21- commonHeaderActions.syncCalendarAction,
22- commonHeaderActions.settingsAction
23- ]
24+ header: PageHeader {
25+ id: pageHeader
26+
27+ title: i18n.tr("Agenda")
28+ leadingActionBar.actions: tabs.tabsAction
29+ trailingActionBar.actions: [
30+ calendarTodayAction,
31+ commonHeaderActions.newEventAction,
32+ commonHeaderActions.showCalendarAction,
33+ commonHeaderActions.reloadAction,
34+ commonHeaderActions.syncCalendarAction,
35+ commonHeaderActions.settingsAction
36+ ]
37+ flickable: eventList
38+ }
39
40 EventListModel {
41 id: eventListModel
42@@ -97,7 +105,7 @@
43
44 return default_title;
45 }
46- visible: (!root.hasEnabledCalendars() || !eventListModel.itemCount) && !eventListModel.isLoading
47+ visible: (eventListModel.count === 0) && !eventListModel.isLoading
48 anchors.centerIn: parent
49 }
50
51
52=== modified file 'AllDayEventComponent.qml'
53--- AllDayEventComponent.qml 2015-12-06 20:06:50 +0000
54+++ AllDayEventComponent.qml 2016-02-01 23:36:27 +0000
55@@ -15,7 +15,7 @@
56 * You should have received a copy of the GNU General Public License
57 * along with this program. If not, see <http://www.gnu.org/licenses/>.
58 */
59-import QtQuick 2.3
60+import QtQuick 2.4
61 import Ubuntu.Components 1.3
62 import Ubuntu.Components.Popups 1.0
63 import QtOrganizer 5.0
64
65=== modified file 'CalendarChoicePopup.qml'
66--- CalendarChoicePopup.qml 2015-10-31 19:56:40 +0000
67+++ CalendarChoicePopup.qml 2016-02-01 23:36:27 +0000
68@@ -15,7 +15,7 @@
69 * You should have received a copy of the GNU General Public License
70 * along with this program. If not, see <http://www.gnu.org/licenses/>.
71 */
72-import QtQuick 2.3
73+import QtQuick 2.4
74 import Ubuntu.Components 1.3
75 import Ubuntu.Components.Popups 1.0
76 import Ubuntu.Components.ListItems 1.0 as ListItem
77
78=== modified file 'CalendarListButtonDelegate.qml'
79--- CalendarListButtonDelegate.qml 2015-10-31 19:56:40 +0000
80+++ CalendarListButtonDelegate.qml 2016-02-01 23:36:27 +0000
81@@ -14,7 +14,7 @@
82 * along with this program. If not, see <http://www.gnu.org/licenses/>.
83 */
84
85-import QtQuick 2.0
86+import QtQuick 2.4
87 import Ubuntu.Components 1.3
88 import Ubuntu.Components.ListItems 1.0 as ListItem
89
90
91=== modified file 'ColorPickerDialog.qml'
92--- ColorPickerDialog.qml 2015-10-31 19:56:40 +0000
93+++ ColorPickerDialog.qml 2016-02-01 23:36:27 +0000
94@@ -15,7 +15,7 @@
95 * You should have received a copy of the GNU General Public License
96 * along with this program. If not, see <http://www.gnu.org/licenses/>.
97 */
98-import QtQuick 2.3
99+import QtQuick 2.4
100 import Ubuntu.Components 1.3
101 import Ubuntu.Components.Popups 1.0
102
103
104=== modified file 'ContactChoicePopup.qml'
105--- ContactChoicePopup.qml 2015-12-06 20:06:50 +0000
106+++ ContactChoicePopup.qml 2016-02-01 23:36:27 +0000
107@@ -15,7 +15,7 @@
108 * You should have received a copy of the GNU General Public License
109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111-import QtQuick 2.3
112+import QtQuick 2.4
113 import Ubuntu.Components 1.3
114 import Ubuntu.Components.Popups 1.0
115 import Ubuntu.Components.ListItems 1.0
116
117=== modified file 'DayHeaderBackground.qml'
118--- DayHeaderBackground.qml 2014-09-20 10:45:35 +0000
119+++ DayHeaderBackground.qml 2016-02-01 23:36:27 +0000
120@@ -15,7 +15,7 @@
121 * You should have received a copy of the GNU General Public License
122 * along with this program. If not, see <http://www.gnu.org/licenses/>.
123 */
124-import QtQuick 2.3
125+import QtQuick 2.4
126
127 Item {
128 width: parent.width
129
130=== modified file 'DayView.qml'
131--- DayView.qml 2016-01-28 23:04:18 +0000
132+++ DayView.qml 2016-02-01 23:36:27 +0000
133@@ -16,7 +16,7 @@
134 * along with this program. If not, see <http://www.gnu.org/licenses/>.
135 */
136
137-import QtQuick 2.3
138+import QtQuick 2.4
139 import Ubuntu.Components 1.3
140 import "dateExt.js" as DateExt
141 import "ViewType.js" as ViewType
142@@ -43,22 +43,27 @@
143 }
144 }
145
146- head {
147- actions: [
148+ header: PageHeader {
149+ id: pageHeader
150+
151+ leadingActionBar.actions: tabs.tabsAction
152+ trailingActionBar.actions: [
153 calendarTodayAction,
154+ commonHeaderActions.newEventAction,
155 commonHeaderActions.showCalendarAction,
156 commonHeaderActions.reloadAction,
157 commonHeaderActions.syncCalendarAction,
158 commonHeaderActions.settingsAction
159 ]
160
161- contents: Label {
162- id:monthYear
163- objectName:"monthYearLabel"
164- fontSize: "large"
165- text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
166- font.capitalization: Font.Capitalize
167+ title: {
168+ // TRANSLATORS: this is a time formatting string,
169+ // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
170+ // It's used in the header of the month and week views
171+ var monthName = currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
172+ return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1)
173 }
174+
175 }
176
177 PathViewBase{
178@@ -69,7 +74,10 @@
179 //This is used to scroll all view together when currentItem scrolls
180 property var childContentY;
181
182- anchors.fill: parent
183+ anchors {
184+ fill: parent
185+ topMargin: header.height
186+ }
187
188 onNextItemHighlighted: {
189 //next day
190
191=== modified file 'Defines.js'
192--- Defines.js 2015-10-31 19:56:40 +0000
193+++ Defines.js 2016-02-01 23:36:27 +0000
194@@ -43,7 +43,7 @@
195
196 function getWeekLabels(){
197 var object = Qt.createQmlObject('\
198- import QtQuick 2.3;\
199+ import QtQuick 2.4;\
200 import Ubuntu.Components 1.3;\
201 QtObject {\
202 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
203
204=== modified file 'DeleteConfirmationDialog.qml'
205--- DeleteConfirmationDialog.qml 2015-10-31 19:56:40 +0000
206+++ DeleteConfirmationDialog.qml 2016-02-01 23:36:27 +0000
207@@ -15,7 +15,7 @@
208 * You should have received a copy of the GNU General Public License
209 * along with this program. If not, see <http://www.gnu.org/licenses/>.
210 */
211-import QtQuick 2.3
212+import QtQuick 2.4
213 import Ubuntu.Components 1.3
214 import Ubuntu.Components.Popups 1.0
215
216
217=== modified file 'EditEventConfirmationDialog.qml'
218--- EditEventConfirmationDialog.qml 2015-10-31 19:56:40 +0000
219+++ EditEventConfirmationDialog.qml 2016-02-01 23:36:27 +0000
220@@ -15,7 +15,7 @@
221 * You should have received a copy of the GNU General Public License
222 * along with this program. If not, see <http://www.gnu.org/licenses/>.
223 */
224-import QtQuick 2.3
225+import QtQuick 2.4
226 import Ubuntu.Components 1.3
227 import Ubuntu.Components.Popups 1.0
228
229
230=== modified file 'EventActions.qml'
231--- EventActions.qml 2015-12-06 20:06:50 +0000
232+++ EventActions.qml 2016-02-01 23:36:27 +0000
233@@ -16,16 +16,14 @@
234 * along with this program. If not, see <http://www.gnu.org/licenses/>.
235 */
236
237-import QtQuick 2.3
238+import QtQuick 2.4
239 import Ubuntu.Components 1.3
240 import Ubuntu.SyncMonitor 0.1
241
242 Item {
243 id: actionPool
244
245- //removing till following bug is resolved
246- //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178
247- //property alias newEventAction: _newEventAction
248+ property alias newEventAction: _newEventAction
249 property alias showCalendarAction: _showCalendarAction
250 property alias syncCalendarAction: _syncCalendarAction
251 property alias settingsAction: _settingsAction
252@@ -49,6 +47,7 @@
253 Action {
254 id: _newEventAction
255 objectName: "neweventbutton"
256+ name: "neweventbutton"
257 iconName: "new-event"
258 text: i18n.tr("New Event")
259 onTriggered: {
260@@ -59,6 +58,7 @@
261 Action{
262 id: _showCalendarAction
263 objectName: "calendarsbutton"
264+ name: "calendarsbutton"
265 iconName: "calendar"
266 text: i18n.tr("Calendars")
267 onTriggered: {
268@@ -70,6 +70,7 @@
269 Action{
270 id: _settingsAction
271 objectName: "settingsbutton"
272+ name: "calendarsbutton"
273 iconName: "settings"
274 text: i18n.tr("Settings")
275 onTriggered: {
276
277=== modified file 'EventBubble.qml'
278--- EventBubble.qml 2015-12-06 20:06:50 +0000
279+++ EventBubble.qml 2016-02-01 23:36:27 +0000
280@@ -16,7 +16,7 @@
281 * along with this program. If not, see <http://www.gnu.org/licenses/>.
282 */
283
284-import QtQuick 2.3
285+import QtQuick 2.4
286 import Ubuntu.Components 1.3
287 import QtOrganizer 5.0
288
289
290=== modified file 'EventDetails.qml'
291--- EventDetails.qml 2016-01-28 23:04:18 +0000
292+++ EventDetails.qml 2016-02-01 23:36:27 +0000
293@@ -15,7 +15,7 @@
294 * You should have received a copy of the GNU General Public License
295 * along with this program. If not, see <http://www.gnu.org/licenses/>.
296 */
297-import QtQuick 2.3
298+import QtQuick 2.4
299 import Ubuntu.Components 1.3
300 import Ubuntu.Components.ListItems 1.0 as ListItem
301 import Ubuntu.Components.Themes.Ambiance 1.0
302@@ -209,7 +209,7 @@
303 dialog.editEvent.connect( function(eventId){
304 if( eventId === event.parentId ) {
305 showEditEventPage(internal.parentEvent, model)
306- } else {
307+ } else {
308 showEditEventPage(event, model)
309 }
310 });
311
312=== modified file 'EventListModel.qml'
313--- EventListModel.qml 2015-08-24 05:08:46 +0000
314+++ EventListModel.qml 2016-02-01 23:36:27 +0000
315@@ -15,7 +15,7 @@
316 * You should have received a copy of the GNU General Public License
317 * along with this program. If not, see <http://www.gnu.org/licenses/>.
318 */
319-import QtQuick 2.3
320+import QtQuick 2.4
321 import QtOrganizer 5.0
322
323 OrganizerModel {
324@@ -41,7 +41,7 @@
325 }
326
327 function startLoadingTimer() {
328- var newObject = Qt.createQmlObject("import QtQuick 2.3; Timer {interval: 1000; running: true; repeat: false;}",
329+ var newObject = Qt.createQmlObject("import QtQuick 2.4; Timer {interval: 1000; running: true; repeat: false;}",
330 eventModel, "EventListMode.qml");
331 newObject.onTriggered.connect( function(){
332 var items = itemsByTimePeriod(eventModel.startPeriod, eventModel.endPeriod);
333@@ -73,7 +73,7 @@
334 }
335 }
336 return cals;
337- }
338+ }
339
340 function getWritableCollections(){
341 var cals = [];
342
343=== modified file 'EventReminder.qml'
344--- EventReminder.qml 2015-10-31 19:56:40 +0000
345+++ EventReminder.qml 2016-02-01 23:36:27 +0000
346@@ -16,7 +16,7 @@
347 * along with this program. If not, see <http://www.gnu.org/licenses/>.
348 */
349
350-import QtQuick 2.3
351+import QtQuick 2.4
352 import Ubuntu.Components 1.3
353 import Ubuntu.Components.ListItems 1.0 as ListItem
354
355
356=== modified file 'EventRepetition.qml'
357--- EventRepetition.qml 2015-10-31 19:56:40 +0000
358+++ EventRepetition.qml 2016-02-01 23:36:27 +0000
359@@ -16,7 +16,7 @@
360 * along with this program. If not, see <http://www.gnu.org/licenses/>.
361 */
362
363-import QtQuick 2.3
364+import QtQuick 2.4
365 import QtOrganizer 5.0
366 import Ubuntu.Components 1.3
367 import Ubuntu.Components.ListItems 1.0 as ListItem
368
369=== modified file 'EventUtils.qml'
370--- EventUtils.qml 2015-10-31 19:56:40 +0000
371+++ EventUtils.qml 2016-02-01 23:36:27 +0000
372@@ -16,7 +16,7 @@
373 * along with this program. If not, see <http://www.gnu.org/licenses/>.
374 */
375
376-import QtQuick 2.3
377+import QtQuick 2.4
378 import Ubuntu.Components 1.3
379 import QtOrganizer 5.0
380 import "Defines.js" as Defines
381
382=== modified file 'HeaderDateComponent.qml'
383--- HeaderDateComponent.qml 2015-10-31 19:56:40 +0000
384+++ HeaderDateComponent.qml 2016-02-01 23:36:27 +0000
385@@ -16,7 +16,7 @@
386 * along with this program. If not, see <http://www.gnu.org/licenses/>.
387 */
388
389-import QtQuick 2.3
390+import QtQuick 2.4
391 import Ubuntu.Components 1.3
392
393 Item {
394
395=== modified file 'KeyboardRectangle.qml'
396--- KeyboardRectangle.qml 2014-09-20 10:45:35 +0000
397+++ KeyboardRectangle.qml 2016-02-01 23:36:27 +0000
398@@ -16,7 +16,7 @@
399 * along with this program. If not, see <http://www.gnu.org/licenses/>.
400 */
401
402-import QtQuick 2.3
403+import QtQuick 2.4
404
405 Item {
406 id: keyboardRect
407
408=== modified file 'LimitLabelModel.qml'
409--- LimitLabelModel.qml 2014-10-22 17:32:15 +0000
410+++ LimitLabelModel.qml 2016-02-01 23:36:27 +0000
411@@ -15,7 +15,7 @@
412 * You should have received a copy of the GNU General Public License
413 * along with this program. If not, see <http://www.gnu.org/licenses/>.
414 */
415-import QtQuick 2.3;
416+import QtQuick 2.4
417
418 ListModel {
419 id:limitLables
420
421=== modified file 'MonthComponent.qml'
422--- MonthComponent.qml 2016-01-28 23:04:18 +0000
423+++ MonthComponent.qml 2016-02-01 23:36:27 +0000
424@@ -15,7 +15,7 @@
425 * You should have received a copy of the GNU General Public License
426 * along with this program. If not, see <http://www.gnu.org/licenses/>.
427 */
428-import QtQuick 2.3
429+import QtQuick 2.4
430 import Ubuntu.Components 1.3
431 import "dateExt.js" as DateExt
432 import "colorUtils.js" as Color
433
434=== modified file 'MonthComponentDateDelegate.qml'
435--- MonthComponentDateDelegate.qml 2015-10-31 19:56:40 +0000
436+++ MonthComponentDateDelegate.qml 2016-02-01 23:36:27 +0000
437@@ -1,4 +1,4 @@
438-import QtQuick 2.0
439+import QtQuick 2.4
440 import Ubuntu.Components 1.3
441
442 Item{
443
444=== modified file 'MonthView.qml'
445--- MonthView.qml 2016-01-28 23:04:18 +0000
446+++ MonthView.qml 2016-02-01 23:36:27 +0000
447@@ -15,7 +15,7 @@
448 * You should have received a copy of the GNU General Public License
449 * along with this program. If not, see <http://www.gnu.org/licenses/>.
450 */
451-import QtQuick 2.3
452+import QtQuick 2.4
453 import Ubuntu.Components 1.3
454 import "dateExt.js" as DateExt
455 import "colorUtils.js" as Color
456@@ -42,24 +42,27 @@
457 }
458 }
459
460- head {
461- actions: [
462+ header: PageHeader {
463+ id: pageHeader
464+
465+ leadingActionBar.actions: tabs.tabsAction
466+ trailingActionBar.actions: [
467 calendarTodayAction,
468+ commonHeaderActions.newEventAction,
469 commonHeaderActions.showCalendarAction,
470 commonHeaderActions.reloadAction,
471 commonHeaderActions.syncCalendarAction,
472 commonHeaderActions.settingsAction
473 ]
474-
475- contents: Label {
476- objectName:"monthYearLabel"
477- fontSize: "large"
478+ title: {
479 // TRANSLATORS: this is a time formatting string,
480 // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
481 // It's used in the header of the month and week views
482- text: currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
483- font.capitalization: Font.Capitalize
484+ var monthName = currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
485+ return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1)
486 }
487+
488+ flickable: null
489 }
490
491 PathViewBase{
492@@ -68,10 +71,10 @@
493
494 property var startMonth: currentMonth;
495
496- anchors.top:parent.top
497-
498- width:parent.width
499- height: parent.height
500+ anchors {
501+ fill: parent
502+ topMargin: header.height
503+ }
504
505 onNextItemHighlighted: {
506 nextMonth();
507
508=== modified file 'NewEvent.qml'
509--- NewEvent.qml 2015-12-06 20:06:50 +0000
510+++ NewEvent.qml 2016-02-01 23:36:27 +0000
511@@ -16,7 +16,7 @@
512 * along with this program. If not, see <http://www.gnu.org/licenses/>.
513 */
514
515-import QtQuick 2.3
516+import QtQuick 2.4
517 import QtOrganizer 5.0
518 import Ubuntu.Components 1.3
519 import Ubuntu.Components.Popups 1.0
520
521=== modified file 'NewEventEntryField.qml'
522--- NewEventEntryField.qml 2015-10-31 19:56:40 +0000
523+++ NewEventEntryField.qml 2016-02-01 23:36:27 +0000
524@@ -16,7 +16,7 @@
525 * along with this program. If not, see <http://www.gnu.org/licenses/>.
526 */
527
528-import QtQuick 2.3
529+import QtQuick 2.4
530 import Ubuntu.Components 1.3
531
532 Label {
533
534=== modified file 'NewEventTimePicker.qml'
535--- NewEventTimePicker.qml 2014-10-21 18:58:31 +0000
536+++ NewEventTimePicker.qml 2016-02-01 23:36:27 +0000
537@@ -1,4 +1,4 @@
538-import QtQuick 2.3
539+import QtQuick 2.4
540 import Ubuntu.Components.ListItems 1.0 as ListItem
541 import Ubuntu.Components.Themes.Ambiance 1.0
542 import Ubuntu.Components.Pickers 1.0
543
544=== modified file 'OnlineAccountsHelper.qml'
545--- OnlineAccountsHelper.qml 2015-10-31 19:56:40 +0000
546+++ OnlineAccountsHelper.qml 2016-02-01 23:36:27 +0000
547@@ -14,7 +14,7 @@
548 * along with this program. If not, see <http://www.gnu.org/licenses/>.
549 */
550
551-import QtQuick 2.2
552+import QtQuick 2.4
553 import Ubuntu.Components 1.3
554 import Ubuntu.OnlineAccounts 0.1
555 import Ubuntu.OnlineAccounts.Client 0.1
556
557=== modified file 'PathViewBase.qml'
558--- PathViewBase.qml 2015-08-29 08:59:47 +0000
559+++ PathViewBase.qml 2016-02-01 23:36:27 +0000
560@@ -15,7 +15,7 @@
561 * You should have received a copy of the GNU General Public License
562 * along with this program. If not, see <http://www.gnu.org/licenses/>.
563 */
564-import QtQuick 2.3
565+import QtQuick 2.4
566
567 PathView {
568 id: root
569
570=== modified file 'RecurrenceLabelDefines.qml'
571--- RecurrenceLabelDefines.qml 2015-10-31 19:56:40 +0000
572+++ RecurrenceLabelDefines.qml 2016-02-01 23:36:27 +0000
573@@ -16,7 +16,7 @@
574 * along with this program. If not, see <http://www.gnu.org/licenses/>.
575 */
576
577-import QtQuick 2.3
578+import QtQuick 2.4
579 import Ubuntu.Components 1.3
580
581 QtObject {
582
583=== modified file 'RemindersModel.qml'
584--- RemindersModel.qml 2014-10-17 05:42:34 +0000
585+++ RemindersModel.qml 2016-02-01 23:36:27 +0000
586@@ -16,7 +16,7 @@
587 * along with this program. If not, see <http://www.gnu.org/licenses/>.
588 */
589
590-import QtQuick 2.3
591+import QtQuick 2.4
592
593 ListModel {
594 id: reminderModel
595
596=== modified file 'ScrollAnimation.qml'
597--- ScrollAnimation.qml 2014-09-20 10:45:35 +0000
598+++ ScrollAnimation.qml 2016-02-01 23:36:27 +0000
599@@ -1,4 +1,4 @@
600-import QtQuick 2.3
601+import QtQuick 2.4
602
603 PropertyAnimation {
604 duration: 500
605
606=== modified file 'Scroller.qml'
607--- Scroller.qml 2015-10-31 19:56:40 +0000
608+++ Scroller.qml 2016-02-01 23:36:27 +0000
609@@ -16,7 +16,7 @@
610 * along with this program. If not, see <http://www.gnu.org/licenses/>.
611 */
612
613-import QtQuick 2.3
614+import QtQuick 2.4
615 import Ubuntu.Components 1.3
616 import Ubuntu.Components.ListItems 1.0 as ListItems
617
618
619=== modified file 'Settings.qml'
620--- Settings.qml 2016-01-29 09:35:09 +0000
621+++ Settings.qml 2016-02-01 23:36:27 +0000
622@@ -15,7 +15,7 @@
623 * You should have received a copy of the GNU General Public License
624 * along with this program. If not, see <http://www.gnu.org/licenses/>.
625 */
626-import QtQuick 2.3
627+import QtQuick 2.4
628 import Ubuntu.Components 1.3
629 import Ubuntu.Components.Popups 1.0
630 import Ubuntu.Components.ListItems 1.0 as ListItem
631
632=== modified file 'SimpleDivider.qml'
633--- SimpleDivider.qml 2014-12-11 20:29:27 +0000
634+++ SimpleDivider.qml 2016-02-01 23:36:27 +0000
635@@ -16,7 +16,7 @@
636 * along with this program. If not, see <http://www.gnu.org/licenses/>.
637 */
638
639-import QtQuick 2.0
640+import QtQuick 2.4
641
642 Rectangle{
643 height: units.gu(0.1)
644
645=== modified file 'TimeLineBackground.qml'
646--- TimeLineBackground.qml 2015-10-31 19:56:40 +0000
647+++ TimeLineBackground.qml 2016-02-01 23:36:27 +0000
648@@ -16,7 +16,7 @@
649 * along with this program. If not, see <http://www.gnu.org/licenses/>.
650 */
651
652-import QtQuick 2.3
653+import QtQuick 2.4
654 import Ubuntu.Components 1.3
655
656 Column {
657
658=== modified file 'TimeLineBase.qml'
659--- TimeLineBase.qml 2015-10-31 19:56:40 +0000
660+++ TimeLineBase.qml 2016-02-01 23:36:27 +0000
661@@ -15,7 +15,7 @@
662 * You should have received a copy of the GNU General Public License
663 * along with this program. If not, see <http://www.gnu.org/licenses/>.
664 */
665-import QtQuick 2.3
666+import QtQuick 2.4
667 import Ubuntu.Components 1.3
668 import QtOrganizer 5.0
669
670
671=== modified file 'TimeLineBaseComponent.qml'
672--- TimeLineBaseComponent.qml 2015-12-06 20:06:50 +0000
673+++ TimeLineBaseComponent.qml 2016-02-01 23:36:27 +0000
674@@ -16,8 +16,7 @@
675 * along with this program. If not, see <http://www.gnu.org/licenses/>.
676 */
677
678-import QtQuick 2.3
679-import QtQuick.Layouts 1.1
680+import QtQuick 2.4
681 import Ubuntu.Components 1.3
682 import Ubuntu.Components.Popups 1.0
683 import QtOrganizer 5.0
684
685=== modified file 'TimeLineHeader.qml'
686--- TimeLineHeader.qml 2015-10-31 19:56:40 +0000
687+++ TimeLineHeader.qml 2016-02-01 23:36:27 +0000
688@@ -16,9 +16,8 @@
689 * along with this program. If not, see <http://www.gnu.org/licenses/>.
690 */
691
692-import QtQuick 2.0
693+import QtQuick 2.4
694 import Ubuntu.Components 1.3
695-import QtQuick.Layouts 1.1
696
697 import "ViewType.js" as ViewType
698
699@@ -50,7 +49,7 @@
700 id: weekNumLabel
701 objectName: "weeknumber"
702
703- // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
704+ // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
705 text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek))
706 fontSize: "small"
707 height: units.gu(5)
708
709=== modified file 'TimeLineHeaderComponent.qml'
710--- TimeLineHeaderComponent.qml 2015-10-31 19:56:40 +0000
711+++ TimeLineHeaderComponent.qml 2016-02-01 23:36:27 +0000
712@@ -16,7 +16,7 @@
713 * along with this program. If not, see <http://www.gnu.org/licenses/>.
714 */
715
716-import QtQuick 2.3
717+import QtQuick 2.4
718 import Ubuntu.Components 1.3
719 import "dateExt.js" as DateExt
720 import "ViewType.js" as ViewType
721
722=== modified file 'TimeLineTimeScale.qml'
723--- TimeLineTimeScale.qml 2015-10-31 19:56:40 +0000
724+++ TimeLineTimeScale.qml 2016-02-01 23:36:27 +0000
725@@ -16,7 +16,7 @@
726 * along with this program. If not, see <http://www.gnu.org/licenses/>.
727 */
728
729-import QtQuick 2.0
730+import QtQuick 2.4
731 import Ubuntu.Components 1.3
732
733 Flickable{
734
735=== modified file 'TimeSeparator.qml'
736--- TimeSeparator.qml 2014-09-20 10:45:35 +0000
737+++ TimeSeparator.qml 2016-02-01 23:36:27 +0000
738@@ -15,7 +15,7 @@
739 * You should have received a copy of the GNU General Public License
740 * along with this program. If not, see <http://www.gnu.org/licenses/>.
741 */
742-import QtQuick 2.3
743+import QtQuick 2.4
744
745 Rectangle {
746 id: separator
747
748=== modified file 'ViewHeader.qml'
749--- ViewHeader.qml 2016-01-28 23:04:18 +0000
750+++ ViewHeader.qml 2016-02-01 23:36:27 +0000
751@@ -15,7 +15,7 @@
752 * You should have received a copy of the GNU General Public License
753 * along with this program. If not, see <http://www.gnu.org/licenses/>.
754 */
755-import QtQuick 2.3
756+import QtQuick 2.4
757 import Ubuntu.Components 1.3
758
759 Item{
760
761=== modified file 'WeekView.qml'
762--- WeekView.qml 2016-01-28 23:04:18 +0000
763+++ WeekView.qml 2016-02-01 23:36:27 +0000
764@@ -16,7 +16,7 @@
765 * along with this program. If not, see <http://www.gnu.org/licenses/>.
766 */
767
768-import QtQuick 2.3
769+import QtQuick 2.4
770 import Ubuntu.Components 1.3
771 import "dateExt.js" as DateExt
772 import "ViewType.js" as ViewType
773@@ -47,29 +47,37 @@
774 }
775 }
776
777- head {
778- actions: [
779+ header: PageHeader {
780+ id: pageHeader
781+
782+ leadingActionBar.actions: tabs.tabsAction
783+ trailingActionBar.actions: [
784 calendarTodayAction,
785+ commonHeaderActions.newEventAction,
786 commonHeaderActions.showCalendarAction,
787 commonHeaderActions.reloadAction,
788 commonHeaderActions.syncCalendarAction,
789 commonHeaderActions.settingsAction
790 ]
791
792- contents: Label {
793- id:monthYear
794- objectName:"monthYearLabel"
795- fontSize: "large"
796- text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
797- font.capitalization: Font.Capitalize
798+ title: {
799+ // TRANSLATORS: this is a time formatting string,
800+ // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
801+ // It's used in the header of the month and week views
802+ var monthName = dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
803+ return monthName[0].toUpperCase() + monthName.substr(1, monthName.length - 1)
804 }
805+ flickable: null
806 }
807
808 PathViewBase{
809 id: weekViewPath
810 objectName: "weekviewpathbase"
811
812- anchors.fill: parent
813+ anchors {
814+ fill: parent
815+ topMargin: header.height
816+ }
817
818 //This is used to scroll all view together when currentItem scrolls
819 property var childContentY;
820
821=== modified file 'YearView.qml'
822--- YearView.qml 2016-01-28 23:04:18 +0000
823+++ YearView.qml 2016-02-01 23:36:27 +0000
824@@ -16,7 +16,7 @@
825 * along with this program. If not, see <http://www.gnu.org/licenses/>.
826 */
827
828-import QtQuick 2.3
829+import QtQuick 2.4
830 import Ubuntu.Components 1.3
831
832 import "dateExt.js" as DateExt
833@@ -45,27 +45,30 @@
834 }
835 }
836
837- head {
838- actions: [
839+ header: PageHeader {
840+ id: pageHeader
841+
842+ leadingActionBar.actions: tabs.tabsAction
843+ trailingActionBar.actions: [
844 calendarTodayAction,
845+ commonHeaderActions.newEventAction,
846 commonHeaderActions.showCalendarAction,
847 commonHeaderActions.reloadAction,
848 commonHeaderActions.syncCalendarAction,
849 commonHeaderActions.settingsAction
850 ]
851- contents: Label {
852- id:year
853- objectName:"yearLabel"
854- fontSize: "large"
855- text: i18n.tr("Year %1").arg(currentYear)
856- }
857+ title: i18n.tr("Year %1").arg(currentYear)
858+ flickable: null
859 }
860
861 PathViewBase {
862 id: yearPathView
863 objectName: "yearPathView"
864
865- anchors.fill: parent
866+ anchors {
867+ fill: parent
868+ topMargin: header.height
869+ }
870
871 onNextItemHighlighted: {
872 currentYear = currentYear + 1;
873
874=== modified file 'YearViewDelegate.qml'
875--- YearViewDelegate.qml 2015-12-06 20:06:50 +0000
876+++ YearViewDelegate.qml 2016-02-01 23:36:27 +0000
877@@ -1,4 +1,4 @@
878-import QtQuick 2.0
879+import QtQuick 2.4
880 import Ubuntu.Components 1.3
881
882 GridView{
883
884=== modified file 'calendar.qml'
885--- calendar.qml 2015-12-06 20:06:50 +0000
886+++ calendar.qml 2016-02-01 23:36:27 +0000
887@@ -15,7 +15,7 @@
888 * You should have received a copy of the GNU General Public License
889 * along with this program. If not, see <http://www.gnu.org/licenses/>.
890 */
891-import QtQuick 2.3
892+import QtQuick 2.4
893 import Ubuntu.Components 1.3
894 import Ubuntu.Components.Popups 1.0
895 import QtOrganizer 5.0
896@@ -210,6 +210,17 @@
897 }
898 }
899
900+
901+ EventActions {
902+ id: commonHeaderActions
903+ }
904+
905+ Settings {
906+ id: settings
907+ property alias defaultViewIndex: tabs.selectedTabIndex
908+ property alias showWeekNumber: mainView.displayWeekNumber
909+ }
910+
911 Tabs{
912 id: tabs
913 Keys.forwardTo: [tabs.currentPage]
914@@ -281,6 +292,32 @@
915 endtime = url.match(/endtime=(\d+)/)[0].replace("endtime=", '');
916 }
917
918+ //WORKAROUND: The new header api does not work with tabs check bug: #1539759
919+ property var tabsAction: []
920+
921+ function createTabAction(index, title, name)
922+ {
923+ var actionQml = "import Ubuntu.Components 1.3; Action { objectName: \"tab_%3\"; name: \"tab_%3\"; visible: (tabs.selectedTabIndex != %2); text: i18n.tr(\"%1\"); onTriggered: { tabs.selectedTabIndex = %2; }}"
924+ return Qt.createQmlObject(actionQml.arg(title).arg(index).arg(name), tabs, "tabs.qml")
925+ }
926+
927+ function reloadTabActions()
928+ {
929+ var allPages = [
930+ {index: 0, name: yearTab.objectName, title: yearTab.title},
931+ {index: 1, name: monthTab.objectName, title: monthTab.title},
932+ {index: 2, name: weekTab.objectName, title: weekTab.title},
933+ {index: 3, name: dayTab.objectName, title: dayTab.title},
934+ {index: 4, name: agendaTab.objectName, title: agendaTab.title},
935+ ]
936+ var acts = []
937+ for(var i=0; i< allPages.length; i++) {
938+ var pageInfo = allPages[i]
939+ acts.push(createTabAction(pageInfo.index, pageInfo.title, pageInfo.name))
940+ }
941+ tabsAction = acts
942+ }
943+
944 Component.onCompleted: {
945 // If an url has been set
946 if (args.defaultArgument.at(0)) {
947@@ -313,17 +350,10 @@
948 else {
949 tabs.selectedTabIndex = settings.defaultViewIndex;
950 }
951+
952+ reloadTabActions()
953 } // End of Component.onCompleted:
954
955- EventActions {
956- id: commonHeaderActions
957- }
958-
959- Settings {
960- id: settings
961- property alias defaultViewIndex: tabs.selectedTabIndex
962- property alias showWeekNumber: mainView.displayWeekNumber
963- }
964
965 Keys.onTabPressed: {
966 if( event.modifiers & Qt.ControlModifier) {
967
968=== modified file 'calendarTests.qml'
969--- calendarTests.qml 2015-10-31 19:56:40 +0000
970+++ calendarTests.qml 2016-02-01 23:36:27 +0000
971@@ -15,7 +15,7 @@
972 * You should have received a copy of the GNU General Public License
973 * along with this program. If not, see <http://www.gnu.org/licenses/>.
974 */
975-import QtQuick 2.3
976+import QtQuick 2.4
977 import Ubuntu.Components 1.3
978
979 MainView {
980
981=== modified file 'tests/autopilot/calendar_app/__init__.py'
982--- tests/autopilot/calendar_app/__init__.py 2015-06-27 17:52:44 +0000
983+++ tests/autopilot/calendar_app/__init__.py 2016-02-01 23:36:27 +0000
984@@ -62,6 +62,23 @@
985 self.visible.wait_for(True, 30)
986
987 @autopilot.logging.log_action(logger.info)
988+ def switch_to_tab(self, tabName):
989+ # open tab switcher menu
990+ current_tab = self.select_single('Tab', visible=True)
991+ overflow_tabs = current_tab.wait_select_single(objectName='overflow_action_button')
992+ self.pointing_device.click_object(overflow_tabs)
993+
994+ # click on tab action
995+ tab_button = self.wait_select_single(objectName='tab_%s_button'%tabName)
996+ self.pointing_device.click_object(tab_button)
997+
998+ @autopilot.logging.log_action(logger.info)
999+ def click_action_button(self, action):
1000+ current_tab = self.select_single('Tab', visible=True)
1001+ button = current_tab.wait_select_single(objectName='%s_button'%action)
1002+ self.pointing_device.click_object(button)
1003+
1004+ @autopilot.logging.log_action(logger.info)
1005 def go_to_month_view(self):
1006 """Open the month view.
1007
1008@@ -138,8 +155,7 @@
1009 :return: The New Event page.
1010
1011 """
1012- header = self.get_header()
1013- header.click_action_button('neweventbutton')
1014+ self.click_action_button('neweventbutton')
1015 return self.wait_select_single(NewEvent, objectName='newEventPage')
1016
1017 @autopilot.logging.log_action(logger.info)
1018@@ -149,8 +165,7 @@
1019 :return: CalendaChoicePopup.
1020
1021 """
1022- header = self.get_header()
1023- header.click_action_button('calendarsbutton')
1024+ self.click_action_button('calendarsbutton')
1025 return self.wait_select_single(
1026 CalendarChoicePopup, objectName="calendarchoicepopup")
1027
1028@@ -292,14 +307,8 @@
1029 local = utc.astimezone(tz.tzlocal())
1030 return local
1031
1032- @autopilot.logging.log_action(logger.info)
1033- def get_header(self):
1034- return self.wait_select_single(
1035- "AppHeader", objectName="MainView_Header")
1036-
1037 def press_header_todaybutton(self):
1038- header = self.get_header()
1039- header.click_action_button('todaybutton')
1040+ self.click_action_button('todaybutton')
1041
1042 @autopilot.logging.log_action(logger.info)
1043 def get_color_picker_dialog(self):
1044@@ -308,8 +317,7 @@
1045
1046 @autopilot.logging.log_action(logger.info)
1047 def press_header_custombackbutton(self):
1048- header = self.get_header()
1049- header.click_custom_back_button()
1050+ self.click_custom_back_button()
1051
1052
1053 class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

Subscribers

People subscribed via source and target branches

to status/vote changes: