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

Proposed by Victor Thompson on 2014-07-31
Status: Superseded
Proposed branch: lp:~vthompson/music-app/prevent-incorrect-no-music-screen
Merge into: lp:music-app/trusty
Diff against target: 23 lines (+3/-1)
1 file modified
music-app.qml (+3/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/prevent-incorrect-no-music-screen
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-08-07
Andrew Hayzen 2014-07-31 Approve on 2014-08-06
Victor Thompson Abstain on 2014-08-05
Review via email: mp+228972@code.launchpad.net

This proposal has been superseded by a proposal from 2014-08-07.

Commit message

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

Description of the change

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.

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

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

review: Needs Information
Victor Thompson (vthompson) wrote :

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

review: Needs Fixing
review: Abstain
Andrew Hayzen (ahayzen) wrote :

LGTM

review: Approve
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'music-app.qml'
2--- music-app.qml 2014-07-29 00:59:12 +0000
3+++ music-app.qml 2014-08-05 00:17:42 +0000
4@@ -511,8 +511,10 @@
5 }
6
7 SongsModel {
8+ property bool populated: false
9 id: allSongsModel
10 store: musicStore
11+ onFilled: populated = true
12 }
13
14 SongsModel {
15@@ -907,7 +909,7 @@
16 title: i18n.tr("Music")
17 visible: false
18
19- property bool noMusic: allSongsModel.rowCount === 0 && loadedUI
20+ property bool noMusic: allSongsModel.rowCount === 0 && allSongsModel.populated && loadedUI
21
22 onNoMusicChanged: {
23 if (noMusic)

Subscribers

People subscribed via source and target branches

to status/vote changes: