Ubuntu Music App

Merge lp:~vthompson/music-app/fix-1365832 into lp:music-app/trusty

  1. fix-1365832
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 615
Merged at revision: 621
Proposed branch: lp:~vthompson/music-app/fix-1365832
Merge into: lp:music-app/trusty
Diff against target: 35 lines (+6/-1)
1 file modified
MusicStart.qml (+6/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1365832
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+233505@code.launchpad.net

Commit message

Hide genres if none

Description of the change

Hide genres if none

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:615
http://91.189.93.70:8080/job/music-app-ci/1104/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1907
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/328

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:615
http://91.189.93.70:8080/job/music-app-ci/1120/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/276
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/276/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/344

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicStart.qml'
2--- MusicStart.qml 2014-08-21 20:13:31 +0000
3+++ MusicStart.qml 2014-09-05 12:21:08 +0000
4@@ -212,10 +212,12 @@
5 ListItem.ThinDivider {
6 id: genreDivider
7 anchors.top: mainView.hasRecent ? recentlist.bottom : parent.top
8+ visible: genrelist.count > 1
9 }
10 ListItem.Standard {
11 id: genres
12 anchors.top: genreDivider.bottom
13+ visible: genrelist.count > 1
14 Label {
15 anchors {
16 verticalCenter: parent.verticalCenter
17@@ -234,6 +236,7 @@
18 anchors.topMargin: units.gu(1)
19 spacing: units.gu(1)
20 height: units.gu(18)
21+ visible: genrelist.count > 1
22 model: SortFilterModel {
23 id: genresModelFilter
24 model: GenresModel {
25@@ -375,7 +378,9 @@
26
27 ListItem.ThinDivider {
28 id: albumsDivider
29- anchors.top: genrelist.bottom
30+ anchors.top: genrelist.visible
31+ ? genrelist.bottom
32+ : (mainView.hasRecent ? recentlist.bottom : parent.top)
33 }
34 ListItem.Standard {
35 id: albums

Subscribers

People subscribed via source and target branches

to status/vote changes: