Ubuntu Music App

Merge lp:~ahayzen/music-app/move-pages-inside-pagestack into lp:music-app/trusty

  1. move-pages-inside-pagestack
  2. Merge into trusty
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 522
Merged at revision: 522
Proposed branch: lp:~ahayzen/music-app/move-pages-inside-pagestack
Merge into: lp:music-app/trusty
Diff against target: 146 lines (+65/-66)
1 file modified
music-app.qml (+65/-66)
To merge this branch: bzr merge lp:~ahayzen/music-app/move-pages-inside-pagestack
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Review via email: mp+226619@code.launchpad.net

Commit message

* Move pages inside pagestack

Description of the change

* Move pages inside pagestack

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

PASSED: Continuous integration, rev:522
http://91.189.93.70:8080/job/music-app-ci/938/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1001
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1001/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/162

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

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

lgtm and behaves as expected.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/493/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1002
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1002/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/34

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

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-03 03:17:46 +0000
3+++ music-app.qml 2014-07-13 21:20:32 +0000
4@@ -751,54 +751,6 @@
5 z: 200 // put on top of everything else
6 }
7
8- Page {
9- id: emptyPage
10- title: i18n.tr("Music")
11- visible: false
12-
13- property bool noMusic: allSongsModel.rowCount === 0 && loadedUI
14-
15- onNoMusicChanged: {
16- if (noMusic)
17- mainPageStack.push(emptyPage)
18- else if (pageStack.currentPage == emptyPage)
19- mainPageStack.pop()
20- }
21-
22- tools: ToolbarItems {
23- back: null
24- locked: true
25- opened: false
26- }
27-
28- // Overlay to show when no tracks detected on the device
29- Rectangle {
30- id: libraryEmpty
31- anchors.fill: parent
32- anchors.topMargin: -emptyPage.header.height
33- color: styleMusic.libraryEmpty.backgroundColor
34-
35- Column {
36- anchors.centerIn: parent
37-
38- Label {
39- anchors.horizontalCenter: parent.horizontalCenter
40- color: styleMusic.libraryEmpty.labelColor
41- fontSize: "large"
42- font.bold: true
43- text: "No music found"
44- }
45-
46- Label {
47- anchors.horizontalCenter: parent.horizontalCenter
48- color: styleMusic.libraryEmpty.labelColor
49- fontSize: "medium"
50- text: "Please import music and restart the app"
51- }
52- }
53- }
54- }
55-
56 PageStack {
57 id: mainPageStack
58
59@@ -949,22 +901,69 @@
60 ensurePopulated(selectedTab);
61 }
62 } // end of tabs
63- }
64-
65- SongsPage {
66- id: songsPage
67- }
68-
69- AlbumsPage {
70- id: albumsPage
71- }
72-
73- MusicNowPlaying {
74- id: nowPlaying
75- }
76-
77- MusicaddtoPlaylist {
78- id: addtoPlaylist
79- }
80-
81+
82+ Page {
83+ id: emptyPage
84+ title: i18n.tr("Music")
85+ visible: false
86+
87+ property bool noMusic: allSongsModel.rowCount === 0 && loadedUI
88+
89+ onNoMusicChanged: {
90+ if (noMusic)
91+ mainPageStack.push(emptyPage)
92+ else if (pageStack.currentPage == emptyPage)
93+ mainPageStack.pop()
94+ }
95+
96+ tools: ToolbarItems {
97+ back: null
98+ locked: true
99+ opened: false
100+ }
101+
102+ // Overlay to show when no tracks detected on the device
103+ Rectangle {
104+ id: libraryEmpty
105+ anchors.fill: parent
106+ anchors.topMargin: -emptyPage.header.height
107+ color: styleMusic.libraryEmpty.backgroundColor
108+
109+ Column {
110+ anchors.centerIn: parent
111+
112+ Label {
113+ anchors.horizontalCenter: parent.horizontalCenter
114+ color: styleMusic.libraryEmpty.labelColor
115+ fontSize: "large"
116+ font.bold: true
117+ text: "No music found"
118+ }
119+
120+ Label {
121+ anchors.horizontalCenter: parent.horizontalCenter
122+ color: styleMusic.libraryEmpty.labelColor
123+ fontSize: "medium"
124+ text: "Please import music and restart the app"
125+ }
126+ }
127+ }
128+ }
129+
130+ SongsPage {
131+ id: songsPage
132+ }
133+
134+ AlbumsPage {
135+ id: albumsPage
136+ }
137+
138+ MusicNowPlaying {
139+ id: nowPlaying
140+ }
141+
142+ MusicaddtoPlaylist {
143+ id: addtoPlaylist
144+ }
145+ }
146 } // end of main view

Subscribers

People subscribed via source and target branches

to status/vote changes: