Merge lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 into lp:ubuntu-calendar-app

Proposed by Kunal Parmar on 2015-10-31
Status: Rejected
Rejected by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2016-01-29
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3
Merge into: lp:ubuntu-calendar-app
Diff against target: 803 lines (+76/-93)
38 files modified
AgendaView.qml (+1/-2)
AllDayEventComponent.qml (+1/-1)
CalendarChoicePopup.qml (+1/-1)
CalendarListButtonDelegate.qml (+1/-1)
ColorPickerDialog.qml (+1/-1)
ContactChoicePopup.qml (+1/-1)
DayView.qml (+1/-2)
Defines.js (+1/-1)
DeleteConfirmationDialog.qml (+1/-1)
EditEventConfirmationDialog.qml (+1/-1)
EventActions.qml (+4/-2)
EventBubble.qml (+1/-1)
EventDetails.qml (+1/-1)
EventReminder.qml (+1/-1)
EventRepetition.qml (+1/-1)
EventUtils.qml (+1/-1)
HeaderDateComponent.qml (+1/-1)
MonthComponent.qml (+1/-1)
MonthComponentDateDelegate.qml (+1/-1)
MonthView.qml (+1/-2)
NewEvent.qml (+1/-1)
NewEventEntryField.qml (+1/-1)
OnlineAccountsHelper.qml (+1/-1)
RecurrenceLabelDefines.qml (+1/-1)
Scroller.qml (+1/-1)
TimeLineBackground.qml (+1/-1)
TimeLineBase.qml (+1/-1)
TimeLineBaseComponent.qml (+1/-1)
TimeLineHeader.qml (+1/-1)
TimeLineHeaderComponent.qml (+1/-1)
TimeLineTimeScale.qml (+1/-1)
ViewHeader.qml (+1/-1)
WeekView.qml (+1/-2)
YearView.qml (+1/-2)
YearViewDelegate.qml (+1/-1)
calendar.qml (+1/-3)
calendarTests.qml (+1/-1)
po/com.ubuntu.calendar.pot (+36/-48)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ 2015-10-31 Needs Fixing on 2016-01-12
Jenkins Bot continuous-integration Approve on 2015-12-06
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-11-01
Review via email: mp+276338@code.launchpad.net

Commit message

Resolves Bug #1508363
Migrating to UITK 1.3

Description of the change

Resolves Bug #1508363
Migrating to UITK 1.3

To post a comment you must log in.
review: Approve (continuous-integration)
review: Approve (continuous-integration)
721. By Kunal Parmar on 2015-11-01

error resolved

review: Approve (continuous-integration)
review: Approve (continuous-integration)

Looks good, however the month name over-runs into the icons.

http://people.canonical.com/~alan/screenshots/device-2015-11-10-110730.png

I'm told we have two options:-

1) Implement our own header and elide the month name
or
2) Use the header, and remove one of the icons (we should have 3 max, we have 4 [burger menu, today, add event, kebab menu]).

I'd propose (2), but I'm not sure which icon to move to the kebab menu. Gut feeling is we should move 'add event' to the kebab menu now we've made it easy to add events by tapping on a time slot in the day view. The today icon should stay in the header as it's a useful tool to get back to today if you've been scanning around the calendar.

What do you think?

review: Needs Fixing
Kunal Parmar (pkunal-parmar) wrote :

I think easiest option is 2), and Yes I agree, there ware many ways to create new event, but only one way to go to today. So I guess we should keep go to today available and move new event to menu.

Agreed! Lets do it.

Kunal Parmar (pkunal-parmar) wrote :

There is bug in UITK which prevent us to move icon to tray
https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178

722. By Kunal Parmar on 2015-12-06

removed new event from tray

Kunal Parmar (pkunal-parmar) wrote :

removed new event action from tray, this should resolve icon overlap issue

review: Needs Fixing (continuous-integration)
723. By Kunal Parmar on 2015-12-06

test

review: Needs Fixing (continuous-integration)
724. By Kunal Parmar on 2015-12-06

merge from trunk

review: Approve (continuous-integration)

It still overlaps on long month names. I think we need to switch to the short version of the month name so they fit, or perhaps use a smaller font.

http://people.canonical.com/~alan/screenshots/device-2016-01-12-205023.png

