Merge lp:~vthompson/music-app/prevent-incorrect-no-music-screen into lp:music-app/trusty

[Victor Thompson]

Wait until model is populated before deciding there is no music.

Wait until model is populated before deciding there is no music. There was a new prototype to the Songs model added that provides a "filled" signal that we should listen to in order to determine the model is full.

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

FAILED: Continuous integration, rev:543
http://91.189.93.70:8080/job/music-app-ci/966/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1219
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/190

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/966/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looks good so far, just wonder if onFilled would be better if it works? See inline diff comments.

review: Needs Information

[Victor Thompson (vthompson)]

That should work and is more readable. I'll fix this tonight.

review: Needs Fixing

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

FAILED: Continuous integration, rev:544
http://91.189.93.70:8080/job/music-app-ci/972/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1283
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/196

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/972/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

review: Abstain

[Andrew Hayzen (ahayzen)]

LGTM

review: Approve

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

review: Approve (continuous-integration)

Unmerged revisions

544. By Victor Thompson on 2014-08-05

Simplify signal catch.

543. By Victor Thompson on 2014-07-31

Fix bad line of code

542. By Victor Thompson on 2014-07-31

Wait until model is populated before deciding there is no music.

=== modified file 'music-app.qml'
--- music-app.qml	2014-07-29 00:59:12 +0000
+++ music-app.qml	2014-08-05 00:17:42 +0000
@@ -511,8 +511,10 @@
     }
 
     SongsModel {
+        property bool populated: false
         id: allSongsModel
         store: musicStore
+        onFilled: populated = true
     }
 
     SongsModel {
@@ -907,7 +909,7 @@
             title: i18n.tr("Music")
             visible: false
 
-            property bool noMusic: allSongsModel.rowCount === 0 && loadedUI
+            property bool noMusic: allSongsModel.rowCount === 0 && allSongsModel.populated && loadedUI
 
             onNoMusicChanged: {
                 if (noMusic)