Merge lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel into lp://qastaging/music-app

Proposed by Victor Thompson
Status: Work in progress
Proposed branch: lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel
Merge into: lp://qastaging/music-app
Diff against target: 1745 lines (+887/-799)
4 files modified
app/components/MusicPage.qml (+2/-0)
app/components/NowPlaying.qml (+550/-0)
app/music-app.qml (+332/-292)
app/ui/NowPlayingView.qml (+3/-507)
To merge this branch: bzr merge lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel
Reviewer Review Type Date Requested Status
Music App Developers Pending
Review via email: mp+249144@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-02-10.

Commit message

* Conditional layouts for the music app

Description of the change

DO NOT MERGE, just want to keep this MP to see a diff of what's been added.

To post a comment you must log in.
842. By Victor Thompson

Add ItemLayout to the Layouts.

Unmerged revisions

842. By Victor Thompson

Add ItemLayout to the Layouts.

841. By Victor Thompson

start conditional layout prototype

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: