Ubuntu Calendar App

Merge lp:~gary-wzl77/ubuntu-calendar-app/show-week-number into lp:ubuntu-calendar-app

  1. show-week-number
  2. Merge into trunk
Proposed by Gary.Wang
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 726
Merged at revision: 726
Proposed branch: lp:~gary-wzl77/ubuntu-calendar-app/show-week-number
Merge into: lp:ubuntu-calendar-app
Diff against target: 543 lines (+238/-30)
12 files modified
AgendaView.qml (+2/-1)
AllDayEventComponent.qml (+3/-0)
DayView.qml (+2/-1)
EventActions.qml (+11/-0)
MonthComponent.qml (+86/-1)
MonthView.qml (+4/-1)
Settings.qml (+89/-0)
WeekView.qml (+2/-1)
YearView.qml (+2/-1)
YearViewDelegate.qml (+1/-1)
calendar.qml (+4/-3)
po/com.ubuntu.calendar.pot (+32/-20)
To merge this branch: bzr merge lp:~gary-wzl77/ubuntu-calendar-app/show-week-number
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nicholas Skaggs (community) Needs Fixing
Mihir Soni Pending
Review via email: mp+264153@code.launchpad.net

Commit message

Show week number in monthly and yearly view.

Description of the change

Show week number in monthly and yearly view.
1.Navigate to day view when clicking weeknum in monthly view
2.Navigate to monthly view when clicking weeknum in yearly view

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:692
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1209/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3051
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3051/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/680
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/206

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1209/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Not sure about this. We need design to take a look.

http://people.canonical.com/~alan/year.png
http://people.canonical.com/~alan/month.png

Seems cluttered.

Revision history for this message
Gary.Wang (gary-wzl77) wrote :

Add screenshots of monthly view with UI-fined based on feedback from UX team.
Add setting page in latest repo as well.

https://drive.google.com/open?id=0B2H9ECPSSfqIN1AxRGVfMndDYlk
https://drive.google.com/open?id=0B2H9ECPSSfqIc0ZqT2lXOEhTX3M

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:693
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1210/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3065
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3065/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/681
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/207

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1210/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:694
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1213/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3077
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3077/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/684
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/210

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1213/rebuild

review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Popey,

Any updates from design team regarding this ?

Revision history for this message
Gary.Wang (gary-wzl77) wrote :

Got feedback from UX-design team that
"
This solution works nicely and I think we should proceed with it.
...
"

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:695
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1223/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/220/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1223/rebuild

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

PASSED: Continuous integration, rev:707
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1224/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/221

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1224/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/1405/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/978/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Text conflict in po/com.ubuntu.calendar.pot
1 conflicts encountered.

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:708
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1228/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/225

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1228/rebuild

review: Approve (continuous-integration)
lp:~gary-wzl77/ubuntu-calendar-app/show-week-number updated
710. By Kunal Parmar

resolves Bug #1473679
. Fixes: https://bugs.launchpad.net/bugs/1473679.

Approved by Alan Pope ξƒΏ, Ubuntu Phone Apps Jenkins Bot.

711. By Kunal Parmar

resolves Bug #1479533 . Fixes: https://bugs.launchpad.net/bugs/1479533.

Approved by Alan Pope ξƒΏ, Ubuntu Phone Apps Jenkins Bot.

712. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

713. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

714. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

715. By Kunal Parmar

resolves Bug #1475747 . Fixes: https://bugs.launchpad.net/bugs/1475747.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

716. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

717. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

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

FAILED: Continuous integration, rev:708
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/49/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/8/rebuild

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

PASSED: Continuous integration, rev:718
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/69/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/10/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:718
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1234/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/231

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1234/rebuild

review: Approve (continuous-integration)
lp:~gary-wzl77/ubuntu-calendar-app/show-week-number updated
718. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

719. By Kunal Parmar

Resolves Bug #1494394 . Fixes: https://bugs.launchpad.net/bugs/1494394.

Approved by Alan Pope ξƒΏ, Jenkins Bot, Ubuntu Phone Apps Jenkins Bot.

720. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

721. By Gary.Wang

Tab change will cause dynamic creation(Qt.ResolvedUrl) for qml object back and forth.Using Qt.CreateComponent for dynamic creation for the first time and reuse existing obj without re-creating. Fixes: https://bugs.launchpad.net/bugs/1309263.

Approved by Ubuntu Phone Apps Jenkins Bot, Jenkins Bot, Alan Pope ξƒΏ.

722. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

723. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

724. By Launchpad Translations on behalf of ubuntu-calendar-dev

Launchpad automatic translations update.

725. By Niklas Wenzel

Remove unnecessary i18n.tr() calls.

Approved by Mihir Soni, Jenkins Bot.

726. By Gary.Wang

Replace calendarStorage with native persistent application settings

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

PASSED: Continuous integration, rev:726
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/18/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/172/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

LGTM

review: Approve

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-02-22 10:18:16 +0000
3+++ AgendaView.qml 2015-11-23 07:20:37 +0000
4@@ -60,7 +60,8 @@
5 commonHeaderActions.newEventAction,
6 commonHeaderActions.showCalendarAction,
7 commonHeaderActions.reloadAction,
8- commonHeaderActions.syncCalendarAction
9+ commonHeaderActions.syncCalendarAction,
10+ commonHeaderActions.settingsAction
11 ]
12
13 EventListModel {
14
15=== modified file 'AllDayEventComponent.qml'
16--- AllDayEventComponent.qml 2015-06-16 09:18:21 +0000
17+++ AllDayEventComponent.qml 2015-11-23 07:20:37 +0000
18@@ -40,6 +40,9 @@
19 for(var i = 0 ; i < items.length ; ++i) {
20 var event = items[(i)];
21 if( event && event.allDay ) {
22+
23+ console.log("event.startDateTime", event.startDateTime," event.endDateTime",event.endDateTime);
24+
25 for(var d = event.startDateTime; d < event.endDateTime; d = d.addDays(1)) {
26 var key = Qt.formatDateTime(d, "dd-MMM-yyyy");
27 if( !(key in map)) {
28
29=== modified file 'DayView.qml'
30--- DayView.qml 2015-11-20 23:07:21 +0000
31+++ DayView.qml 2015-11-23 07:20:37 +0000
32@@ -49,7 +49,8 @@
33 commonHeaderActions.newEventAction,
34 commonHeaderActions.showCalendarAction,
35 commonHeaderActions.reloadAction,
36- commonHeaderActions.syncCalendarAction
37+ commonHeaderActions.syncCalendarAction,
38+ commonHeaderActions.settingsAction
39 ]
40
41 contents: Label {
42
43=== modified file 'EventActions.qml'
44--- EventActions.qml 2015-04-13 19:40:48 +0000
45+++ EventActions.qml 2015-11-23 07:20:37 +0000
46@@ -26,6 +26,7 @@
47 property alias newEventAction: _newEventAction
48 property alias showCalendarAction: _showCalendarAction
49 property alias syncCalendarAction: _syncCalendarAction
50+ property alias settingsAction: _settingsAction
51
52 Action {
53 id: _syncCalendarAction
54@@ -63,4 +64,14 @@
55 pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);
56 }
57 }
58+
59+ Action{
60+ id: _settingsAction
61+ objectName: "settingsbutton"
62+ iconName: "settings"
63+ text: i18n.tr("Settings")
64+ onTriggered: {
65+ pageStack.push(Qt.resolvedUrl("Settings.qml"));
66+ }
67+ }
68 }
69
70=== modified file 'MonthComponent.qml'
71--- MonthComponent.qml 2015-09-05 05:30:23 +0000
72+++ MonthComponent.qml 2015-11-23 07:20:37 +0000
73@@ -31,6 +31,7 @@
74 property var currentMonth;
75 property var isYearView;
76 property var selectedDay;
77+ property bool displayWeekNumber:false;
78
79 property string dayLabelFontSize: "medium"
80 property string dateLabelFontSize: "large"
81@@ -145,7 +146,10 @@
82 id: column
83
84 anchors {
85- fill: parent
86+ left: weekNumLoader.right;
87+ right: parent.right;
88+ top: parent.top;
89+ bottom: parent.bottom;
90 topMargin: units.gu(1.5)
91 bottomMargin: units.gu(1)
92 }
93@@ -213,6 +217,87 @@
94 }
95 }
96
97+ Loader {
98+ id: weekNumLoader;
99+ anchors.left: parent.left;
100+ width: displayWeekNumber ? parent.width / 7:0;
101+ height: parent.height;
102+ visible: displayWeekNumber;
103+ sourceComponent: displayWeekNumber ? weekNumComp : undefined;
104+ }
105+
106+ Component {
107+ id: weekNumComp
108+
109+ Column {
110+ id: weekNumColumn;
111+
112+ anchors {
113+ fill: parent
114+ topMargin: units.gu(1.0)
115+ bottomMargin: units.gu(1.25)
116+ }
117+
118+ Item {
119+ id: datePlaceHolder;
120+ objectName:"datePlaceHolder"
121+
122+ width: parent.width;
123+ height: isYearView ? units.gu(4.5): units.gu(1.25)
124+ }
125+
126+ Item {
127+ id: weekNumLabelItem;
128+ objectName: "weekNumLabelItem"
129+
130+ width: parent.width;
131+ height: weekNumLabel.height + units.gu(2.0)
132+
133+ Label{
134+ id: weekNumLabel;
135+ objectName: "weekNumLabel";
136+ width: parent.width;
137+ text: i18n.tr("Wk");
138+ horizontalAlignment: Text.AlignHCenter;
139+ verticalAlignment: Text.AlignVCenter;
140+ font.pixelSize: intern.dayFontSize;
141+ font.bold: true
142+ color: "black"
143+ }
144+ }
145+
146+ Repeater {
147+ id: weekNumrepeater;
148+ model: 6;
149+
150+ Label{
151+ id: weekNum
152+ objectName: "weekNum" + index
153+ width: parent.width;
154+ height: (weekNumColumn.height - weekNumLabelItem.height - datePlaceHolder.height) / 6;
155+ text: intern.monthStart.addDays(index * 7).weekNumber(Qt.locale().firstDayOfWeek)
156+ horizontalAlignment: Text.AlignHCenter;
157+ verticalAlignment: Text.AlignVCenter;
158+ font.pixelSize: intern.dayFontSize + 1;
159+ font.bold: true
160+ color: "black"
161+
162+ MouseArea {
163+ anchors.fill: parent
164+ onClicked: {
165+ var selectedDate = new Date(intern.monthStart.addDays(index * 7))
166+ if( isYearView ) {
167+ root.monthSelected(selectedDate);
168+ } else {
169+ root.dateSelected(selectedDate);
170+ }
171+ }
172+ }
173+ }
174+ }
175+ }
176+ }
177+
178 Component{
179 id: defaultDateLabelComponent
180 MonthComponentDateDelegate{
181
182=== modified file 'MonthView.qml'
183--- MonthView.qml 2015-11-20 23:07:21 +0000
184+++ MonthView.qml 2015-11-23 07:20:37 +0000
185@@ -48,7 +48,8 @@
186 commonHeaderActions.newEventAction,
187 commonHeaderActions.showCalendarAction,
188 commonHeaderActions.reloadAction,
189- commonHeaderActions.syncCalendarAction
190+ commonHeaderActions.syncCalendarAction,
191+ commonHeaderActions.settingsAction
192 ]
193
194 contents: Label {
195@@ -108,6 +109,8 @@
196
197 showEvents: true
198
199+ displayWeekNumber: mainView.displayWeekNumber;
200+
201 anchors.fill: parent
202
203 currentMonth: monthViewPath.addMonth(monthViewPath.startMonth,
204
205=== added file 'Settings.qml'
206--- Settings.qml 1970-01-01 00:00:00 +0000
207+++ Settings.qml 2015-11-23 07:20:37 +0000
208@@ -0,0 +1,89 @@
209+/*
210+ * Copyright (C) 2013-2014 Canonical Ltd
211+ *
212+ * This file is part of Ubuntu Calendar App
213+ *
214+ * Ubuntu Calendar App is free software: you can redistribute it and/or modify
215+ * it under the terms of the GNU General Public License version 3 as
216+ * published by the Free Software Foundation.
217+ *
218+ * Ubuntu Calendar App is distributed in the hope that it will be useful,
219+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
220+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
221+ * GNU General Public License for more details.
222+ *
223+ * You should have received a copy of the GNU General Public License
224+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
225+ */
226+import QtQuick 2.3
227+import Ubuntu.Components 1.1
228+import Ubuntu.Components.Popups 1.0
229+import Ubuntu.Components.ListItems 1.0 as ListItem
230+
231+Page {
232+ id: root
233+ objectName: "settings"
234+
235+ visible: false
236+ title: i18n.tr("Settings")
237+
238+ head {
239+ backAction: Action {
240+ text: i18n.tr("Back")
241+ iconName: "back"
242+ onTriggered: {
243+ pop();
244+ }
245+ }
246+ }
247+
248+ ListModel{
249+ id: model;
250+ }
251+
252+ Column {
253+ id: settingsColumn
254+ objectName: "settingsColumn"
255+ spacing: units.gu(0.5)
256+ anchors {
257+ margins: units.gu(2)
258+ fill: parent
259+ }
260+
261+ Item{
262+ width: parent.width;
263+ height: Math.max(weekNumber.height, weekCheckBox.height)
264+
265+ Label{
266+ id: weekNumber;
267+ objectName: "weekNumber"
268+ text: i18n.tr("Show week numbers");
269+ elide: Text.ElideRight
270+ opacity: weekCheckBox.checked ? 1.0 : 0.8
271+ color: UbuntuColors.midAubergine
272+ anchors {
273+ left: parent.left
274+ right: weekCheckBox.left;
275+ margins: units.gu(2)
276+ verticalCenter: parent.verticalCenter
277+ }
278+ }
279+
280+ CheckBox {
281+ id: weekCheckBox
282+ objectName: "weekCheckBox"
283+ anchors.right:parent.right;
284+ onCheckedChanged: {
285+ mainView.displayWeekNumber = weekCheckBox.checked;
286+ }
287+ }
288+ }
289+
290+ ListItem.ThinDivider {}
291+ }
292+
293+ Component.onCompleted: {
294+ weekCheckBox.checked = mainView.displayWeekNumber;
295+ }
296+}
297+
298
299=== modified file 'WeekView.qml'
300--- WeekView.qml 2015-09-05 05:30:23 +0000
301+++ WeekView.qml 2015-11-23 07:20:37 +0000
302@@ -53,7 +53,8 @@
303 commonHeaderActions.newEventAction,
304 commonHeaderActions.showCalendarAction,
305 commonHeaderActions.reloadAction,
306- commonHeaderActions.syncCalendarAction
307+ commonHeaderActions.syncCalendarAction,
308+ commonHeaderActions.settingsAction
309 ]
310
311 contents: Label {
312
313=== modified file 'YearView.qml'
314--- YearView.qml 2015-05-07 05:10:48 +0000
315+++ YearView.qml 2015-11-23 07:20:37 +0000
316@@ -51,7 +51,8 @@
317 commonHeaderActions.newEventAction,
318 commonHeaderActions.showCalendarAction,
319 commonHeaderActions.reloadAction,
320- commonHeaderActions.syncCalendarAction
321+ commonHeaderActions.syncCalendarAction,
322+ commonHeaderActions.settingsAction
323 ]
324 contents: Label {
325 id:year
326
327=== modified file 'YearViewDelegate.qml'
328--- YearViewDelegate.qml 2015-05-07 05:10:48 +0000
329+++ YearViewDelegate.qml 2015-11-23 07:20:37 +0000
330@@ -78,7 +78,7 @@
331 objectName: "monthComponent" + index
332 showEvents: false
333 currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)
334-
335+ displayWeekNumber: mainView.displayWeekNumber;
336 isCurrentItem: yearView.focus
337
338 isYearView: true
339
340=== modified file 'calendar.qml'
341--- calendar.qml 2015-11-07 16:05:12 +0000
342+++ calendar.qml 2015-11-23 07:20:37 +0000
343@@ -20,11 +20,13 @@
344 import Ubuntu.Components.Popups 1.0
345 import QtOrganizer 5.0
346 import Qt.labs.settings 1.0
347-
348 import "dateExt.js" as DateExt
349
350 MainView {
351 id: mainView
352+
353+ property bool displayWeekNumber: false;
354+
355 useDeprecatedToolbar: false
356
357 // Work-around until this branch lands:
358@@ -222,8 +224,6 @@
359 property int starttime: -1;
360 property int endtime: -1;
361
362- selectedTabIndex: weekTab.index
363-
364 function newEvent() {
365 var startDate = new Date();
366 var endDate = new Date();
367@@ -324,6 +324,7 @@
368 Settings {
369 id: settings
370 property alias defaultViewIndex: tabs.selectedTabIndex
371+ property alias showWeekNumber: mainView.displayWeekNumber
372 }
373
374 Keys.onTabPressed: {
375
376=== modified file 'po/com.ubuntu.calendar.pot'
377--- po/com.ubuntu.calendar.pot 2015-10-28 02:23:11 +0000
378+++ po/com.ubuntu.calendar.pot 2015-11-23 07:20:37 +0000
379@@ -8,7 +8,7 @@
380 msgstr ""
381 "Project-Id-Version: \n"
382 "Report-Msgid-Bugs-To: \n"
383-"POT-Creation-Date: 2015-10-28 10:22+0800\n"
384+"POT-Creation-Date: 2015-11-23 15:14+0800\n"
385 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
386 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
387 "Language-Team: LANGUAGE <LL@li.org>\n"
388@@ -23,21 +23,21 @@
389 msgid "Today"
390 msgstr ""
391
392-#: ../AgendaView.qml:92
393+#: ../AgendaView.qml:93
394 msgid "No upcoming events"
395 msgstr ""
396
397-#: ../AgendaView.qml:95
398+#: ../AgendaView.qml:96
399 msgid "You have no calendars enabled"
400 msgstr ""
401
402-#: ../AgendaView.qml:105
403+#: ../AgendaView.qml:106
404 msgid "Enable calendars"
405 msgstr ""
406
407 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
408 #. while the second one (%2) refers to the end time
409-#: ../AgendaView.qml:168 ../EventBubble.qml:133
410+#: ../AgendaView.qml:169 ../EventBubble.qml:133
411 #, qt-format
412 msgid "%1 - %2"
413 msgstr ""
414@@ -46,34 +46,34 @@
415 #. on a given day. "Ev." is short form for "Events".
416 #. Please keep the translation of "Ev." to 3 characters only, as the week view
417 #. where it's shown has limited space
418-#: ../AllDayEventComponent.qml:123
419+#: ../AllDayEventComponent.qml:126
420 #, qt-format
421 msgid "%1 ev."
422 msgstr ""
423
424 #. TRANSLATORS: the argument refers to the number of all day events
425-#: ../AllDayEventComponent.qml:127
426+#: ../AllDayEventComponent.qml:130
427 #, qt-format
428 msgid "%1 all day event"
429 msgid_plural "%1 all day events"
430 msgstr[0] ""
431 msgstr[1] ""
432
433-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
434+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61
435 msgid "Calendars"
436 msgstr ""
437
438-#: ../CalendarChoicePopup.qml:37
439+#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
440 msgid "Back"
441 msgstr ""
442
443 #. TRANSLATORS: Please translate this string to 15 characters only.
444 #. Currently ,there is no way we can increase width of action menu currently.
445-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
446+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
447 msgid "Sync"
448 msgstr ""
449
450-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
451+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
452 msgid "Syncing"
453 msgstr ""
454
455@@ -101,7 +101,7 @@
456 #. TRANSLATORS: this is a time formatting string,
457 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
458 #. It's used in the header of the month and week views
459-#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
460+#: ../DayView.qml:60 ../MonthView.qml:61 ../WeekView.qml:64
461 msgid "MMMM yyyy"
462 msgstr ""
463
464@@ -154,10 +154,14 @@
465 msgid "Edit this"
466 msgstr ""
467
468-#: ../EventActions.qml:50 ../NewEvent.qml:325
469+#: ../EventActions.qml:51 ../NewEvent.qml:325
470 msgid "New Event"
471 msgstr ""
472
473+#: ../EventActions.qml:72 ../Settings.qml:28
474+msgid "Settings"
475+msgstr ""
476+
477 #. TRANSLATORS: the first argument (%1) refers to a time for an event,
478 #. while the second one (%2) refers to title of event
479 #: ../EventBubble.qml:144 ../EventBubble.qml:149
480@@ -259,6 +263,10 @@
481 msgid "After Date"
482 msgstr ""
483
484+#: ../MonthComponent.qml:260
485+msgid "Wk"
486+msgstr ""
487+
488 #: ../NewEvent.qml:84
489 msgid "Save"
490 msgstr ""
491@@ -390,6 +398,10 @@
492 msgid "2 weeks"
493 msgstr ""
494
495+#: ../Settings.qml:60
496+msgid "Show week numbers"
497+msgstr ""
498+
499 #: ../TimeLineBase.qml:73
500 msgid "Untitled"
501 msgstr ""
502@@ -404,35 +416,35 @@
503 msgid "All Day"
504 msgstr ""
505
506-#: ../YearView.qml:60
507+#: ../YearView.qml:61
508 #, qt-format
509 msgid "Year %1"
510 msgstr ""
511
512-#: ../calendar.qml:44
513+#: ../calendar.qml:47
514 msgid ""
515 "Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
516 "eventid. They will be managed by system. See the source for a full comment "
517 "about them"
518 msgstr ""
519
520-#: ../calendar.qml:448
521+#: ../calendar.qml:455
522 msgid "Year"
523 msgstr ""
524
525-#: ../calendar.qml:455
526+#: ../calendar.qml:462
527 msgid "Month"
528 msgstr ""
529
530-#: ../calendar.qml:462
531+#: ../calendar.qml:469
532 msgid "Week"
533 msgstr ""
534
535-#: ../calendar.qml:469
536+#: ../calendar.qml:476
537 msgid "Day"
538 msgstr ""
539
540-#: ../calendar.qml:476
541+#: ../calendar.qml:483
542 msgid "Agenda"
543 msgstr ""
544

Subscribers

People subscribed via source and target branches

to status/vote changes: