Merge lp:~vthompson/music-app/change-nowplaying-queue-toggle-icon into lp:music-app/remix

[Victor Thompson]

* Change Now Playing/Queue toggle button.

* Change Now Playing/Queue toggle button.

Now Playing toggle to Queue: http://i.imgur.com/0lT8YwO.png
Queue toggle to Now Playing: http://i.imgur.com/kkcJKWc.png

[Victor Thompson (vthompson)]

#blocked Design input

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

PASSED: Continuous integration, rev:755
http://91.189.93.70:8080/job/music-app-ci/1170/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/405
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/22

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/change-nowplaying-queue-toggle-icon]

756. By Victor Thompson on 2015-01-14

merge of trunk

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

PASSED: Continuous integration, rev:756
http://91.189.93.70:8080/job/music-app-ci/1213/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/668
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/668/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/65

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This should be ready to land given design input.

review: Approve

[Victor Thompson (vthompson)]

#unblocked

[Andrew Hayzen (ahayzen)]

Nice, looks much better :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2015-01-10 17:36:58 +0000
+++ MusicNowPlaying.qml	2015-01-14 05:07:45 +0000
@@ -79,7 +79,7 @@
             actions: [
                 Action {
                     objectName: "toggleView"
-                    iconName: "swap"
+                    iconName: isListView ? "stock_image" : "view-list-symbolic"
                     onTriggered: {
                         isListView = !isListView
                     }