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

[Renato Araujo Oliveira Filho]

Optimize MonthComponent

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:617
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1113/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2438
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/584
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/110

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

review: Approve (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

added inline comment

review: Needs Information

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

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

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

review: Needs Fixing (continuous-integration)

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

624. By Renato Araujo Oliveira Filho on 2016-01-13

Use only one UbuntuShape on MonComponent.

Move the UbuntuShape component based on today/selected items.

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

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

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

review: Needs Fixing (continuous-integration)

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

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

Update to SDK 1.3 and Quick 2.4

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

Optimize views.

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

Trunk merged.

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

Parent merged.

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

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

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

review: Needs Fixing (continuous-integration)

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

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

Parent merged.

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

Fixed wrong merge.

631. By Renato Araujo Oliveira Filho on 2016-01-26

Make year view delegates async.

632. By Renato Araujo Oliveira Filho on 2016-01-26

Use only one mouse area for the month view, instead of an individual mouse area for each day delegate.
Split MonthDay delegate in two different classes to be used on year view and month view.

633. By Renato Araujo Oliveira Filho on 2016-01-26

Fixed WeekView start date.

634. By Renato Araujo Oliveira Filho on 2016-01-26

Make sure that new events are created in the last selected date.

635. By Renato Araujo Oliveira Filho on 2016-01-26

Make sure the page on week view scroll to correct position while swiping it.

636. By Renato Araujo Oliveira Filho on 2016-01-28

Merged: ~renatofilho/ubuntu-calendar-app/week-press-and-hold-create-event

637. By Renato Araujo Oliveira Filho on 2016-01-28

Create a binding for main event filter to avoid problems with the filter changes.

638. By Renato Araujo Oliveira Filho on 2016-01-28

Update changes on parent branch.

639. By Renato Araujo Oliveira Filho on 2016-01-28

Fixed "today" action on week view.

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

Merged: lp:~renatofilho/ubuntu-calendar-app/week-press-and-hold-create-event

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

Merged: ~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field

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

merged: ~renatofilho/ubuntu-calendar-app/week-press-and-hold-create-event

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

merged: ~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field

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

Merged: ~renatofilho/ubuntu-calendar-app/fix-add-guest-search-field

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

Merged: ~renatofilho/ubuntu-calendar-app/optimize-page-load

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

Merged: ~renatofilho/ubuntu-calendar-app/bottom-edge

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

Merged: ~renatofilho/ubuntu-calendar-app/week-press-and-hold-create-event

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

Does not change main date if the current date change on views.

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

Trunk merged

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

Make sure that new event is created on highlighted date if selected.

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

Merged: ~renatofilho/ubuntu-calendar-app/bottom-edge

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

Make sure tha the today event get highlight on month and year view.

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

lp:~renatofilho/ubuntu-calendar-app/bottom-edge

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

Merged: ~renatofilho/ubuntu-calendar-app/bottom-edge

655. By Renato Araujo Oliveira Filho on 2016-02-03

Revert changes on KeyboardRectangle.qml

656. By Renato Araujo Oliveira Filho on 2016-02-03

Improve animation when keyboard appears.

657. By Renato Araujo Oliveira Filho on 2016-02-03

Avoid crash when application closes with bottom edge open.

658. By Renato Araujo Oliveira Filho on 2016-02-04

Avoid contact list to stole focus from text field on ContactChoicePopup.

659. By Renato Araujo Oliveira Filho on 2016-02-04

Show a activity indicator while rebuild events.
Make sure only bubble events are destroyed while rebuild events.

660. By Renato Araujo Oliveira Filho on 2016-02-04

Allow create all day events by pressing and hold at all day header.

661. By Renato Araujo Oliveira Filho on 2016-02-05

Make sure the timeline events are recreated when model changes.

662. By Renato Araujo Oliveira Filho on 2016-02-10

Only create all days events after release the mouse button.

663. By Renato Araujo Oliveira Filho on 2016-02-11

Use bottom edge element to create new events, intead of pushing new pages.
Avoid update unactive pages when model changes.

664. By Renato Araujo Oliveira Filho on 2016-02-11

Disabled predictive text for event title and location.

665. By Renato Araujo Oliveira Filho on 2016-02-11

Avoid warning messages if startDate/endDate is unset.

666. By Renato Araujo Oliveira Filho on 2016-02-11

Fixed event drawing.

667. By Renato Araujo Oliveira Filho on 2016-02-11

Remove debug message.

668. By Renato Araujo Oliveira Filho on 2016-02-11

Fix endDate set on new event page.

669. By Renato Araujo Oliveira Filho on 2016-02-12

Keep new event page visible until the event is saved on database.

670. By Renato Araujo Oliveira Filho on 2016-02-24

Wek view bottom edge always create event with today date.

671. By Renato Araujo Oliveira Filho on 2016-02-24

Create new event based on scrolled view.

672. By Renato Araujo Oliveira Filho on 2016-02-24

Does not create new event on all day click.

You need to press and hold.

673. By Renato Araujo Oliveira Filho on 2016-02-24

Avoid run several events re-layout at the same time.

674. By Renato Araujo Oliveira Filho on 2016-02-24

Emit 'bottomEdgeCommit' when opening bottom edge.

675. By Renato Araujo Oliveira Filho on 2016-02-24

Make sure that week view is scrolled to current time when app is opened.
Fix 'today' action to correct scroll to current date on week view.

676. By Renato Araujo Oliveira Filho on 2016-02-24

Allow to edit single events on all day header.

677. By Renato Araujo Oliveira Filho on 2016-02-24

Wait 1sec before do the model query in week view and day view.

678. By Renato Araujo Oliveira Filho on 2016-02-24

Always create today event on week view bottom edge.
Create current day and now time event in day view bottom edge.

679. By Renato Araujo Oliveira Filho on 2016-02-24

Make sure that all day views scroll to the same position.

680. By Renato Araujo Oliveira Filho on 2016-02-24

Only update model events when PathView stop to move.

681. By Renato Araujo Oliveira Filho on 2016-02-24

Remove debug message.

682. By Renato Araujo Oliveira Filho on 2016-02-25

Update month view to run query only after scrolls stops.

683. By Renato Araujo Oliveira Filho on 2016-02-25

Keep dates in sync btw panels.

684. By Renato Araujo Oliveira Filho on 2016-02-25

Optimize day/week/month view.

685. By Renato Araujo Oliveira Filho on 2016-02-25

After create a new event scroll view to new event position.

686. By Renato Araujo Oliveira Filho on 2016-02-25

Show a spinner while saving an item after move it.

687. By Renato Araujo Oliveira Filho on 2016-02-26

Fixed scroll to today for week view and day view.

688. By Renato Araujo Oliveira Filho on 2016-02-26

Fixed event drawing.

Make sure that the incubator object is created before continue creating events.

689. By Renato Araujo Oliveira Filho on 2016-02-26

Write better code.

690. By Renato Araujo Oliveira Filho on 2016-02-26

Use QOrganizerItemModel instead of EventListModel in TimeLine component.

691. By Renato Araujo Oliveira Filho on 2016-02-26

Does not try to scroll to created event date if the event is already visible.

692. By Renato Araujo Oliveira Filho on 2016-02-26

Remove debug messages.

693. By Renato Araujo Oliveira Filho on 2016-02-27

Vertical centralize view after scroll to a date.

694. By Renato Araujo Oliveira Filho on 2016-02-27

Does not scroll back to today page after go back from contact details.

695. By Renato Araujo Oliveira Filho on 2016-02-28

Rewrite events layout and drawing;

Events will be drawed without overlap eachother;
Events will be resized to fit in the day column;

696. By Renato Araujo Oliveira Filho on 2016-02-29

Use async function to calculate event layout.

697. By Renato Araujo Oliveira Filho on 2016-02-29

Created unit test for new calentar layout function

698. By Renato Araujo Oliveira Filho on 2016-02-29

Remove unecessary code.

699. By Renato Araujo Oliveira Filho on 2016-03-01

Added comments.

700. By Renato Araujo Oliveira Filho on 2016-03-01

Make the now time separator always visible.

701. By Renato Araujo Oliveira Filho on 2016-03-01

Avoid to draw events too small and make impossible to read events title.

702. By Renato Araujo Oliveira Filho on 2016-03-01

Update current time separator line every 5 minutes.

703. By Renato Araujo Oliveira Filho on 2016-03-01

Use EleventListModel because of helper functions necessary on NewEvent page.
Avoid re-draw events while the worker script still running.

704. By Renato Araujo Oliveira Filho on 2016-03-01

Centralize event after creation.

705. By Renato Araujo Oliveira Filho on 2016-03-01

Fixed event date used for bottom edge on day view.

706. By Renato Araujo Oliveira Filho on 2016-03-01

Year view always create event on today date when using bottom edge.

707. By Renato Araujo Oliveira Filho on 2016-03-01

Switching from week to day view will show the first day of the week or the last event start date clicked.

708. By Renato Araujo Oliveira Filho on 2016-03-01

Conflict solved.

709. By Renato Araujo Oliveira Filho on 2016-03-01

Make sure that year view shows the application global date year when opening.

710. By Renato Araujo Oliveira Filho on 2016-03-02

Optimize event layout function.

711. By Renato Araujo Oliveira Filho on 2016-03-02

Fix event drawing.

712. By Renato Araujo Oliveira Filho on 2016-03-02

Make sur that the week view is opened on the tabs.Day.

713. By Renato Araujo Oliveira Filho on 2016-03-02

Fixed event edit with contacts.

714. By Renato Araujo Oliveira Filho on 2016-03-02

Make sure that event bubble is correct drawed if event data changes after bubble creation.

715. By Renato Araujo Oliveira Filho on 2016-03-02

Does not draw too small events.

716. By Renato Araujo Oliveira Filho on 2016-03-02

Redraw events if it get update while the worker script was running.

717. By Renato Araujo Oliveira Filho on 2016-03-02

Does not redraw DayView if the global date only changes the time.

718. By Renato Araujo Oliveira Filho on 2016-03-02

Fixed floating event size.

719. By Renato Araujo Oliveira Filho on 2016-03-02

Use the default collection to create events if it is enabled ortherwise return the first enabled collection.
Fix all day events creation.

720. By Renato Araujo Oliveira Filho on 2016-03-03

If week start and end in different month show both month names in the week view title.

721. By Renato Araujo Oliveira Filho on 2016-03-03

Fix today scroll in day view.

722. By Renato Araujo Oliveira Filho on 2016-03-03

Make sure that Day/Week view scroll to correct date while alternating btw views.

723. By Renato Araujo Oliveira Filho on 2016-03-03

Update application click framework.

724. By Renato Araujo Oliveira Filho on 2016-03-03

Avoid time scroll after create a all day event.

725. By Renato Araujo Oliveira Filho on 2016-03-03

Show event full title on all day header if the space is bigger than units.gu(15)

726. By Renato Araujo Oliveira Filho on 2016-03-03

Fix all day events edit.

727. By Renato Araujo Oliveira Filho on 2016-03-03

Do not scroll vertically for all day events.

728. By Renato Araujo Oliveira Filho on 2016-03-03

Parent merged.

729. By Renato Araujo Oliveira Filho on 2016-03-04

Use events word instead of 'ev.' for all day events.

730. By Renato Araujo Oliveira Filho on 2016-03-04

Update events filter if the collections changed.

731. By Renato Araujo Oliveira Filho on 2016-03-04

Update apparmor policy version.

732. By Renato Araujo Oliveira Filho on 2016-03-04

Disable model update while sync is in progress to avoid several updates.

733. By Renato Araujo Oliveira Filho on 2016-03-05

Keep event bubble color in sync with calendar event color.

734. By Renato Araujo Oliveira Filho on 2016-03-07

Fixed day view title.

735. By Renato Araujo Oliveira Filho on 2016-03-07

Fixed uri handler for eventId.

736. By Renato Araujo Oliveira Filho on 2016-03-07

Fix new event reminders and repeater.

Unmerged revisions

736. By Renato Araujo Oliveira Filho on 2016-03-07

Fix new event reminders and repeater.

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2015-07-11 02:18:03 +0000
+++ AgendaView.qml	2016-01-25 17:43:39 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import "dateExt.js" as DateExt
 
 
=== modified file 'AllDayEventComponent.qml'
--- AllDayEventComponent.qml	2015-08-07 06:20:23 +0000
+++ AllDayEventComponent.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 
 
=== modified file 'CalendarChoicePopup.qml'
--- CalendarChoicePopup.qml	2015-05-28 13:56:12 +0000
+++ CalendarChoicePopup.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import QtOrganizer 5.0
 
=== modified file 'CalendarListButtonDelegate.qml'
--- CalendarListButtonDelegate.qml	2015-05-28 13:58:30 +0000
+++ CalendarListButtonDelegate.qml	2016-01-25 17:43:39 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 ListItem.Standard {
 
=== modified file 'ColorPickerDialog.qml'
--- ColorPickerDialog.qml	2015-04-14 19:52:04 +0000
+++ ColorPickerDialog.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
 
=== modified file 'ContactChoicePopup.qml'
--- ContactChoicePopup.qml	2015-05-14 03:36:22 +0000
+++ ContactChoicePopup.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Themes.Ambiance 1.0
 
=== modified file 'DayView.qml'
--- DayView.qml	2015-11-23 07:15:20 +0000
+++ DayView.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
@@ -25,8 +25,8 @@
     id: dayViewPage
     objectName: "dayViewPage"
 
-    property var currentDay: new Date()
-    property bool isCurrentPage: false
+    property var anchorDate: new Date()
+    readonly property var currentDate: dayViewPath.currentItem.startDay
 
     signal dateSelected(var date);
 
@@ -39,7 +39,8 @@
         iconName: "calendar-today"
         text: i18n.tr("Today")
         onTriggered: {
-            currentDay = new Date()
+            dayViewPath.scrollToBegginer()
+            anchorDate = new Date()
         }
     }
 
@@ -57,7 +58,7 @@
             id:monthYear
             objectName:"monthYearLabel"
             fontSize: "x-large"
-            text: currentDay.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
+            text: currentDate.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
             font.capitalization: Font.Capitalize
         }
     }
@@ -66,74 +67,53 @@
         id: dayViewPath
         objectName: "dayViewPath"
 
-        property var startDay: currentDay
         //This is used to scroll all view together when currentItem scrolls
         property var childContentY;
 
         anchors.fill: parent
 
-        onNextItemHighlighted: {
-            //next day
-            currentDay = currentDay.addDays(1);
-        }
-
-        onPreviousItemHighlighted: {
-            //previous day
-            currentDay = currentDay.addDays(-1);
-        }
-
-        delegate: Loader {
+        delegate: TimeLineBaseComponent {
+            id: timeLineView
+            objectName: "DayComponent-"+index
+
             width: parent.width
             height: parent.height
-            asynchronous: !dayViewPath.isCurrentItem
-            sourceComponent: delegateComponent
-
-            Component {
-                id: delegateComponent
-
-                TimeLineBaseComponent {
-                    id: timeLineView
-                    objectName: "DayComponent-"+index
-
-                    type: ViewType.ViewTypeDay
-                    anchors.fill: parent
-
-                    isActive: parent.PathView.isCurrentItem
-                    contentInteractive: parent.PathView.isCurrentItem
-                    startDay: dayViewPath.startDay.addDays(dayViewPath.indexType(index))
-                    keyboardEventProvider: dayViewPath
-
-                    Component.onCompleted: {
-                        if(dayViewPage.isCurrentPage){
-                            timeLineView.scrollToCurrentTime();
-                        }
-                    }
-
-                    Connections{
-                        target: dayViewPage
-                        onIsCurrentPageChanged:{
-                            if(dayViewPage.isCurrentPage){
-                                timeLineView.scrollToCurrentTime();
-                            }
-                        }
-                    }
-
-                    //get contentY value from PathView, if its not current Item
-                    Binding{
-                        target: timeLineView
-                        property: "contentY"
-                        value: dayViewPath.childContentY;
-                        when: !parent.PathView.isCurrentItem
-                    }
-
-                    //set PathView's contentY property, if its current item
-                    Binding{
-                        target: dayViewPath
-                        property: "childContentY"
-                        value: contentY
-                        when: parent.PathView.isCurrentItem
-                    }
-                }
+
+            type: ViewType.ViewTypeDay
+            isActive: PathView.isCurrentItem
+            contentInteractive: PathView.isCurrentItem
+            startDay: anchorDate.addDays(dayViewPath.loopCurrentIndex + dayViewPath.indexType(index))
+            keyboardEventProvider: dayViewPath
+
+            Component.onCompleted: {
+                if(dayViewPage.active){
+                    timeLineView.scrollToCurrentTime();
+                }
+            }
+
+            Connections{
+                target: dayViewPage
+                onActiveChanged: {
+                    if(dayViewPage.active){
+                        timeLineView.scrollToCurrentTime();
+                    }
+                }
+            }
+
+            //get contentY value from PathView, if its not current Item
+            Binding{
+                target: timeLineView
+                property: "contentY"
+                value: dayViewPath.childContentY;
+                when: !parent.PathView.isCurrentItem
+            }
+
+            //set PathView's contentY property, if its current item
+            Binding{
+                target: dayViewPath
+                property: "childContentY"
+                value: contentY
+                when: parent.PathView.isCurrentItem
             }
         }
     }
 
=== modified file 'Defines.js'
--- Defines.js	2014-10-22 14:03:01 +0000
+++ Defines.js	2016-01-25 17:43:39 +0000
@@ -43,8 +43,8 @@
 
 function getWeekLabels(){
     var object = Qt.createQmlObject('\
-        import QtQuick 2.3;\
-        import Ubuntu.Components 1.1;\
+        import QtQuick 2.4;\
+        import Ubuntu.Components 1.3;\
         QtObject {\
             property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
                                     Qt.locale().dayName(1,Locale.NarrowFormat),\
 
=== modified file 'DeleteConfirmationDialog.qml'
--- DeleteConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ DeleteConfirmationDialog.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
 
=== modified file 'EditEventConfirmationDialog.qml'
--- EditEventConfirmationDialog.qml	2014-10-14 17:20:13 +0000
+++ EditEventConfirmationDialog.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Dialog {
 
=== modified file 'EventActions.qml'
--- EventActions.qml	2015-07-11 02:18:03 +0000
+++ EventActions.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.SyncMonitor 0.1
 
 Item {
 
=== modified file 'EventBubble.qml'
--- EventBubble.qml	2015-11-29 03:17:30 +0000
+++ EventBubble.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 Item{
 
=== modified file 'EventDetails.qml'
--- EventDetails.qml	2015-08-03 04:47:59 +0000
+++ EventDetails.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Popups 1.0
@@ -209,7 +209,7 @@
                     dialog.editEvent.connect( function(eventId){
                         if( eventId === event.parentId ) {
                             showEditEventPage(internal.parentEvent, model)
-                        } else {                            
+                        } else {
                             showEditEventPage(event, model)
                         }
                     });
 
=== modified file 'EventReminder.qml'
--- EventReminder.qml	2015-07-12 03:39:07 +0000
+++ EventReminder.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Page{
 
=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2015-07-11 11:33:00 +0000
+++ EventRepetition.qml	2016-01-25 17:43:39 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0
 
=== modified file 'EventUtils.qml'
--- EventUtils.qml	2014-10-04 04:37:34 +0000
+++ EventUtils.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 import "Defines.js" as Defines
 import "Recurrence.js" as Recurrence
 
=== modified file 'HeaderDateComponent.qml'
--- HeaderDateComponent.qml	2015-05-14 13:03:02 +0000
+++ HeaderDateComponent.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root
 
=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2015-11-23 07:15:20 +0000
+++ MonthComponent.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import QtQuick.Layouts 1.1
+
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
@@ -25,12 +27,11 @@
     objectName: "MonthComponent"
 
     property bool isCurrentItem;
-
-    property bool showEvents: false
-
-    property var currentMonth;
+    property int currentYear;
+    property int currentMonth;
+
     property var isYearView;
-    property var selectedDay;
+    property var highlightedDate;
     property bool displayWeekNumber:false;
 
     property string dayLabelFontSize: "medium"
@@ -40,91 +41,59 @@
 
     property alias dayLabelDelegate : dayLabelRepeater.delegate
     property alias dateLabelDelegate : dateLabelRepeater.delegate
+    readonly property alias monthStartDate: intern.monthStart
 
     signal monthSelected(var date);
     signal dateSelected(var date);
     signal dateHighlighted(var date);
 
-    //creatng timer only if we need to show events in month
-    Loader {
-        id: timerLoader
-        sourceComponent: showEvents ? timerComp : undefined
-    }
-
-    // Timer to delay creation of Model, There seems some problem fetching events if we create Model immediatly
-    Component {
-        id: timerComp
-        Timer{
-           interval: 200; running: true; repeat: false
-           onTriggered: {
-                modelLoader.sourceComponent = modelComponent
-           }
-        }
-    }
-
-    Loader{
-        id: modelLoader
-    }
-
-    Component{
-        id: modelComponent
-        EventListModel {
-            id: mainModel
-            startPeriod: intern.monthStart.midnight();
-            endPeriod: intern.monthStart.addDays((/*monthGrid.rows * cols */ 42 )-1).endOfDay()
-            filter: eventModel.filter
-            onModelChanged: {
-                intern.eventStatus = Qt.binding(function() { return mainModel.containsItems(startPeriod, endPeriod, 86400/*24*60*60*/)});
-            }
-        }
+    function updateEvents(events) {
+        intern.eventStatus = events
     }
 
     QtObject{
         id: intern
 
-        property var eventStatus;
-
-        property int curMonthDate: currentMonth.getDate()
-        property int curMonth: currentMonth.getMonth()
-        property int curMonthYear: currentMonth.getFullYear()
+        property var eventStatus: new Array(42)
 
         property var today: DateExt.today()
         property int todayDate: today.getDate()
         property int todayMonth: today.getMonth()
         property int todayYear: today.getFullYear()
 
-
         //date from month will start, this date might be from previous month
-        property var monthStart: currentMonth.weekStart( Qt.locale().firstDayOfWeek )
+        property var currentDate: new Date(root.currentYear, root.currentMonth, 1, 0, 0, 0, 0)
+        property var monthStart: currentDate.weekStart( Qt.locale().firstDayOfWeek )
         property int monthStartDate: monthStart.getDate()
         property int monthStartMonth: monthStart.getMonth()
         property int monthStartYear: monthStart.getFullYear()
-
         property int daysInStartMonth: Date.daysInMonth(monthStartYear, monthStartMonth)
-        property int daysInCurMonth:  Date.daysInMonth(curMonthYear,curMonth)
 
         //check if current month is start month
-        property bool isCurMonthStartMonth: curMonthDate === monthStartDate
-                                            && curMonth === monthStartMonth
-                                            && curMonthYear === monthStartYear
+        property bool isCurMonthStartMonth: root.currentMonth === monthStartMonth &&
+                                            root.currentYear === monthStartYear
 
         //check current month is same as today's month
-        property bool isCurMonthTodayMonth: todayYear === curMonthYear && todayMonth == curMonth
+        property bool isCurMonthTodayMonth: todayYear === root.currentYear &&
+                                            todayMonth == root.currentMonth
         //offset from current month's first date to start date of current month
         property int offset: isCurMonthStartMonth ? -1 : (daysInStartMonth - monthStartDate)
 
         property int dateFontSize: FontUtils.sizeToPixels(root.dateLabelFontSize)
         property int dayFontSize: FontUtils.sizeToPixels(root.dayLabelFontSize)
 
-        property int selectedIndex: -1
-
-        function findSelectedDayIndex(){
-            if(!selectedDay) {
+        property int highlightedIndex: root.isCurrentItem &&
+                                       root.highlightedDate ?
+                                           intern.indexByDate(root.highlightedDate) : -1
+        function indexByDate(date){
+            if (!date) {
                 return -1;
             }
 
-            if( todayMonth === selectedDay.getMonth() && selectedDay.getFullYear() === todayYear){
-                return selectedDay.getDate() +
+            if ((root.currentMonth === date.getMonth()) &&
+                (root.currentYear === date.getFullYear())) {
+
+                return date.getDate() +
                        (Date.daysInMonth(monthStartYear, monthStartMonth) - monthStartDate);
             } else {
                 return -1;
@@ -132,14 +101,40 @@
         }
     }
 
-    onSelectedDayChanged: {
-        if( isCurrentItem ) {
-            intern.selectedIndex = intern.findSelectedDayIndex();
+    UbuntuShape{
+        id: todayShape
+
+        visible: root.isCurrentItem && intern.isCurMonthTodayMonth && monthGrid.todayItem != null
+        color: (monthGrid.highlightedItem === monthGrid.todayItem) ? UbuntuColors.darkGrey : UbuntuColors.orange
+        width: parent ? Math.min(parent.height, parent.width) / 1.3 : 0
+        height: width
+        parent: monthGrid.todayItem
+        anchors.centerIn: parent
+        z: -1
+        Rectangle {
+            anchors.fill: parent
+            anchors.margins: units.gu(0.5)
+            color: UbuntuColors.orange
+            radius: 5
         }
     }
 
-    onCurrentMonthChanged: {
-        intern.selectedIndex = -1;
+    UbuntuShape{
+        id: highlightedShape
+
+        visible: monthGrid.highlightedItem && (monthGrid.highlightedItem != monthGrid.todayItem)
+        color: UbuntuColors.darkGrey
+        width: parent ? Math.min(parent.height, parent.width) / 1.3 : 0
+        height: width
+        parent: monthGrid.highlightedItem
+        anchors.centerIn: parent
+        z: -1
+        Rectangle {
+            anchors.fill: parent
+            anchors.margins: units.gu(0.5)
+            color: UbuntuColors.lightGrey
+            radius: 5
+        }
     }
 
     Column{
@@ -165,8 +160,8 @@
                 ViewHeader{
                     id: monthHeader
                     anchors.fill: parent
-                    month: intern.curMonth
-                    year: intern.curMonthYear
+                    month: root.currentMonth
+                    year: root.currentYear
 
                     monthLabelFontSize: root.monthLabelFontSize
                     yearLabelFontSize: root.yearLabelFontSize
@@ -184,9 +179,11 @@
 
                 property int dayWidth: width / 7;
 
-                width: parent.width
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.verticalCenter: parent.verticalCenter
+                anchors{
+                    left: parent.left
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
 
                 Repeater{
                     id: dayLabelRepeater
@@ -196,23 +193,43 @@
             }
         }
 
-        Grid{
+        Grid {
             id: monthGrid
             objectName: "monthGrid"
 
-            width: parent.width
-            height: parent.height - monthGrid.y
-
             property int dayWidth: width / 7 /*cols*/;
             property int dayHeight: height / 6/*rows*/;
-
-            rows: 6
+            property var todayItem: null
+            readonly property var highlightedItem: intern.highlightedIndex != -1 ?
+                                                       dateLabelRepeater.itemAt(intern.highlightedIndex) : null
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: parent.height - monthGrid.y
             columns: 7
 
             Repeater{
                 id: dateLabelRepeater
-                model: 42 //monthGrid.rows * monthGrid.columns
-                delegate: defaultDateLabelComponent
+                model: 42
+                delegate: MonthComponentDateDelegate {
+                    property var delegateDate: intern.monthStart.addDays(index)
+
+                    date: delegateDate.getDate()
+                    isCurrentMonth: delegateDate.getMonth() === root.currentMonth
+                    showEvent: intern.eventStatus[index] === true
+
+                    isToday: intern.todayDate == date && intern.isCurMonthTodayMonth
+                    isSelected: intern.highlightedIndex == index
+                    width: monthGrid.dayWidth
+                    height: monthGrid.dayHeight
+
+                    onIsTodayChanged: {
+                        if (isToday) {
+                            monthGrid.todayItem = this
+                        }
+                    }
+                }
             }
         }
     }
@@ -299,52 +316,9 @@
     }
 
     Component{
-        id: defaultDateLabelComponent
-        MonthComponentDateDelegate{
-            date: {
-                //try to find date from index and month's first week's first date
-                var temp = intern.daysInStartMonth - intern.offset + index
-                //date exceeds days in startMonth,
-                //this means previous month is over and we are now in current month
-                //to get actual date we need to remove number of days in startMonth
-                if( temp > intern.daysInStartMonth ) {
-                    temp = temp - intern.daysInStartMonth
-                    //date exceeds days in current month
-                    // this means date is from next month
-                    //to get actual date we need to remove number of days in current month
-                    if( temp > intern.daysInCurMonth ) {
-                        temp = temp - intern.daysInCurMonth
-                    }
-                }
-                return temp;
-            }
-
-            isCurrentMonth: {
-                //remove offset from index
-                //if index falls in 1 to no of days in current month
-                //then date is inside current month
-                var temp = index - intern.offset
-                return (temp >= 1 && temp <= intern.daysInCurMonth)
-            }
-
-            isToday: intern.todayDate == date && intern.isCurMonthTodayMonth
-
-            isSelected: showEvents && intern.selectedIndex == index
-
-            width: parent.dayWidth
-            height: parent.dayHeight
-            fontSize: intern.dateFontSize
-            showEvent: showEvents
-                        && intern.eventStatus !== undefined
-                        && intern.eventStatus[index] !== undefined
-                        && intern.eventStatus[index]
-        }
-    }
-
-    Component{
         id: dafaultDayLabelComponent
 
-        Label{
+        Text {
             id: weekDay
             objectName: "weekDay" + index
             width: parent.dayWidth
 
=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml	2015-09-05 05:30:23 +0000
+++ MonthComponentDateDelegate.qml	2016-01-25 17:43:39 +0000
@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item{
     id: dateRootItem
@@ -9,27 +9,12 @@
     property bool isToday;
     property bool showEvent;
     property alias fontSize: dateLabel.font.pixelSize
-
     property bool isSelected: false
 
-    Loader {
-        sourceComponent: (isToday && isCurrentMonth) || isSelected ? highLightComp : undefined
-
-        onSourceComponentChanged: {
-            width = Qt.binding( function() {
-                var width = dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height
-                return ( width / 1.3 );
-            });
-            height = Qt.binding ( function() { return width} );
-            anchors.centerIn = Qt.binding( function() { return dateLabel});
-        }
-    }
-
-    Label {
+    Text {
         id: dateLabel
         anchors.centerIn: parent
         text: date
-        fontSize: root.dateLabelFontSize
         color: {
             if( isCurrentMonth ) {
                 if( isToday || isSelected ) {
@@ -47,46 +32,19 @@
         }
     }
 
-    Loader{
-        sourceComponent: showEvent ? eventIndicatorComp : undefined
-        onSourceComponentChanged: {
-            width = Qt.binding( function() { return units.gu(0.8)})
-            height = Qt.binding( function() { return width })
-            anchors.horizontalCenter = Qt.binding( function() { return  parent.horizontalCenter })
-            anchors.top = Qt.binding( function() { return parent.verticalCenter })
-            anchors.topMargin = Qt.binding( function() {
-                var w = (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height)/1.3
-                return (w/2) + units.gu(0.1)
-            });
-        }
-    }
-
-    Component{
-        id: eventIndicatorComp
-        Rectangle {
-            anchors.fill: parent
-            radius: height/2
-            color: "black"
-        }
-    }
-
-    Component{
-        id: highLightComp
-        UbuntuShape{
-            color: {
-                if( isToday && !isSelected ) {
-                    "#DD4814"
-                } else {
-                    "gray"
-                }
-            }
-
-            Rectangle{
-                anchors.fill: parent
-                anchors.margins: units.gu(0.5)
-                color: isToday ? "#DD4814" : "darkgray"
-            }
-        }
+    Rectangle {
+        id: eventIndicator
+
+        width: units.gu(0.8)
+        height: width
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: parent.verticalCenter
+            topMargin: ((Math.min(parent.height, dateRootItem.width) / 1.3) / 2) + units.gu(0.1)
+        }
+        radius: height/2
+        color:"black"
+        visible: showEvent
     }
 
     MouseArea {
@@ -113,7 +71,6 @@
                     //If monthView is clicked then open selected DayView
                     root.dateSelected(selectedDate);
                 } else {
-                    intern.selectedIndex = index
                     root.dateHighlighted(selectedDate)
                 }
             }
 
=== modified file 'MonthView.qml'
--- MonthView.qml	2015-11-23 07:15:20 +0000
+++ MonthView.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
@@ -24,8 +24,10 @@
     id: monthViewPage
     objectName: "monthViewPage"
 
-    property var currentMonth: DateExt.today();
+    property var anchorDate: DateExt.today();
+    readonly property var currentDate: monthViewPath.currentItem.indexDate
     property var selectedDay;
+    property var highlightedDate;
 
     signal dateSelected(var date);
     signal dateHighlighted(var date);
@@ -38,7 +40,8 @@
         iconName: "calendar-today"
         text: i18n.tr("Today")
         onTriggered: {
-            currentMonth = new Date().midnight()
+            monthViewPath.scrollToBegginer()
+            anchorDate = new Date().midnight()
         }
     }
 
@@ -58,7 +61,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
-            text: currentMonth.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
+            text: currentDate.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy"))
             font.capitalization: Font.Capitalize
         }
     }
@@ -67,66 +70,28 @@
         id: monthViewPath
         objectName: "monthViewPath"
 
-        property var startMonth: currentMonth;
-
-        anchors.top:parent.top
-
-        width:parent.width
-        height: parent.height
-
-        onNextItemHighlighted: {
-            nextMonth();
-        }
-
-        onPreviousItemHighlighted: {
-            previousMonth();
-        }
-
-        function nextMonth() {
-            currentMonth = addMonth(currentMonth, 1);
-        }
-
-        function previousMonth() {
-            currentMonth = addMonth(currentMonth, -1);
-        }
-
-        function addMonth(date,month) {
-            return  new Date(date.getFullYear(), date.getMonth() + month, 1, 0, 0, 0);
-        }
-
-        delegate: Loader {
+        anchors.fill: parent
+
+        delegate: MonthWithEventsComponent {
+            property var indexDate: monthViewPath.loopCurrentIndex === 0 ?
+                                        anchorDate : anchorDate.addMonths(monthViewPath.loopCurrentIndex + monthViewPath.indexType(index))
+
+            currentMonth: indexDate.getMonth()
+            currentYear: indexDate.getFullYear()
+
             width: parent.width - units.gu(4)
             height: parent.height
-
-            sourceComponent: delegateComponent
-            asynchronous: index !== monthViewPath.currentIndex
-
-            Component {
-                id: delegateComponent
-
-                MonthComponent {
-                    isCurrentItem: index === monthViewPath.currentIndex
-
-                    showEvents: true
-
-                    displayWeekNumber: mainView.displayWeekNumber;
-
-                    anchors.fill: parent
-
-                    currentMonth: monthViewPath.addMonth(monthViewPath.startMonth,
-                                                         monthViewPath.indexType(index));
-
-                    selectedDay: monthViewPage.selectedDay
-                    isYearView: false
-
-                    onDateSelected: {
-                        monthViewPage.dateSelected(date);
-                    }
-
-                    onDateHighlighted: {
-                        monthViewPage.dateHighlighted(date);
-                    }
-                }
+            isCurrentItem: (index === monthViewPath.currentIndex)
+            displayWeekNumber: mainView.displayWeekNumber
+            highlightedDate: monthViewPage.highlightedDate
+            isYearView: false
+
+            onDateSelected: {
+                monthViewPage.dateSelected(date);
+            }
+            onDateHighlighted: {
+                monthViewPage.highlightedDate = date
+                monthViewPage.dateHighlighted(date);
             }
         }
     }
 
=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-08-24 05:08:46 +0000
+++ NewEvent.qml	2016-01-25 17:43:39 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtOrganizer 5.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 
=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml	2015-02-17 05:53:42 +0000
+++ NewEventEntryField.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Label {
     id: root
 
=== modified file 'NewEventTimePicker.qml'
--- NewEventTimePicker.qml	2014-10-21 18:58:31 +0000
+++ NewEventTimePicker.qml	2016-01-25 17:43:39 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Themes.Ambiance 1.0
 import Ubuntu.Components.Pickers 1.0
 
=== modified file 'OnlineAccountsHelper.qml'
--- OnlineAccountsHelper.qml	2015-03-28 11:31:47 +0000
+++ OnlineAccountsHelper.qml	2016-01-25 17:43:39 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
 
 
=== modified file 'PathViewBase.qml'
--- PathViewBase.qml	2015-08-29 08:59:47 +0000
+++ PathViewBase.qml	2016-01-25 17:43:39 +0000
@@ -20,8 +20,7 @@
 PathView {
     id: root
 
-    model: 3
-    snapMode: PathView.SnapOneItem
+    readonly property alias loopCurrentIndex: intern.loopCurrentIndex
 
     signal nextItemHighlighted();
     signal previousItemHighlighted();
@@ -29,6 +28,8 @@
     signal scrollUp();
     signal scrollDown();
 
+    model: 3
+    snapMode: PathView.SnapOneItem
     preferredHighlightBegin: 0.5
     preferredHighlightEnd: 0.5
 
@@ -68,6 +69,11 @@
         }
     }
 
+    function scrollToBegginer()
+    {
+        intern.loopCurrentIndex = intern.previousIndex = currentIndex = 0
+    }
+
     Keys.onLeftPressed:{
         root.decrementCurrentIndex();
     }
@@ -98,15 +104,17 @@
         intern.previousIndex = currentIndex
 
         if ( diff > 0 ) {
-            root.nextItemHighlighted();
+            intern.loopCurrentIndex++
         }
         else {
-            root.previousItemHighlighted();
+            intern.loopCurrentIndex--
         }
     }
 
     QtObject{
         id: intern
+
+        property int loopCurrentIndex: 0
         property int previousIndex: root.currentIndex
     }
 }
 
=== modified file 'RecurrenceLabelDefines.qml'
--- RecurrenceLabelDefines.qml	2014-10-17 05:42:34 +0000
+++ RecurrenceLabelDefines.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 QtObject {
     property var recurrenceLabel:[i18n.tr("Once"),
 
=== modified file 'Scroller.qml'
--- Scroller.qml	2014-09-20 10:45:35 +0000
+++ Scroller.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItems
 
 Item {
 
=== modified file 'Settings.qml'
--- Settings.qml	2015-11-23 07:15:20 +0000
+++ Settings.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 
=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml	2014-11-29 05:15:13 +0000
+++ TimeLineBackground.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Column {
     width: parent.width
 
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2015-08-20 12:27:59 +0000
+++ TimeLineBase.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtOrganizer 5.0
 
 import "dateExt.js" as DateExt
 
=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2015-10-31 18:47:23 +0000
+++ TimeLineBaseComponent.qml	2016-01-25 17:43:39 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 
@@ -112,28 +112,33 @@
     }
 
     Timer{
-       interval: 200; running: true; repeat: false
-       onTriggered: {
-           mainModel = modelComponent.createObject();
-           activityLoader.running = Qt.binding( function (){ return mainModel.isLoading;});
-       }
-    }
-
-    Component {
-        id: modelComponent
-        EventListModel {
-            id: mainModel
-            startPeriod: startDay.midnight();
-            endPeriod: type == ViewType.ViewTypeWeek ? startPeriod.addDays(7).endOfDay(): startPeriod.endOfDay()
-            filter: eventModel.filter
+        interval: 200
+        running: true
+        repeat: false
+        onTriggered: {
+            mainModel.filter = eventModel.filter
         }
     }
 
+    InvalidFilter {
+        id: invalidFilter
+    }
+
+    EventListModel {
+        id: mainModel
+
+        filter: invalidFilter // delay event filter in case the user is scrolling too fast
+        startPeriod: startDay.midnight();
+        endPeriod: type == ViewType.ViewTypeWeek ? startPeriod.addDays(7).endOfDay(): startPeriod.endOfDay()
+    }
+
     ActivityIndicator {
         id: activityLoader
+        objectName : "activityIndicator"
+
         visible: running
-        objectName : "activityIndicator"
         anchors.centerIn: parent
+        running: mainModel.isLoading
         z:2
     }
 
@@ -184,7 +189,7 @@
 
                 property int delegateWidth: {
                     if( type == ViewType.ViewTypeWeek ) {
-                        width/3 - units.gu(1) /*partial visible area*/
+                        width/3 - units.gu(1) // partial visible area
                     } else {
                         width
                     }
 
=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeader.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 
 import "ViewType.js" as ViewType
@@ -50,7 +50,7 @@
                 id: weekNumLabel
                 objectName: "weeknumber"
 
-		        // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
+                // TRANSLATORS: W refers to Week, followed by the actual week number (%1)
                 text: i18n.tr("W%1").arg(startDay.weekNumber(Qt.locale().firstDayOfWeek))
                 fontSize: "small"
                 height: units.gu(5)
 
=== modified file 'TimeLineHeaderComponent.qml'
--- TimeLineHeaderComponent.qml	2015-09-05 05:30:23 +0000
+++ TimeLineHeaderComponent.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
 
=== modified file 'TimeLineTimeScale.qml'
--- TimeLineTimeScale.qml	2014-12-11 20:29:27 +0000
+++ TimeLineTimeScale.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Flickable{
     id: timeFlickble
 
=== modified file 'ViewHeader.qml'
--- ViewHeader.qml	2014-11-29 09:40:53 +0000
+++ ViewHeader.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item{
     id: header
 
=== modified file 'WeekView.qml'
--- WeekView.qml	2015-10-28 02:12:50 +0000
+++ WeekView.qml	2016-01-25 17:43:39 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "dateExt.js" as DateExt
 import "ViewType.js" as ViewType
 
@@ -25,8 +25,10 @@
     id: weekViewPage
     objectName: "weekViewPage"
 
-    property var dayStart: new Date();
-    property var firstDay: dayStart.weekStart(Qt.locale().firstDayOfWeek);
+    property var anchorDate: new Date();
+    readonly property var currentDate: weekViewPath.currentItem.item.startDay
+
+    property var firstDayOfWeek: currentDate.weekStart(Qt.locale().firstDayOfWeek);
     property bool isCurrentPage: false
     property var selectedDay;
 
@@ -61,7 +63,7 @@
             id:monthYear
             objectName:"monthYearLabel"
             fontSize: "x-large"
-            text: i18n.tr(dayStart.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
+            text: i18n.tr(currentDate.toLocaleString(Qt.locale(),i18n.tr("MMMM yyyy")))
             font.capitalization: Font.Capitalize
         }
     }
@@ -75,22 +77,6 @@
         //This is used to scroll all view together when currentItem scrolls
         property var childContentY;
 
-        onNextItemHighlighted: {
-            nextWeek();
-        }
-
-        onPreviousItemHighlighted: {
-            previousWeek();
-        }
-
-        function nextWeek() {
-            dayStart = firstDay.addDays(7);
-        }
-
-        function previousWeek(){
-            dayStart = firstDay.addDays(-7);
-        }
-
         delegate: Loader {
             id: timelineLoader
             width: parent.width
@@ -104,10 +90,10 @@
                 TimeLineBaseComponent {
                     id: timeLineView
 
+                    anchors.fill: parent
                     type: ViewType.ViewTypeWeek
-                    anchors.fill: parent
+                    startDay: anchorDate.addDays((weekViewPath.loopCurrentIndex + weekViewPath.indexType(index)) * 7)
                     isActive: parent.PathView.isCurrentItem
-                    startDay: firstDay.addDays( weekViewPath.indexType(index) * 7)
                     keyboardEventProvider: weekViewPath
                     selectedDay: weekViewPage.selectedDay
 
@@ -128,7 +114,7 @@
                         onTriggered:{
                             if( isActive )
                                 timeLineView.scrollTocurrentDate();
-                        }
+                            }
                     }
 
                     Connections{
 
=== modified file 'YearView.qml'
--- YearView.qml	2015-11-23 07:15:20 +0000
+++ YearView.qml	2016-01-25 17:43:39 +0000
@@ -16,15 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 import "dateExt.js" as DateExt
 Page {
     id: yearViewPage
     objectName: "yearViewPage"
 
-    property int currentYear: DateExt.today().getFullYear();
+    property int anchorYear: new Date().getFullYear()
+    readonly property int currentYear: yearPathView.currentItem.year
     signal monthSelected(var date);
 
     Keys.forwardTo: [yearPathView]
@@ -41,10 +42,13 @@
         iconName: "calendar-today"
         text: i18n.tr("Today")
         onTriggered: {
-            currentYear = new Date().getFullYear()
+            yearPathView.scrollToBegginer()
+            anchorYear = new Date().getFullYear()
         }
     }
 
+    title: i18n.tr("Year %1").arg(currentYear)
+
     head {
         actions: [
             calendarTodayAction,
@@ -54,49 +58,25 @@
             commonHeaderActions.syncCalendarAction,
             commonHeaderActions.settingsAction
         ]
-        contents: Label {
-            id:year
-            objectName:"yearLabel"
-            fontSize: "x-large"
-            text: i18n.tr("Year %1").arg(currentYear)
-        }
     }
 
+    flickable: null
+
     PathViewBase {
         id: yearPathView
         objectName: "yearPathView"
 
         anchors.fill: parent
-
-        onNextItemHighlighted: {
-            currentYear = currentYear + 1;
-        }
-
-        onPreviousItemHighlighted: {
-            currentYear = currentYear - 1;
-        }
-
-        delegate: Loader {
-            width: parent.width
-            height: parent.height
-            anchors.top: parent.top
-
-            asynchronous: index !== yearPathView.currentIndex
-            sourceComponent: delegateComponent
-
-            Component{
-                id: delegateComponent
-
-                YearViewDelegate{
-                    focus: index == yearPathView.currentIndex
-
-                    scrollMonth: 0;
-                    isCurrentItem: index == yearPathView.currentIndex
-                    year: (currentYear + yearPathView.indexType(index))
-
-                    anchors.fill: parent
-                }
-            }
+        snapMode: PathView.NoSnap
+
+        delegate: YearViewDelegate{
+            width: PathView.view.width
+            height: PathView.view.height
+            focus: index == yearPathView.currentIndex
+
+            scrollMonth: 0;
+            isCurrentItem: (index == yearPathView.currentIndex)
+            year: (anchorYear + yearPathView.loopCurrentIndex + yearPathView.indexType(index))
         }
     }
 }
 
=== modified file 'YearViewDelegate.qml'
--- YearViewDelegate.qml	2015-11-23 07:15:20 +0000
+++ YearViewDelegate.qml	2016-01-25 17:43:39 +0000
@@ -1,26 +1,35 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 GridView{
     id: yearView
-    clip: true
 
     property int scrollMonth;
     property bool isCurrentItem;
     property int year;
-
+    readonly property var currentDate: new Date()
+    readonly property int currentYear: currentDate.getFullYear()
+    readonly property int currentMonth: currentDate.getMonth()
     readonly property int minCellWidth: units.gu(30)
+
+    function refresh() {
+        scrollMonth = 0;
+        if(year == currentYear) {
+            scrollMonth = currentMonth
+        }
+        yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
+    }
+
+    // Does not increase cash buffer if user is scolling
+    cacheBuffer: PathView.view.flicking || PathView.view.dragging || !isCurrentItem ? 0 : 6 * cellHeight
+
     cellWidth: Math.floor(Math.min.apply(Math, [3, 4].map(function(n)
     { return ((width / n >= minCellWidth) ? width / n : width / 2) })))
-
     cellHeight: cellWidth * 1.4
 
+    clip: true
     model: 12 /* months in a year */
 
-    onYearChanged: {
-        refresh();
-    }
-
     //scroll in case content height changed
     onHeightChanged: {
         yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
@@ -30,68 +39,36 @@
         yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
     }
 
-    function refresh() {
-        scrollMonth = 0;
-        var today = new Date();
-        if(year == today.getFullYear()) {
-            scrollMonth = today.getMonth();
-        }
-        yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
-    }
-
-    Connections{
-        target: yearPathView
-        onScrollUp: {
-            scrollMonth -= 2;
-            if(scrollMonth < 0) {
-                scrollMonth = 0;
-            }
-            yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
-        }
-
-        onScrollDown: {
-            scrollMonth += 2;
-            var visibleMonths = yearView.height / cellHeight;
-            if( scrollMonth >= (11 - visibleMonths)) {
-                scrollMonth = (11 - visibleMonths);
-            }
-            yearView.positionViewAtIndex(scrollMonth, GridView.Beginning);
-        }
-    }
-
-    delegate: Loader {
+    delegate: Item {
         width: yearView.cellWidth
         height: yearView.cellHeight
 
-        sourceComponent: delegateComponent
-        asynchronous: !yearView.focus
-
-        Component {
-            id: delegateComponent
-
-            Item {
-                anchors.fill: parent
-                anchors.margins: units.gu(0.5)
-
-                MonthComponent {
-                    id: monthComponent
-                    objectName: "monthComponent" + index
-                    showEvents: false
-                    currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)
-                    displayWeekNumber: mainView.displayWeekNumber;
-                    isCurrentItem: yearView.focus
-
-                    isYearView: true
-                    anchors.fill: parent
-
-                    dayLabelFontSize:"x-small"
-                    dateLabelFontSize: "medium"
-                    monthLabelFontSize: "medium"
-                    yearLabelFontSize: "medium"
-
-                    onMonthSelected: {
-                        yearViewPage.monthSelected(date);
-                    }
+        UbuntuShape {
+            radius: "medium"
+            anchors {
+                fill: parent
+                margins: units.gu(0.5)
+            }
+
+            MonthComponent {
+                id: monthComponent
+                objectName: "monthComponent" + index
+
+                anchors {
+                    margins: units.gu(0.5)
+                    fill: parent
+                }
+
+                currentYear: yearView.year
+                currentMonth: index
+                isCurrentItem: yearView.focus
+                isYearView: true
+                dayLabelFontSize:"x-small"
+                dateLabelFontSize: "medium"
+                monthLabelFontSize: "medium"
+                yearLabelFontSize: "medium"
+                onMonthSelected: {
+                    yearViewPage.monthSelected(date);
                 }
             }
         }
 
=== modified file 'calendar.qml'
--- calendar.qml	2015-11-23 07:15:20 +0000
+++ calendar.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import QtOrganizer 5.0
 import Qt.labs.settings 1.0
@@ -27,8 +27,6 @@
 
     property bool displayWeekNumber: false;
 
-    useDeprecatedToolbar: false
-
     // Work-around until this branch lands:
     // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
     //property bool windowActive: typeof window != 'undefined'
@@ -216,6 +214,7 @@
             id: tabs
             Keys.forwardTo: [tabs.currentPage]
 
+            property bool isReady: false
             property var currentDay: DateExt.today();
             property var selectedDay;
 
@@ -315,6 +314,7 @@
                 else {
                     tabs.selectedTabIndex = settings.defaultViewIndex;
                 }
+                tabs.isReady = true
             } // End of Component.onCompleted:
 
             EventActions {
@@ -349,139 +349,149 @@
                 }
             }
 
-            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
+                    active: tabs.isReady && (tabs.selectedTab == yearTab)
+                    sourceComponent: yearViewComp
+                }
             }
 
             Tab{
                 id: monthTab
                 objectName: "monthTab"
                 title: i18n.tr("Month")
-                page: null
+
+                page: Loader {
+                    id: monthTabLoader
+
+                    asynchronous: true
+                    active: tabs.isReady && (tabs.selectedTab == monthTab)
+                    sourceComponent: monthViewComp
+                }
             }
 
             Tab{
                 id: weekTab
                 objectName: "weekTab"
                 title: i18n.tr("Week")
-                page: null
+
+                page: Loader {
+                    id: weekTabLoader
+
+                    asynchronous: true
+                    active: tabs.isReady && (tabs.selectedTab == weekTab)
+                    sourceComponent: weekViewComp
+                }
             }
 
             Tab{
                 id: dayTab
                 objectName: "dayTab"
                 title: i18n.tr("Day")
-                page: null
+
+                page:Loader {
+                    id: dayTabLoader
+
+                    asynchronous: true
+                    active: tabs.isReady && (tabs.selectedTab == dayTab)
+                    sourceComponent: dayViewComp
+                }
             }
 
             Tab {
                 id: agendaTab
                 objectName: "agendaTab"
                 title: i18n.tr("Agenda")
-                page: null
+
+                page: Loader {
+                    id: agendaTabLoader
+
+                    asynchronous: true
+                    active: tabs.isReady && (tabs.selectedTab == agendaTab)
+                    sourceComponent: agendaViewComp
+                }
+            }
+        }
+
+        Component {
+            id: yearViewComp
+
+            YearView {
+                anchorYear: tabs.currentDay.getFullYear()
+                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;
+                }
+            }
+        }
+
+        Component {
+            id: monthViewComp
+
+            MonthView {
+                anchorDate: tabs.currentDay.midnight()
+                onDateSelected: {
+                    tabs.currentDay = date
+                    tabs.selectedTabIndex = dayTab.index
+                }
+            }
+        }
+
+        Component {
+            id: weekViewComp
+
+            WeekView {
+                onCurrentDateChanged: {
+                    tabs.currentDay = currentDate
+                }
+                onDateSelected: {
+                    tabs.currentDay = date;
+                    tabs.selectedTabIndex = dayTab.index;
+                }
+                onActiveChanged: {
+                    if (active)
+                        anchorDate = tabs.currentDay.midnight()
+                }
+            }
+        }
+
+        Component {
+            id: dayViewComp
+
+            DayView {
+                onCurrentDateChanged: {
+                    tabs.currentDay = currentDate;
+                }
+
+                onDateSelected: tabs.currentDay = date;
+                onActiveChanged: {
+                    if (active)
+                        anchorDate = tabs.currentDay
+                }
+            }
+        }
+
+        Component {
+            id: agendaViewComp
+
+            AgendaView {
+                onDateSelected: {
+                    tabs.currentDay = date;
+                    tabs.selectedTabIndex = dayTab.index;
+                }
             }
         }
     }
 
=== modified file 'calendarTests.qml'
--- calendarTests.qml	2014-09-20 10:45:35 +0000
+++ calendarTests.qml	2016-01-25 17:43:39 +0000
@@ -15,8 +15,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 MainView {
     width: units.gu(20)
 
=== 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-25 17:43:39 +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: 2016-01-12 12:03-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -263,7 +263,7 @@
 msgid "After Date"
 msgstr ""
 
-#: ../MonthComponent.qml:260
+#: ../MonthComponent.qml:263
 msgid "Wk"
 msgstr ""
 
@@ -416,7 +416,7 @@
 msgid "All Day"
 msgstr ""
 
-#: ../YearView.qml:61
+#: ../YearView.qml:48
 #, qt-format
 msgid "Year %1"
 msgstr ""