Merge lp:~vthompson/music-app/remix-fix-1390252 into lp:music-app/remix

[Victor Thompson]

* Only add currently playing item to the playlist from queue
* Show 'Add to playlist' and 'Clear queue' in Now Playing view
* Change toggle action to switch between 'Now playing' and 'Queue' to be the swap icon.

* Only add currently playing item to the playlist from queue
* Show 'Add to playlist' and 'Clear queue' in Now Playing view
* Change toggle action to switch between 'Now playing' and 'Queue' to be the swap icon.

This change has design approval

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:729
http://91.189.93.70:8080/job/music-app-remix-ci/232/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/77
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/77/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/7/console

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

review: Needs Fixing (continuous-integration)

[lp:~vthompson/music-app/remix-fix-1390252]

730. By Victor Thompson on 2014-11-13

Add changes per design direction

731. By Victor Thompson on 2014-11-13

merge of trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:730
http://91.189.93.70:8080/job/music-app-remix-ci/263/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/197
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/38

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:731
http://91.189.93.70:8080/job/music-app-remix-ci/264/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/198
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/39

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I'd like input on the Design decision we received today.

Now Playing: http://i.imgur.com/cAzkPzo.png
Queue: http://i.imgur.com/kWT2NtE.png

I think the Now Playing header actions of "toggle to queue" and "add to playlist" are far too similar. I want to once again push to recommend that we add "Clear queue" to the actions in the Now Playing view. I want to reiterate that I think the header actions should be the same in each view, since they both present the same data.

review: Needs Information

[lp:~vthompson/music-app/remix-fix-1390252]

732. By Victor Thompson on 2014-11-16

Use swap icon for toggle and add 'Clear queue' action to Now Playing.

733. By Victor Thompson on 2014-11-16

merge of trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:732
http://91.189.93.70:8080/job/music-app-ci/1156/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/241
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/8

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:733
http://91.189.93.70:8080/job/music-app-ci/1157/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/242
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/9

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looks much better than before :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-11-15 22:21:53 +0000
+++ MusicNowPlaying.qml	2014-11-16 22:07:15 +0000
@@ -78,7 +78,7 @@
             actions: [
                 Action {
                     objectName: "toggleView"
-                    iconName: "media-playlist"
+                    iconName: "swap"
                     onTriggered: {
                         isListView = !isListView
                     }
@@ -87,13 +87,10 @@
                     enabled: trackQueue.model.count > 0
                     iconName: "add-to-playlist"
                     text: i18n.tr("Add to playlist")
-                    visible: isListView
                     onTriggered: {
                         var items = []
 
-                        for (var i=0; i < trackQueue.model.count; i++) {
-                            items.push(makeDict(trackQueue.model.get(i)));
-                        }
+                        items.push(makeDict(trackQueue.model.get(player.currentIndex)));
 
                         var comp = Qt.createComponent("MusicaddtoPlaylist.qml")
                         var addToPlaylist = comp.createObject(mainPageStack, {"chosenElements": items});
@@ -110,7 +107,6 @@
                     iconName: "delete"
                     objectName: "clearQueue"
                     text: i18n.tr("Clear queue")
-                    visible: isListView
                     onTriggered: {
                         pageStack.pop()
                         trackQueue.clear()