review: Needs Fixing

Sorry, commented on wrong merge. I meant the other merge duplicates this. We need to reconcile these.

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-07-11 02:18:03 +0000
3+++ AgendaView.qml 2015-12-06 20:07:09 +0000
4@@ -18,7 +18,7 @@
5
6 import QtQuick 2.3
7 import QtOrganizer 5.0
8-import Ubuntu.Components 1.1
9+import Ubuntu.Components 1.3
10 import Ubuntu.Components.ListItems 1.0 as ListItem
11 import "dateExt.js" as DateExt
12
13@@ -57,7 +57,6 @@
14
15 head.actions: [
16 calendarTodayAction,
17- commonHeaderActions.newEventAction,
18 commonHeaderActions.showCalendarAction,
19 commonHeaderActions.reloadAction,
20 commonHeaderActions.syncCalendarAction,
21
22=== modified file 'AllDayEventComponent.qml'
23--- AllDayEventComponent.qml 2015-08-07 06:20:23 +0000
24+++ AllDayEventComponent.qml 2015-12-06 20:07:09 +0000
25@@ -16,7 +16,7 @@
26 * along with this program. If not, see <http://www.gnu.org/licenses/>.
27 */
28 import QtQuick 2.3
29-import Ubuntu.Components 1.1
30+import Ubuntu.Components 1.3
31 import Ubuntu.Components.Popups 1.0
32 import QtOrganizer 5.0
33
34
35=== modified file 'CalendarChoicePopup.qml'
36--- CalendarChoicePopup.qml 2015-05-28 13:56:12 +0000
37+++ CalendarChoicePopup.qml 2015-12-06 20:07:09 +0000
38@@ -16,7 +16,7 @@
39 * along with this program. If not, see <http://www.gnu.org/licenses/>.
40 */
41 import QtQuick 2.3
42-import Ubuntu.Components 1.1
43+import Ubuntu.Components 1.3
44 import Ubuntu.Components.Popups 1.0
45 import Ubuntu.Components.ListItems 1.0 as ListItem
46 import QtOrganizer 5.0
47
48=== modified file 'CalendarListButtonDelegate.qml'
49--- CalendarListButtonDelegate.qml 2015-05-28 13:58:30 +0000
50+++ CalendarListButtonDelegate.qml 2015-12-06 20:07:09 +0000
51@@ -15,7 +15,7 @@
52 */
53
54 import QtQuick 2.0
55-import Ubuntu.Components 1.1
56+import Ubuntu.Components 1.3
57 import Ubuntu.Components.ListItems 1.0 as ListItem
58
59 ListItem.Standard {
60
61=== modified file 'ColorPickerDialog.qml'
62--- ColorPickerDialog.qml 2015-04-14 19:52:04 +0000
63+++ ColorPickerDialog.qml 2015-12-06 20:07:09 +0000
64@@ -16,7 +16,7 @@
65 * along with this program. If not, see <http://www.gnu.org/licenses/>.
66 */
67 import QtQuick 2.3
68-import Ubuntu.Components 1.1
69+import Ubuntu.Components 1.3
70 import Ubuntu.Components.Popups 1.0
71
72 Dialog {
73
74=== modified file 'ContactChoicePopup.qml'
75--- ContactChoicePopup.qml 2015-05-14 03:36:22 +0000
76+++ ContactChoicePopup.qml 2015-12-06 20:07:09 +0000
77@@ -16,7 +16,7 @@
78 * along with this program. If not, see <http://www.gnu.org/licenses/>.
79 */
80 import QtQuick 2.3
81-import Ubuntu.Components 1.1
82+import Ubuntu.Components 1.3
83 import Ubuntu.Components.Popups 1.0
84 import Ubuntu.Components.ListItems 1.0
85 import Ubuntu.Components.Themes.Ambiance 1.0
86
87=== modified file 'DayView.qml'
88--- DayView.qml 2015-11-23 07:15:20 +0000
89+++ DayView.qml 2015-12-06 20:07:09 +0000
90@@ -17,7 +17,7 @@
91 */
92
93 import QtQuick 2.3
94-import Ubuntu.Components 1.1
95+import Ubuntu.Components 1.3
96 import "dateExt.js" as DateExt
97 import "ViewType.js" as ViewType
98
99@@ -46,7 +46,6 @@
100 head {
101 actions: [
102 calendarTodayAction,
103- commonHeaderActions.newEventAction,
104 commonHeaderActions.showCalendarAction,
105 commonHeaderActions.reloadAction,
106 commonHeaderActions.syncCalendarAction,
107
108=== modified file 'Defines.js'
109--- Defines.js 2014-10-22 14:03:01 +0000
110+++ Defines.js 2015-12-06 20:07:09 +0000
111@@ -44,7 +44,7 @@
112 function getWeekLabels(){
113 var object = Qt.createQmlObject('\
114 import QtQuick 2.3;\
115- import Ubuntu.Components 1.1;\
116+ import Ubuntu.Components 1.3;\
117 QtObject {\
118 property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
119 Qt.locale().dayName(1,Locale.NarrowFormat),\
120
121=== modified file 'DeleteConfirmationDialog.qml'
122--- DeleteConfirmationDialog.qml 2014-10-14 17:20:13 +0000
123+++ DeleteConfirmationDialog.qml 2015-12-06 20:07:09 +0000
124@@ -16,7 +16,7 @@
125 * along with this program. If not, see <http://www.gnu.org/licenses/>.
126 */
127 import QtQuick 2.3
128-import Ubuntu.Components 1.1
129+import Ubuntu.Components 1.3
130 import Ubuntu.Components.Popups 1.0
131
132 Dialog {
133
134=== modified file 'EditEventConfirmationDialog.qml'
135--- EditEventConfirmationDialog.qml 2014-10-14 17:20:13 +0000
136+++ EditEventConfirmationDialog.qml 2015-12-06 20:07:09 +0000
137@@ -16,7 +16,7 @@
138 * along with this program. If not, see <http://www.gnu.org/licenses/>.
139 */
140 import QtQuick 2.3
141-import Ubuntu.Components 1.1
142+import Ubuntu.Components 1.3
143 import Ubuntu.Components.Popups 1.0
144
145 Dialog {
146
147=== modified file 'EventActions.qml'
148--- EventActions.qml 2015-07-11 02:18:03 +0000
149+++ EventActions.qml 2015-12-06 20:07:09 +0000
150@@ -17,13 +17,15 @@
151 */
152
153 import QtQuick 2.3
154-import Ubuntu.Components 1.1
155+import Ubuntu.Components 1.3
156 import Ubuntu.SyncMonitor 0.1
157
158 Item {
159 id: actionPool
160
161- property alias newEventAction: _newEventAction
162+ //removing till following bug is resolved
163+ //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178
164+ //property alias newEventAction: _newEventAction
165 property alias showCalendarAction: _showCalendarAction
166 property alias syncCalendarAction: _syncCalendarAction
167 property alias settingsAction: _settingsAction
168
169=== modified file 'EventBubble.qml'
170--- EventBubble.qml 2015-11-29 03:17:30 +0000
171+++ EventBubble.qml 2015-12-06 20:07:09 +0000
172@@ -17,7 +17,7 @@
173 */
174
175 import QtQuick 2.3
176-import Ubuntu.Components 1.1
177+import Ubuntu.Components 1.3
178 import QtOrganizer 5.0
179
180 Item{
181
182=== modified file 'EventDetails.qml'
183--- EventDetails.qml 2015-08-03 04:47:59 +0000
184+++ EventDetails.qml 2015-12-06 20:07:09 +0000
185@@ -16,7 +16,7 @@
186 * along with this program. If not, see <http://www.gnu.org/licenses/>.
187 */
188 import QtQuick 2.3
189-import Ubuntu.Components 1.1
190+import Ubuntu.Components 1.3
191 import Ubuntu.Components.ListItems 1.0 as ListItem
192 import Ubuntu.Components.Themes.Ambiance 1.0
193 import Ubuntu.Components.Popups 1.0
194
195=== modified file 'EventReminder.qml'
196--- EventReminder.qml 2015-07-12 03:39:07 +0000
197+++ EventReminder.qml 2015-12-06 20:07:09 +0000
198@@ -17,7 +17,7 @@
199 */
200
201 import QtQuick 2.3
202-import Ubuntu.Components 1.1
203+import Ubuntu.Components 1.3
204 import Ubuntu.Components.ListItems 1.0 as ListItem
205
206 Page{
207
208=== modified file 'EventRepetition.qml'
209--- EventRepetition.qml 2015-07-11 11:33:00 +0000
210+++ EventRepetition.qml 2015-12-06 20:07:09 +0000
211@@ -18,7 +18,7 @@
212
213 import QtQuick 2.3
214 import QtOrganizer 5.0
215-import Ubuntu.Components 1.1
216+import Ubuntu.Components 1.3
217 import Ubuntu.Components.ListItems 1.0 as ListItem
218 import Ubuntu.Components.Pickers 1.0
219 import QtOrganizer 5.0
220
221=== modified file 'EventUtils.qml'
222--- EventUtils.qml 2014-10-04 04:37:34 +0000
223+++ EventUtils.qml 2015-12-06 20:07:09 +0000
224@@ -17,7 +17,7 @@
225 */
226
227 import QtQuick 2.3
228-import Ubuntu.Components 1.1
229+import Ubuntu.Components 1.3
230 import QtOrganizer 5.0
231 import "Defines.js" as Defines
232 import "Recurrence.js" as Recurrence
233
234=== modified file 'HeaderDateComponent.qml'
235--- HeaderDateComponent.qml 2015-05-14 13:03:02 +0000
236+++ HeaderDateComponent.qml 2015-12-06 20:07:09 +0000
237@@ -17,7 +17,7 @@
238 */
239
240 import QtQuick 2.3
241-import Ubuntu.Components 1.1
242+import Ubuntu.Components 1.3
243
244 Item {
245 id: root
246
247=== modified file 'MonthComponent.qml'
248--- MonthComponent.qml 2015-11-23 07:15:20 +0000
249+++ MonthComponent.qml 2015-12-06 20:07:09 +0000
250@@ -16,7 +16,7 @@
251 * along with this program. If not, see <http://www.gnu.org/licenses/>.
252 */
253 import QtQuick 2.3
254-import Ubuntu.Components 1.1
255+import Ubuntu.Components 1.3
256 import "dateExt.js" as DateExt
257 import "colorUtils.js" as Color
258
259
260=== modified file 'MonthComponentDateDelegate.qml'
261--- MonthComponentDateDelegate.qml 2015-09-05 05:30:23 +0000
262+++ MonthComponentDateDelegate.qml 2015-12-06 20:07:09 +0000
263@@ -1,5 +1,5 @@
264 import QtQuick 2.0
265-import Ubuntu.Components 1.1
266+import Ubuntu.Components 1.3
267
268 Item{
269 id: dateRootItem
270
271=== modified file 'MonthView.qml'
272--- MonthView.qml 2015-11-23 07:15:20 +0000
273+++ MonthView.qml 2015-12-06 20:07:09 +0000
274@@ -16,7 +16,7 @@
275 * along with this program. If not, see <http://www.gnu.org/licenses/>.
276 */
277 import QtQuick 2.3
278-import Ubuntu.Components 1.1
279+import Ubuntu.Components 1.3
280 import "dateExt.js" as DateExt
281 import "colorUtils.js" as Color
282
283@@ -45,7 +45,6 @@
284 head {
285 actions: [
286 calendarTodayAction,
287- commonHeaderActions.newEventAction,
288 commonHeaderActions.showCalendarAction,
289 commonHeaderActions.reloadAction,
290 commonHeaderActions.syncCalendarAction,
291
292=== modified file 'NewEvent.qml'
293--- NewEvent.qml 2015-08-24 05:08:46 +0000
294+++ NewEvent.qml 2015-12-06 20:07:09 +0000
295@@ -18,7 +18,7 @@
296
297 import QtQuick 2.3
298 import QtOrganizer 5.0
299-import Ubuntu.Components 1.1
300+import Ubuntu.Components 1.3
301 import Ubuntu.Components.Popups 1.0
302 import Ubuntu.Components.ListItems 1.0 as ListItem
303 import Ubuntu.Components.Themes.Ambiance 1.0
304
305=== modified file 'NewEventEntryField.qml'
306--- NewEventEntryField.qml 2015-02-17 05:53:42 +0000
307+++ NewEventEntryField.qml 2015-12-06 20:07:09 +0000
308@@ -17,7 +17,7 @@
309 */
310
311 import QtQuick 2.3
312-import Ubuntu.Components 1.1
313+import Ubuntu.Components 1.3
314
315 Label {
316 id: root
317
318=== modified file 'OnlineAccountsHelper.qml'
319--- OnlineAccountsHelper.qml 2015-03-28 11:31:47 +0000
320+++ OnlineAccountsHelper.qml 2015-12-06 20:07:09 +0000
321@@ -15,7 +15,7 @@
322 */
323
324 import QtQuick 2.2
325-import Ubuntu.Components 1.1
326+import Ubuntu.Components 1.3
327 import Ubuntu.OnlineAccounts 0.1
328 import Ubuntu.OnlineAccounts.Client 0.1
329
330
331=== modified file 'RecurrenceLabelDefines.qml'
332--- RecurrenceLabelDefines.qml 2014-10-17 05:42:34 +0000
333+++ RecurrenceLabelDefines.qml 2015-12-06 20:07:09 +0000
334@@ -17,7 +17,7 @@
335 */
336
337 import QtQuick 2.3
338-import Ubuntu.Components 1.1
339+import Ubuntu.Components 1.3
340
341 QtObject {
342 property var recurrenceLabel:[i18n.tr("Once"),
343
344=== modified file 'Scroller.qml'
345--- Scroller.qml 2014-09-20 10:45:35 +0000
346+++ Scroller.qml 2015-12-06 20:07:09 +0000
347@@ -17,7 +17,7 @@
348 */
349
350 import QtQuick 2.3
351-import Ubuntu.Components 1.1
352+import Ubuntu.Components 1.3
353 import Ubuntu.Components.ListItems 1.0 as ListItems
354
355 Item {
356
357=== modified file 'TimeLineBackground.qml'
358--- TimeLineBackground.qml 2014-11-29 05:15:13 +0000
359+++ TimeLineBackground.qml 2015-12-06 20:07:09 +0000
360@@ -17,7 +17,7 @@
361 */
362
363 import QtQuick 2.3
364-import Ubuntu.Components 1.1
365+import Ubuntu.Components 1.3
366
367 Column {
368 width: parent.width
369
370=== modified file 'TimeLineBase.qml'
371--- TimeLineBase.qml 2015-08-20 12:27:59 +0000
372+++ TimeLineBase.qml 2015-12-06 20:07:09 +0000
373@@ -16,7 +16,7 @@
374 * along with this program. If not, see <http://www.gnu.org/licenses/>.
375 */
376 import QtQuick 2.3
377-import Ubuntu.Components 1.1
378+import Ubuntu.Components 1.3
379 import QtOrganizer 5.0
380
381 import "dateExt.js" as DateExt
382
383=== modified file 'TimeLineBaseComponent.qml'
384--- TimeLineBaseComponent.qml 2015-10-31 18:47:23 +0000
385+++ TimeLineBaseComponent.qml 2015-12-06 20:07:09 +0000
386@@ -18,7 +18,7 @@
387
388 import QtQuick 2.3
389 import QtQuick.Layouts 1.1
390-import Ubuntu.Components 1.1
391+import Ubuntu.Components 1.3
392 import Ubuntu.Components.Popups 1.0
393 import QtOrganizer 5.0
394
395
396=== modified file 'TimeLineHeader.qml'
397--- TimeLineHeader.qml 2015-09-05 05:30:23 +0000
398+++ TimeLineHeader.qml 2015-12-06 20:07:09 +0000
399@@ -17,7 +17,7 @@
400 */
401
402 import QtQuick 2.0
403-import Ubuntu.Components 1.1
404+import Ubuntu.Components 1.3
405 import QtQuick.Layouts 1.1
406
407 import "ViewType.js" as ViewType
408
409=== modified file 'TimeLineHeaderComponent.qml'
410--- TimeLineHeaderComponent.qml 2015-09-05 05:30:23 +0000
411+++ TimeLineHeaderComponent.qml 2015-12-06 20:07:09 +0000
412@@ -17,7 +17,7 @@
413 */
414
415 import QtQuick 2.3
416-import Ubuntu.Components 1.1
417+import Ubuntu.Components 1.3
418 import "dateExt.js" as DateExt
419 import "ViewType.js" as ViewType
420
421
422=== modified file 'TimeLineTimeScale.qml'
423--- TimeLineTimeScale.qml 2014-12-11 20:29:27 +0000
424+++ TimeLineTimeScale.qml 2015-12-06 20:07:09 +0000
425@@ -17,7 +17,7 @@
426 */
427
428 import QtQuick 2.0
429-import Ubuntu.Components 1.1
430+import Ubuntu.Components 1.3
431
432 Flickable{
433 id: timeFlickble
434
435=== modified file 'ViewHeader.qml'
436--- ViewHeader.qml 2014-11-29 09:40:53 +0000
437+++ ViewHeader.qml 2015-12-06 20:07:09 +0000
438@@ -16,7 +16,7 @@
439 * along with this program. If not, see <http://www.gnu.org/licenses/>.
440 */
441 import QtQuick 2.3
442-import Ubuntu.Components 1.1
443+import Ubuntu.Components 1.3
444
445 Item{
446 id: header
447
448=== modified file 'WeekView.qml'
449--- WeekView.qml 2015-10-28 02:12:50 +0000
450+++ WeekView.qml 2015-12-06 20:07:09 +0000
451@@ -17,7 +17,7 @@
452 */
453
454 import QtQuick 2.3
455-import Ubuntu.Components 1.1
456+import Ubuntu.Components 1.3
457 import "dateExt.js" as DateExt
458 import "ViewType.js" as ViewType
459
460@@ -50,7 +50,6 @@
461 head {
462 actions: [
463 calendarTodayAction,
464- commonHeaderActions.newEventAction,
465 commonHeaderActions.showCalendarAction,
466 commonHeaderActions.reloadAction,
467 commonHeaderActions.syncCalendarAction,
468
469=== modified file 'YearView.qml'
470--- YearView.qml 2015-11-23 07:15:20 +0000
471+++ YearView.qml 2015-12-06 20:07:09 +0000
472@@ -17,7 +17,7 @@
473 */
474
475 import QtQuick 2.3
476-import Ubuntu.Components 1.1
477+import Ubuntu.Components 1.3
478
479 import "dateExt.js" as DateExt
480 Page {
481@@ -48,7 +48,6 @@
482 head {
483 actions: [
484 calendarTodayAction,
485- commonHeaderActions.newEventAction,
486 commonHeaderActions.showCalendarAction,
487 commonHeaderActions.reloadAction,
488 commonHeaderActions.syncCalendarAction,
489
490=== modified file 'YearViewDelegate.qml'
491--- YearViewDelegate.qml 2015-11-23 07:15:20 +0000
492+++ YearViewDelegate.qml 2015-12-06 20:07:09 +0000
493@@ -1,5 +1,5 @@
494 import QtQuick 2.0
495-import Ubuntu.Components 1.1
496+import Ubuntu.Components 1.3
497
498 GridView{
499 id: yearView
500
501=== modified file 'calendar.qml'
502--- calendar.qml 2015-11-23 07:15:20 +0000
503+++ calendar.qml 2015-12-06 20:07:09 +0000
504@@ -16,7 +16,7 @@
505 * along with this program. If not, see <http://www.gnu.org/licenses/>.
506 */
507 import QtQuick 2.3
508-import Ubuntu.Components 1.1
509+import Ubuntu.Components 1.3
510 import Ubuntu.Components.Popups 1.0
511 import QtOrganizer 5.0
512 import Qt.labs.settings 1.0
513@@ -27,8 +27,6 @@
514
515 property bool displayWeekNumber: false;
516
517- useDeprecatedToolbar: false
518-
519 // Work-around until this branch lands:
520 // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
521 //property bool windowActive: typeof window != 'undefined'
522
523=== modified file 'calendarTests.qml'
524--- calendarTests.qml 2014-09-20 10:45:35 +0000
525+++ calendarTests.qml 2015-12-06 20:07:09 +0000
526@@ -16,7 +16,7 @@
527 * along with this program. If not, see <http://www.gnu.org/licenses/>.
528 */
529 import QtQuick 2.3
530-import Ubuntu.Components 1.1
531+import Ubuntu.Components 1.3
532
533 MainView {
534 width: units.gu(20)
535
536=== modified file 'po/com.ubuntu.calendar.pot'
537--- po/com.ubuntu.calendar.pot 2015-11-23 07:15:20 +0000
538+++ po/com.ubuntu.calendar.pot 2015-12-06 20:07:09 +0000
539@@ -8,7 +8,7 @@
540 msgstr ""
541 "Project-Id-Version: \n"
542 "Report-Msgid-Bugs-To: \n"
543-"POT-Creation-Date: 2015-11-23 15:14+0800\n"
544+"POT-Creation-Date: 2015-11-01 10:45+0900\n"
545 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
546 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
547 "Language-Team: LANGUAGE <LL@li.org>\n"
548@@ -19,25 +19,25 @@
549 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
550
551 #: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
552-#: ../WeekView.qml:44 ../YearView.qml:42
553+#: ../WeekView.qml:44 ../YearView.qml:36
554 msgid "Today"
555 msgstr ""
556
557-#: ../AgendaView.qml:93
558+#: ../AgendaView.qml:92
559 msgid "No upcoming events"
560 msgstr ""
561
562-#: ../AgendaView.qml:96
563+#: ../AgendaView.qml:95
564 msgid "You have no calendars enabled"
565 msgstr ""
566
567-#: ../AgendaView.qml:106
568+#: ../AgendaView.qml:105
569 msgid "Enable calendars"
570 msgstr ""
571
572 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
573 #. while the second one (%2) refers to the end time
574-#: ../AgendaView.qml:169 ../EventBubble.qml:133
575+#: ../AgendaView.qml:168 ../EventBubble.qml:133
576 #, qt-format
577 msgid "%1 - %2"
578 msgstr ""
579@@ -46,34 +46,34 @@
580 #. on a given day. "Ev." is short form for "Events".
581 #. Please keep the translation of "Ev." to 3 characters only, as the week view
582 #. where it's shown has limited space
583-#: ../AllDayEventComponent.qml:126
584+#: ../AllDayEventComponent.qml:123
585 #, qt-format
586 msgid "%1 ev."
587 msgstr ""
588
589 #. TRANSLATORS: the argument refers to the number of all day events
590-#: ../AllDayEventComponent.qml:130
591+#: ../AllDayEventComponent.qml:127
592 #, qt-format
593 msgid "%1 all day event"
594 msgid_plural "%1 all day events"
595 msgstr[0] ""
596 msgstr[1] ""
597
598-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61
599+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
600 msgid "Calendars"
601 msgstr ""
602
603-#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
604+#: ../CalendarChoicePopup.qml:37
605 msgid "Back"
606 msgstr ""
607
608 #. TRANSLATORS: Please translate this string to 15 characters only.
609 #. Currently ,there is no way we can increase width of action menu currently.
610-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
611+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
612 msgid "Sync"
613 msgstr ""
614
615-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
616+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
617 msgid "Syncing"
618 msgstr ""
619
620@@ -101,7 +101,7 @@
621 #. TRANSLATORS: this is a time formatting string,
622 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
623 #. It's used in the header of the month and week views
624-#: ../DayView.qml:60 ../MonthView.qml:61 ../WeekView.qml:64
625+#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
626 msgid "MMMM yyyy"
627 msgstr ""
628
629@@ -136,7 +136,7 @@
630 msgid "Delete"
631 msgstr ""
632
633-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
634+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
635 msgid "Edit Event"
636 msgstr ""
637
638@@ -154,14 +154,10 @@
639 msgid "Edit this"
640 msgstr ""
641
642-#: ../EventActions.qml:51 ../NewEvent.qml:325
643+#: ../EventActions.qml:50 ../NewEvent.qml:324
644 msgid "New Event"
645 msgstr ""
646
647-#: ../EventActions.qml:72 ../Settings.qml:28
648-msgid "Settings"
649-msgstr ""
650-
651 #. TRANSLATORS: the first argument (%1) refers to a time for an event,
652 #. while the second one (%2) refers to title of event
653 #: ../EventBubble.qml:144 ../EventBubble.qml:149
654@@ -169,7 +165,7 @@
655 msgid "%1 <b>%2</b>"
656 msgstr ""
657
658-#: ../EventDetails.qml:43 ../NewEvent.qml:436
659+#: ../EventDetails.qml:43 ../NewEvent.qml:435
660 msgid "Event Details"
661 msgstr ""
662
663@@ -193,11 +189,11 @@
664 msgid "Edit"
665 msgstr ""
666
667-#: ../EventDetails.qml:354 ../NewEvent.qml:538
668+#: ../EventDetails.qml:354 ../NewEvent.qml:537
669 msgid "Guests"
670 msgstr ""
671
672-#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:635
673+#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634
674 msgid "Reminder"
675 msgstr ""
676
677@@ -220,7 +216,7 @@
678 #. TRANSLATORS: this refers to how often a recurrent event repeats
679 #. and it is shown as the header of the option selector to choose
680 #. its repetition
681-#: ../EventRepetition.qml:242 ../NewEvent.qml:619
682+#: ../EventRepetition.qml:242 ../NewEvent.qml:618
683 msgid "Repeats"
684 msgstr ""
685
686@@ -263,10 +259,6 @@
687 msgid "After Date"
688 msgstr ""
689
690-#: ../MonthComponent.qml:260
691-msgid "Wk"
692-msgstr ""
693-
694 #: ../NewEvent.qml:84
695 msgid "Save"
696 msgstr ""
697@@ -275,43 +267,43 @@
698 msgid "End time can't be before start time"
699 msgstr ""
700
701-#: ../NewEvent.qml:335
702+#: ../NewEvent.qml:334
703 msgid "Error"
704 msgstr ""
705
706-#: ../NewEvent.qml:337
707+#: ../NewEvent.qml:336
708 msgid "OK"
709 msgstr ""
710
711-#: ../NewEvent.qml:390
712+#: ../NewEvent.qml:389
713 msgid "From"
714 msgstr ""
715
716-#: ../NewEvent.qml:403
717+#: ../NewEvent.qml:402
718 msgid "To"
719 msgstr ""
720
721-#: ../NewEvent.qml:420
722+#: ../NewEvent.qml:419
723 msgid "All day event"
724 msgstr ""
725
726-#: ../NewEvent.qml:449
727+#: ../NewEvent.qml:448
728 msgid "Event Name"
729 msgstr ""
730
731-#: ../NewEvent.qml:467
732+#: ../NewEvent.qml:466
733 msgid "Description"
734 msgstr ""
735
736-#: ../NewEvent.qml:485
737+#: ../NewEvent.qml:484
738 msgid "Location"
739 msgstr ""
740
741-#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
742+#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1
743 msgid "Calendar"
744 msgstr ""
745
746-#: ../NewEvent.qml:542
747+#: ../NewEvent.qml:541
748 msgid "Add Guest"
749 msgstr ""
750
751@@ -398,10 +390,6 @@
752 msgid "2 weeks"
753 msgstr ""
754
755-#: ../Settings.qml:60
756-msgid "Show week numbers"
757-msgstr ""
758-
759 #: ../TimeLineBase.qml:73
760 msgid "Untitled"
761 msgstr ""
762@@ -416,35 +404,35 @@
763 msgid "All Day"
764 msgstr ""
765
766-#: ../YearView.qml:61
767+#: ../YearView.qml:54
768 #, qt-format
769 msgid "Year %1"
770 msgstr ""
771
772-#: ../calendar.qml:47
773+#: ../calendar.qml:45
774 msgid ""
775 "Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
776 "eventid. They will be managed by system. See the source for a full comment "
777 "about them"
778 msgstr ""
779
780-#: ../calendar.qml:455
781+#: ../calendar.qml:354
782 msgid "Year"
783 msgstr ""
784
785-#: ../calendar.qml:462
786+#: ../calendar.qml:388
787 msgid "Month"
788 msgstr ""
789
790-#: ../calendar.qml:469
791+#: ../calendar.qml:421
792 msgid "Week"
793 msgstr ""
794
795-#: ../calendar.qml:476
796+#: ../calendar.qml:459
797 msgid "Day"
798 msgstr ""
799
800-#: ../calendar.qml:483
801+#: ../calendar.qml:491
802 msgid "Agenda"
803 msgstr ""
804

Subscribers

People subscribed via source and target branches

to status/vote changes: