Ubuntu Calendar App

Merge lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix into lp:ubuntu-calendar-app

  1. Uitk1_3_and_font_fix
  2. Merge into trunk
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 726
Merged at revision: 747
Proposed branch: lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix
Merge into: lp:ubuntu-calendar-app
Diff against target: 890 lines (+85/-102)
39 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 (+2/-3)
Defines.js (+1/-1)
DeleteConfirmationDialog.qml (+1/-1)
EditEventConfirmationDialog.qml (+1/-1)
EventActions.qml (+4/-2)
EventBubble.qml (+1/-1)
EventDetails.qml (+2/-2)
EventReminder.qml (+1/-1)
EventRepetition.qml (+1/-1)
EventUtils.qml (+1/-1)
HeaderDateComponent.qml (+1/-1)
MonthComponent.qml (+2/-2)
MonthComponentDateDelegate.qml (+1/-1)
MonthView.qml (+2/-3)
NewEvent.qml (+1/-1)
NewEventEntryField.qml (+1/-1)
OnlineAccountsHelper.qml (+1/-1)
RecurrenceLabelDefines.qml (+1/-1)
Scroller.qml (+1/-1)
Settings.qml (+2/-2)
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 (+2/-2)
WeekView.qml (+2/-3)
YearView.qml (+2/-3)
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:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Renato Araujo Oliveira Filho (community) Needs Information
Dan Chapman ξƒΏ Approve
Review via email: mp+284365@code.launchpad.net

Commit message

Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.

Description of the change

Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.

To post a comment you must log in.
Revision history for this message
Dan Chapman ξƒΏ (dpniel) wrote :

LGTM :-)

review: Approve
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Hey guys. The new event bottom is not visible on the header anymore with this branch. Is that intentional? How do I create new events?

review: Needs Information
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:725
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/201/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/487/console

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

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

FAILED: Continuous integration, rev:726
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/212/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/498/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Hey guys I have a new branch based on this one that contains update to qtquick 2.4 and use the new page header API:

https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/sdk-1-3/+merge/284454

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

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

Subscribers

People subscribed via source and target branches

to status/vote changes: