Merge lp://qastaging/~ahayzen/music-app/convergence-tabs-with-sidebar-01 into lp://qastaging/music-app
Proposed by
Andrew Hayzen
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Victor Thompson | ||||||||
Approved revision: | 984 | ||||||||
Merged at revision: | 998 | ||||||||
Proposed branch: | lp://qastaging/~ahayzen/music-app/convergence-tabs-with-sidebar-01 | ||||||||
Merge into: | lp://qastaging/music-app | ||||||||
Diff against target: |
2029 lines (+1077/-432) 26 files modified
app/components/BlurredBackground.qml (+3/-1) app/components/Flickables/MusicGridView.qml (+0/-10) app/components/HeadState/EmptyHeadState.qml (+56/-0) app/components/HeadState/MultiSelectHeadState.qml (+89/-76) app/components/HeadState/PlaylistHeadState.qml (+78/-0) app/components/HeadState/PlaylistsHeadState.qml (+54/-20) app/components/HeadState/QueueHeadState.qml (+89/-0) app/components/HeadState/SearchHeadState.qml (+59/-46) app/components/HeadState/SearchableHeadState.qml (+45/-8) app/components/MusicPage.qml (+39/-0) app/components/NowPlayingFullView.qml (+76/-68) app/components/NowPlayingSidebar.qml (+134/-0) app/components/NowPlayingToolbar.qml (+18/-14) app/components/Queue.qml (+5/-1) app/music-app.qml (+101/-23) app/ui/AddToPlaylist.qml (+5/-2) app/ui/Albums.qml (+5/-2) app/ui/ArtistView.qml (+12/-2) app/ui/Artists.qml (+5/-2) app/ui/ContentHubExport.qml (+34/-26) app/ui/Genres.qml (+5/-2) app/ui/NowPlaying.qml (+113/-77) app/ui/Playlists.qml (+5/-2) app/ui/Recent.qml (+41/-15) app/ui/SongsView.qml (+5/-35) debian/changelog (+1/-0) |
||||||||
To merge this branch: | bzr merge lp://qastaging/~ahayzen/music-app/convergence-tabs-with-sidebar-01 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Victor Thompson | Approve | ||
Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+286127@code.qastaging.launchpad.net |
Commit message
* Implement convergent mode with now playing and queue as a sidebar
Description of the change
* Implement convergent mode with now playing and queue as a sidebar
Known Issues:
* When the app is starting and is wide enough for wideAspect, a black box appears where the async loader ends up (this happens for all apps seems to be they are launched in portrait and resized too late) [bug 1548096]
To post a comment you must log in.
Here are a few screenshots: http:// imgur.com/ a/sOqGU
I think the sidebar needs the most work if you compare it to the spec. However, the header also seems to differ in color?