Merge lp:~ahayzen/ubuntu-calendar-app/fix-1423191-no-future-events into lp:ubuntu-calendar-app

[Andrew Hayzen]

* Fix to not show the "No future events" label if the model is loading

* Fix to not show the "No future events" label if the model is loading

[Kunal Parmar (pkunal-parmar)]

looks good to me

review: Approve

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

FAILED: Continuous integration, rev:582
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1077/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1105
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/74

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:582
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1079/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1110
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/76

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

review: Approve (continuous-integration)

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2014-11-11 15:16:12 +0000
+++ AgendaView.qml	2015-02-18 19:11:25 +0000
@@ -96,7 +96,7 @@
 
             return default_title;
         }
-        visible: !root.hasEnabledCalendars() || !eventListModel.itemCount
+        visible: (!root.hasEnabledCalendars() || !eventListModel.itemCount) && !eventListModel.isLoading
         anchors.centerIn: parent
     }