Merge lp:~renatofilho/ubuntu-calendar-app/fix-1570928 into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Disable auto-update during the sync.
Force model update after filter change if model autoUpdate is set to false.

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

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/fix-1570928]

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

Trunk merged.

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

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

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

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'EventListModel.qml'
--- EventListModel.qml	2016-04-26 20:04:33 +0000
+++ EventListModel.qml	2016-05-02 14:52:58 +0000
@@ -26,6 +26,12 @@
 
     property var listeners:[];
     property bool isLoading: false
+    // disable update while syncing to avoid tons of unecessary update
+    property var _priv: Binding {
+        target: eventModel
+        property: "autoUpdate"
+        value: !mainView.syncInProgress
+    }
 
     function addModelChangeListener(listener){
         listeners.push(listener);
@@ -173,8 +179,6 @@
         }
     }
 
-    // disable update while syncing to avoid tons of unecessary update
-    autoUpdate: !mainView.syncInProgress
     onAutoUpdateChanged: {
         if (autoUpdate) {
             eventModel.update()

=== modified file 'MonthWithEventsComponent.qml'
--- MonthWithEventsComponent.qml	2016-04-26 19:38:03 +0000
+++ MonthWithEventsComponent.qml	2016-05-02 14:52:58 +0000
@@ -48,6 +48,9 @@
         repeat: false
         onTriggered: {
             mainModel.filter = Qt.binding(function() { return root.modelFilter } )
+            if (!mainModel.autoUpdate) {
+                mainModel.update()
+            }
         }
     }
 

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2016-03-29 13:19:06 +0000
+++ TimeLineBaseComponent.qml	2016-05-02 14:52:58 +0000
@@ -178,6 +178,9 @@
         repeat: false
         onTriggered: {
             mainModel.filter = Qt.binding(function() { return root.modelFilter} )
+            if (!mainModel.autoUpdate) {
+                mainModel.update()
+            }
         }
     }
 
@@ -198,16 +201,6 @@
         onEndPeriodChanged: idleRefresh.reset()
    }
 
-    ActivityIndicator {
-        id: activityLoader
-        objectName : "activityIndicator"
-
-        visible: running
-        anchors.centerIn: parent
-        //running: mainModel.isLoading
-        z:2
-    }
-
     Column {
         anchors.fill: parent