Merge lp:~renatofilho/ubuntu-calendar-app/optimize-page-load into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Simplify Tab loading, declaring individual components for each tab.
Make sure that year view is not loaded on app startup without request.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/optimize-page-load]

749. By Renato Araujo Oliveira Filho on 2016-01-25

Make sure that cachanges made on main model get propagated to model in the pages.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This was marked as needing the sdk-1.3 branch, but we already had (multiple) sdk-1.3 branches in flight. https://code.launchpad.net/~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix/+merge/284365 has been approved, could you re-base off that please?

[lp:~renatofilho/ubuntu-calendar-app/optimize-page-load]

750. By Renato Araujo Oliveira Filho on 2016-01-29

Merged: lp:~popey/ubuntu-calendar-app/Uitk1_3_and_font_fix

751. By Renato Araujo Oliveira Filho on 2016-01-29

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

752. By Renato Araujo Oliveira Filho on 2016-02-01

Merged: ~renatofilho/ubuntu-calendar-app/sdk-1-3

753. By Renato Araujo Oliveira Filho on 2016-02-01

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

754. By Renato Araujo Oliveira Filho on 2016-02-01

Merged. ~renatofilho/ubuntu-calendar-app/sdk-1-3/

755. By Renato Araujo Oliveira Filho on 2016-02-02

Parent branch merged.

756. By Renato Araujo Oliveira Filho on 2016-02-02

Parent merged:

757. By Renato Araujo Oliveira Filho on 2016-02-02

Parent merged.

Unmerged revisions

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2016-01-29 14:13:59 +0000
+++ AgendaView.qml	2016-01-29 14:13:59 +0000
@@ -57,7 +57,6 @@
 
     head.actions: [
         calendarTodayAction,
-        commonHeaderActions.newEventAction,
         commonHeaderActions.showCalendarAction,
         commonHeaderActions.reloadAction,
         commonHeaderActions.syncCalendarAction,

=== modified file 'DayView.qml'
--- DayView.qml	2016-01-29 14:13:59 +0000
+++ DayView.qml	2016-01-29 14:13:59 +0000
@@ -46,7 +46,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -56,7 +55,7 @@
         contents: Label {
             id:monthYear
             objectName:"monthYearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
             font.capitalization: Font.Capitalize
         }

=== modified file 'EventActions.qml'
--- EventActions.qml	2016-01-29 14:13:59 +0000
+++ EventActions.qml	2016-01-29 14:13:59 +0000
@@ -23,7 +23,9 @@
 Item {
     id: actionPool
 
-    property alias newEventAction: _newEventAction
+    //removing till following bug is resolved
+    //https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1493178
+    //property alias newEventAction: _newEventAction
     property alias showCalendarAction: _showCalendarAction
     property alias syncCalendarAction: _syncCalendarAction
     property alias settingsAction: _settingsAction

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2016-01-29 14:13:59 +0000
+++ EventDetails.qml	2016-01-29 14:13:59 +0000
@@ -271,7 +271,7 @@
                 Label{
                     id: titleLabel
                     objectName: "titleLabel"
-                    fontSize: "x-large"
+                    fontSize: "large"
                     width: parent.width
                     wrapMode: Text.WordWrap
                     color: "white"

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2016-01-29 14:13:59 +0000
+++ MonthComponent.qml	2016-01-29 14:13:59 +0000
@@ -35,7 +35,7 @@
 
     property string dayLabelFontSize: "medium"
     property string dateLabelFontSize: "large"
-    property string monthLabelFontSize: "x-large"
+    property string monthLabelFontSize: "large"
     property string yearLabelFontSize: "large"
 
     property alias dayLabelDelegate : dayLabelRepeater.delegate

=== modified file 'MonthView.qml'
--- MonthView.qml	2016-01-29 14:13:59 +0000
+++ MonthView.qml	2016-01-29 14:13:59 +0000
@@ -45,7 +45,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -54,7 +53,7 @@
 
         contents: Label {
             objectName:"monthYearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             // TRANSLATORS: this is a time formatting string,
             // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
             // It's used in the header of the month and week views

=== modified file 'Settings.qml'
--- Settings.qml	2016-01-29 14:13:59 +0000
+++ Settings.qml	2016-01-29 14:13:59 +0000
@@ -25,9 +25,9 @@
     objectName: "settings"
 
     visible: false
+
+    head {
     title: i18n.tr("Settings")
-
-    head {
         backAction: Action {
             text: i18n.tr("Back")
             iconName: "back"

=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2016-01-29 14:13:59 +0000
+++ ViewHeader.qml	2016-01-29 14:13:59 +0000
@@ -26,7 +26,7 @@
     property int month;
     property int year;
 
-    property string monthLabelFontSize: "x-large"
+    property string monthLabelFontSize: "large"
     property string yearLabelFontSize: "large"
 
     Label{

=== modified file 'WeekView.qml'
--- WeekView.qml	2016-01-29 14:13:59 +0000
+++ WeekView.qml	2016-01-29 14:13:59 +0000
@@ -50,7 +50,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -60,7 +59,7 @@
         contents: Label {
             id:monthYear
             objectName:"monthYearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
             font.capitalization: Font.Capitalize
         }

=== modified file 'YearView.qml'
--- YearView.qml	2016-01-29 14:13:59 +0000
+++ YearView.qml	2016-01-29 14:13:59 +0000
@@ -48,7 +48,6 @@
     head {
         actions: [
             calendarTodayAction,
-            commonHeaderActions.newEventAction,
             commonHeaderActions.showCalendarAction,
             commonHeaderActions.reloadAction,
             commonHeaderActions.syncCalendarAction,
@@ -57,7 +56,7 @@
         contents: Label {
             id:year
             objectName:"yearLabel"
-            fontSize: "x-large"
+            fontSize: "large"
             text: i18n.tr("Year %1").arg(currentYear)
         }
     }

=== modified file 'calendar.qml'
--- calendar.qml	2016-01-29 14:13:59 +0000
+++ calendar.qml	2016-01-29 14:13:59 +0000
@@ -126,6 +126,7 @@
             }
         }
 
+        // Load events after the app startup
         Timer {
             id: applyFilterTimer
             interval: 200; running: false; repeat: false
@@ -157,6 +158,16 @@
             id: collectionFilter
         }
 
+        InvalidFilter {
+            id: invalidFilter
+        }
+
+        IntersectionFilter {
+            id: mainFilter
+
+            filters: [ collectionFilter, itemTypeFilter]
+        }
+
         EventListModel{
             id: eventModel
 
@@ -164,9 +175,7 @@
             startPeriod: tabs.currentDay
             endPeriod: tabs.currentDay
 
-            filter: IntersectionFilter {
-                filters: [ collectionFilter, itemTypeFilter]
-            }
+            filter: invalidFilter
 
             function delayedApplyFilter() {
                 applyFilterTimer.restart();
@@ -182,6 +191,7 @@
                     }
                 }
                 collectionFilter.ids = collectionIds;
+                filter = mainFilter
             }
 
             function showEventFromId(eventId) {
@@ -214,6 +224,7 @@
             id: tabs
             Keys.forwardTo: [tabs.currentPage]
 
+            property bool isReady: false
             property var currentDay: DateExt.today();
             property var selectedDay;
 
@@ -313,6 +324,7 @@
                 else {
                     tabs.selectedTabIndex = settings.defaultViewIndex;
                 }
+                tabs.isReady = true
             } // End of Component.onCompleted:
 
             EventActions {
@@ -347,139 +359,194 @@
                 }
             }
 
-            onSelectedTabChanged: {
-                switch (tabs.selectedTab) {
-                case yearTab:{
-                    if (yearTab.page === null) {
-                        var yearViewCom = Qt.createComponent("YearView.qml");
-                        if (yearViewCom.status === Component.Ready) {
-                            var yearViewObj = yearViewCom.createObject(mainView);
-
-                            yearViewObj.monthSelected.connect(function (date){
-                                var now = DateExt.today();
-                                if( date.getMonth() === now.getMonth()
-                                        && date.getFullYear() === now.getFullYear()) {
-                                    tabs.currentDay = now;
-                                } else {
-                                    tabs.currentDay = date.midnight();
-                                }
-                                tabs.selectedTabIndex = monthTab.index;
-                            })
-
-                            yearTab.page = yearViewObj;
-                        }
-                    } else {
-                        yearTab.page.refreshCurrentYear(DateExt.today().getFullYear());
-                    }
-                } break;
-                case monthTab: {
-                    if (monthTab.page === null) {
-                        var monthViewCom = Qt.createComponent("MonthView.qml");
-                        if (monthViewCom.status === Component.Ready) {
-                            var monthViewObj = monthViewCom.createObject(mainView);
-
-                            monthViewObj.dateSelected.connect(function (date) {
-                                tabs.currentDay = date;
-                                tabs.selectedTabIndex = dayTab.index;
-                            })
-
-                            monthTab.page = monthViewObj;
-                        }
-                    } else {
-                        monthTab.page.currentMonth = tabs.currentDay.midnight();
-                    }
-                } break;
-                case weekTab: {
-                    if (weekTab.page === null) {
-                        var weekViewCom = Qt.createComponent("WeekView.qml");
-                        if (weekViewCom.status === Component.Ready) {
-                            var weekViewObj = weekViewCom.createObject(mainView);
-
-                            weekViewObj.isCurrentPage = Qt.binding(function() { return tabs.selectedTab == weekTab })
-                            weekViewObj.onDayStartChanged.connect(function (){
-                                tabs.currentDay = weekViewObj.dayStart;
-                            });
-                            weekViewObj.dateSelected.connect(function (date){
-                                tabs.currentDay = date;
-                                tabs.selectedTabIndex = dayTab.index;
-                            });
-
-                            weekTab.page = weekViewObj;
-                        }
-                    } else {
-                        weekTab.page.dayStart = tabs.currentDay;
-                    }
-                } break;
-                case dayTab: {
-                    if (dayTab.page === null) {
-                        var dayViewCom = Qt.createComponent("DayView.qml");
-                        if (dayViewCom.status === Component.Ready) {
-                            var dayViewObj = dayViewCom.createObject(mainView);
-
-                            dayViewObj.isCurrentPage= Qt.binding(function() { return tabs.selectedTab == dayTab })
-                            dayViewObj.onCurrentDayChanged.connect(function (){
-                                tabs.currentDay = dayViewObj.currentDay;
-                            });
-                            dayViewObj.dateSelected.connect(function (date) {
-                                tabs.currentDay = date;
-                            });
-
-                            dayTab.page  =dayViewObj;
-                        }
-                    } else {
-                        dayTab.page.currentDay = tabs.currentDay;
-                    }
-                } break;
-                case agendaTab: {
-                    var agendaViewCom = Qt.createComponent("AgendaView.qml");
-                    if (agendaViewCom.status === Component.Ready) {
-                        var agendaViewObj = agendaViewCom.createObject(mainView);
-
-                        agendaViewObj.dateSelected.connect(function (date){
-                            tabs.currentDay = date;
-                            tabs.selectedTabIndex = dayTab.index;
-                        })
-                        agendaTab.page = agendaViewObj;
-                    }
-                } break;
-                default:
-                    break;
-                }
-            }
-
             Tab{
                 id: yearTab
                 objectName: "yearTab"
                 title: i18n.tr("Year")
-                page: null
+
+                page: Loader {
+                    id: yearViewLoader
+
+                    asynchronous: true
+                    sourceComponent: yearViewComp
+                    active: false
+                    // Load page on demand and keep it on memory until the application is closed
+                    enabled: tabs.isReady && (tabs.selectedTab == yearTab)
+                    onEnabledChanged: {
+                        if (enabled && !active) {
+                            active = true
+                        }
+                    }
+                }
             }
 
             Tab{
                 id: monthTab
                 objectName: "monthTab"
                 title: i18n.tr("Month")
-                page: null
+
+                page: Loader {
+                    id: monthTabLoader
+
+                    asynchronous: true
+                    sourceComponent: monthViewComp
+                    active: false
+                    // Load page on demand and keep it on memory until the application is closed
+                    enabled: tabs.isReady && (tabs.selectedTab == monthTab)
+                    onEnabledChanged: {
+                        if (enabled && !active) {
+                            active = true
+                        }
+                    }
+                }
             }
 
             Tab{
                 id: weekTab
                 objectName: "weekTab"
                 title: i18n.tr("Week")
-                page: null
+
+                page: Loader {
+                    id: weekTabLoader
+
+                    asynchronous: true
+                    sourceComponent: weekViewComp
+                    active: false
+                    // Load page on demand and keep it on memory until the application is closed
+                    enabled: tabs.isReady && (tabs.selectedTab == weekTab)
+                    onEnabledChanged: {
+                        if (enabled && !active) {
+                            active = true
+                        }
+                    }
+                }
             }
 
             Tab{
                 id: dayTab
                 objectName: "dayTab"
                 title: i18n.tr("Day")
-                page: null
+
+                page:Loader {
+                    id: dayTabLoader
+
+                    asynchronous: true
+                    sourceComponent: dayViewComp
+                    active: false
+                    // Load page on demand and keep it on memory until the application is closed
+                    enabled: tabs.isReady && (tabs.selectedTab == dayTab)
+                    onEnabledChanged: {
+                        if (enabled && !active) {
+                            active = true
+                        }
+                    }
+                }
             }
 
             Tab {
                 id: agendaTab
                 objectName: "agendaTab"
                 title: i18n.tr("Agenda")
-                page: null
+
+                page: Loader {
+                    id: agendaTabLoader
+
+                    asynchronous: true
+                    sourceComponent: agendaViewComp
+                    active: false
+                    // Load page on demand and keep it on memory until the application is closed
+                    enabled: tabs.isReady && (tabs.selectedTab == agendaTab)
+                    onEnabledChanged: {
+                        if (enabled && !active) {
+                            active = true
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: yearViewComp
+
+        YearView {
+            onMonthSelected: {
+                var now = DateExt.today();
+                if ((date.getMonth() === now.getMonth()) &&
+                    (date.getFullYear() === now.getFullYear())) {
+                    tabs.currentDay = now;
+                } else {
+                    tabs.currentDay = date.midnight();
+                }
+                tabs.selectedTabIndex = monthTab.index;
+            }
+            onActiveChanged: {
+                if (active) {
+                    refreshCurrentYear(DateExt.today().getFullYear())
+                }
+            }
+        }
+    }
+
+    Component {
+        id: monthViewComp
+
+        MonthView {
+            onDateSelected: {
+                tabs.currentDay = date;
+                tabs.selectedTabIndex = dayTab.index
+            }
+            onActiveChanged: {
+                if (active)
+                    currentMonth = tabs.currentDay.midnight()
+            }
+        }
+    }
+
+    Component {
+        id: weekViewComp
+
+        WeekView {
+            onDayStartChanged: {
+                tabs.currentDay = dayStart
+            }
+            onDateSelected: {
+                tabs.currentDay = date;
+                tabs.selectedTabIndex = dayTab.index
+            }
+            onActiveChanged: {
+                if (active)
+                    dayStart = tabs.currentDay
+            }
+        }
+    }
+
+    Component {
+        id: dayViewComp
+
+        DayView {
+            onCurrentDayChanged: {
+                tabs.currentDay = currentDay;
+            }
+
+            onDateSelected: {
+                tabs.currentDay = date
+            }
+
+            onActiveChanged: {
+                if (active)
+                    currentDay = tabs.currentDay;
+            }
+        }
+    }
+
+    Component {
+        id: agendaViewComp
+
+        AgendaView {
+            onDateSelected: {
+                tabs.currentDay = date;
+                tabs.selectedTabIndex = dayTab.index
             }
         }
     }

=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot	2015-11-23 07:15:20 +0000
+++ po/com.ubuntu.calendar.pot	2016-01-29 14:13:59 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-23 15:14+0800\n"
+"POT-Creation-Date: 2015-11-01 10:45+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,25 +19,25 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
-#: ../WeekView.qml:44 ../YearView.qml:42
+#: ../WeekView.qml:44 ../YearView.qml:36
 msgid "Today"
 msgstr ""
 
-#: ../AgendaView.qml:93
+#: ../AgendaView.qml:92
 msgid "No upcoming events"
 msgstr ""
 
-#: ../AgendaView.qml:96
+#: ../AgendaView.qml:95
 msgid "You have no calendars enabled"
 msgstr ""
 
-#: ../AgendaView.qml:106
+#: ../AgendaView.qml:105
 msgid "Enable calendars"
 msgstr ""
 
 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
 #. while the second one (%2) refers to the end time
-#: ../AgendaView.qml:169 ../EventBubble.qml:133
+#: ../AgendaView.qml:168 ../EventBubble.qml:133
 #, qt-format
 msgid "%1 - %2"
 msgstr ""
@@ -46,34 +46,34 @@
 #. on a given day. "Ev." is short form for "Events".
 #. Please keep the translation of "Ev." to 3 characters only, as the week view
 #. where it's shown has limited space
-#: ../AllDayEventComponent.qml:126
+#: ../AllDayEventComponent.qml:123
 #, qt-format
 msgid "%1 ev."
 msgstr ""
 
 #. TRANSLATORS: the argument refers to the number of all day events
-#: ../AllDayEventComponent.qml:130
+#: ../AllDayEventComponent.qml:127
 #, qt-format
 msgid "%1 all day event"
 msgid_plural "%1 all day events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:61
+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
 msgid "Calendars"
 msgstr ""
 
-#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
+#: ../CalendarChoicePopup.qml:37
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: Please translate this string  to 15 characters only.
 #. Currently ,there is no way we can increase width of action menu currently.
-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
 msgid "Sync"
 msgstr ""
 
-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
 msgid "Syncing"
 msgstr ""
 
@@ -101,7 +101,7 @@
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
 #. It's used in the header of the month and week views
-#: ../DayView.qml:60 ../MonthView.qml:61 ../WeekView.qml:64
+#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
 msgid "MMMM yyyy"
 msgstr ""
 
@@ -136,7 +136,7 @@
 msgid "Delete"
 msgstr ""
 
-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
 msgid "Edit Event"
 msgstr ""
 
@@ -154,14 +154,10 @@
 msgid "Edit this"
 msgstr ""
 
-#: ../EventActions.qml:51 ../NewEvent.qml:325
+#: ../EventActions.qml:50 ../NewEvent.qml:324
 msgid "New Event"
 msgstr ""
 
-#: ../EventActions.qml:72 ../Settings.qml:28
-msgid "Settings"
-msgstr ""
-
 #. TRANSLATORS: the first argument (%1) refers to a time for an event,
 #. while the second one (%2) refers to title of event
 #: ../EventBubble.qml:144 ../EventBubble.qml:149
@@ -169,7 +165,7 @@
 msgid "%1 <b>%2</b>"
 msgstr ""
 
-#: ../EventDetails.qml:43 ../NewEvent.qml:436
+#: ../EventDetails.qml:43 ../NewEvent.qml:435
 msgid "Event Details"
 msgstr ""
 
@@ -193,11 +189,11 @@
 msgid "Edit"
 msgstr ""
 
-#: ../EventDetails.qml:354 ../NewEvent.qml:538
+#: ../EventDetails.qml:354 ../NewEvent.qml:537
 msgid "Guests"
 msgstr ""
 
-#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:635
+#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634
 msgid "Reminder"
 msgstr ""
 
@@ -220,7 +216,7 @@
 #. TRANSLATORS: this refers to how often a recurrent event repeats
 #. and it is shown as the header of the option selector to choose
 #. its repetition
-#: ../EventRepetition.qml:242 ../NewEvent.qml:619
+#: ../EventRepetition.qml:242 ../NewEvent.qml:618
 msgid "Repeats"
 msgstr ""
 
@@ -263,10 +259,6 @@
 msgid "After Date"
 msgstr ""
 
-#: ../MonthComponent.qml:260
-msgid "Wk"
-msgstr ""
-
 #: ../NewEvent.qml:84
 msgid "Save"
 msgstr ""
@@ -275,43 +267,43 @@
 msgid "End time can't be before start time"
 msgstr ""
 
-#: ../NewEvent.qml:335
+#: ../NewEvent.qml:334
 msgid "Error"
 msgstr ""
 
-#: ../NewEvent.qml:337
+#: ../NewEvent.qml:336
 msgid "OK"
 msgstr ""
 
-#: ../NewEvent.qml:390
+#: ../NewEvent.qml:389
 msgid "From"
 msgstr ""
 
-#: ../NewEvent.qml:403
+#: ../NewEvent.qml:402
 msgid "To"
 msgstr ""
 
-#: ../NewEvent.qml:420
+#: ../NewEvent.qml:419
 msgid "All day event"
 msgstr ""
 
-#: ../NewEvent.qml:449
+#: ../NewEvent.qml:448
 msgid "Event Name"
 msgstr ""
 
-#: ../NewEvent.qml:467
+#: ../NewEvent.qml:466
 msgid "Description"
 msgstr ""
 
-#: ../NewEvent.qml:485
+#: ../NewEvent.qml:484
 msgid "Location"
 msgstr ""
 
-#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
+#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1
 msgid "Calendar"
 msgstr ""
 
-#: ../NewEvent.qml:542
+#: ../NewEvent.qml:541
 msgid "Add Guest"
 msgstr ""
 
@@ -398,10 +390,6 @@
 msgid "2 weeks"
 msgstr ""
 
-#: ../Settings.qml:60
-msgid "Show week numbers"
-msgstr ""
-
 #: ../TimeLineBase.qml:73
 msgid "Untitled"
 msgstr ""
@@ -416,35 +404,35 @@
 msgid "All Day"
 msgstr ""
 
-#: ../YearView.qml:61
+#: ../YearView.qml:54
 #, qt-format
 msgid "Year %1"
 msgstr ""
 
-#: ../calendar.qml:47
+#: ../calendar.qml:45
 msgid ""
 "Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
 "eventid. They will be managed by system. See the source for a full comment "
 "about them"
 msgstr ""
 
-#: ../calendar.qml:455
+#: ../calendar.qml:354
 msgid "Year"
 msgstr ""
 
-#: ../calendar.qml:462
+#: ../calendar.qml:388
 msgid "Month"
 msgstr ""
 
-#: ../calendar.qml:469
+#: ../calendar.qml:421
 msgid "Week"
 msgstr ""
 
-#: ../calendar.qml:476
+#: ../calendar.qml:459
 msgid "Day"
 msgstr ""
 
-#: ../calendar.qml:483
+#: ../calendar.qml:491
 msgid "Agenda"
 msgstr ""