Merge lp:~vthompson/music-app/consistent-icons into lp:music-app/trusty

[Victor Thompson]

* Make icons consistent
* Remove some unused icons
* Use Icon component when possible

* Make icons consistent
* Remove some unused icons
* Use Icon component when possible

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Awesome looks much better :)

review: Approve

=== modified file 'MusicPlaylists.qml'
--- MusicPlaylists.qml	2014-07-11 22:29:21 +0000
+++ MusicPlaylists.qml	2014-07-13 00:18:16 +0000
@@ -49,7 +49,7 @@
             action: Action {
                 objectName: "newplaylistButton"
                 text: i18n.tr("New playlist")
-                iconSource: "images/add.svg"
+                iconName: "add"
                 onTriggered: {
                     customdebug("New playlist.")
                     PopupUtils.open(newPlaylistDialog, mainView)

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2014-07-11 22:29:21 +0000
+++ MusicaddtoPlaylist.qml	2014-07-13 00:18:16 +0000
@@ -45,7 +45,7 @@
             action: Action {
                 objectName: "newplaylistButton"
                 text: i18n.tr("New playlist")
-                iconSource: "images/add.svg"
+                iconName: "add"
                 onTriggered: {
                     customdebug("New playlist.")
                     PopupUtils.open(newPlaylistDialog, mainView)

=== modified file 'common/AlbumsPage.qml'
--- common/AlbumsPage.qml	2014-07-09 03:16:28 +0000
+++ common/AlbumsPage.qml	2014-07-13 00:18:16 +0000
@@ -145,10 +145,11 @@
                         color: "transparent"
                         height: units.gu(4)
                         width: units.gu(10)
-                        Image {
+                        Icon {
                             id: playTrack
                             anchors.verticalCenter: parent.verticalCenter
-                            source: "../images/add-to-playback.png"
+                            name: "media-playback-start"
+                            color: styleMusic.common.white
                             height: styleMusic.common.expandedItem
                             width: styleMusic.common.expandedItem
                         }
@@ -187,11 +188,12 @@
                         color: "transparent"
                         height: units.gu(4)
                         width: units.gu(15)
-                        Image {
+                        Icon {
                             id: queueAll
                             objectName: "albumpage-queue-all"
                             anchors.verticalCenter: parent.verticalCenter
-                            source: "../images/add.svg"
+                            name: "add"
+                            color: styleMusic.common.white
                             height: styleMusic.common.expandedItem
                             width: styleMusic.common.expandedItem
                         }
@@ -337,11 +339,11 @@
                     color: "transparent"
                     height: units.gu(3)
                     width: units.gu(15)
-                    Image {
+                    Icon {
                         id: playTrack
                         objectName: "albumpage-playtrack"
                         anchors.verticalCenter: parent.verticalCenter
-                        source: "../images/add-to-playback.png"
+                        name: "media-playback-start"
                         height: styleMusic.common.expandedItem
                         width: styleMusic.common.expandedItem
                     }
@@ -377,11 +379,11 @@
                     color: "transparent"
                     height: units.gu(3)
                     width: units.gu(15)
-                    Image {
+                    Icon {
                         id: queueTrack
                         objectName: "albumpage-queuetrack"
                         anchors.verticalCenter: parent.verticalCenter
-                        source: "../images/add.svg"
+                        name: "add"
                         height: styleMusic.common.expandedItem
                         width: styleMusic.common.expandedItem
                     }

=== modified file 'common/ExpanderItems/AddToPlaylist.qml'
--- common/ExpanderItems/AddToPlaylist.qml	2014-06-19 21:16:33 +0000
+++ common/ExpanderItems/AddToPlaylist.qml	2014-07-13 00:18:16 +0000
@@ -30,7 +30,7 @@
         id: playlistTrack
         anchors.verticalCenter: parent.verticalCenter
         color: styleMusic.common.white
-        name: "add"
+        name: "add-to-playlist"
         height: styleMusic.common.expandedItem
         width: styleMusic.common.expandedItem
     }

=== modified file 'common/ExpanderItems/AddToQueue.qml'
--- common/ExpanderItems/AddToQueue.qml	2014-05-10 19:11:33 +0000
+++ common/ExpanderItems/AddToQueue.qml	2014-07-13 00:18:16 +0000
@@ -25,10 +25,11 @@
     color: "transparent"
     height: styleMusic.common.expandHeight
     width: units.gu(15)
-    Image {
+    Icon {
         id: queueTrack
         anchors.verticalCenter: parent.verticalCenter
-        source: "../../images/queue.png"
+        color: styleMusic.common.white
+        name: "add"
         height: styleMusic.common.expandedItem
         width: styleMusic.common.expandedItem
     }

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-07-11 22:29:21 +0000
+++ common/SongsPage.qml	2014-07-13 00:18:16 +0000
@@ -132,11 +132,11 @@
                 color: "transparent"
                 height: units.gu(4)
                 width: units.gu(15)
-                Image {
+                Icon {
                     id: playTrack
                     objectName: "songspage-playtrack"
                     anchors.verticalCenter: parent.verticalCenter
-                    source: "../images/add-to-playback.png"
+                    name: "media-playback-start"
                     height: styleMusic.common.expandedItem
                     width: styleMusic.common.expandedItem
                 }
@@ -179,11 +179,11 @@
                 color: "transparent"
                 height: units.gu(4)
                 width: units.gu(15)
-                Image {
+                Icon {
                     id: queueAll
                     objectName: "songspage-queue-all"
                     anchors.verticalCenter: parent.verticalCenter
-                    source: "../images/add.svg"
+                    name: "add"
                     height: styleMusic.common.expandedItem
                     width: styleMusic.common.expandedItem
                 }

=== removed file 'images/add-to-playback.png'
Binary files images/add-to-playback.png	2013-07-08 16:11:16 +0000 and images/add-to-playback.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/add-to-playlist.png'
Binary files images/add-to-playlist.png	2013-07-08 16:11:16 +0000 and images/add-to-playlist.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/add.svg'
--- images/add.svg	2013-09-01 13:46:11 +0000
+++ images/add.svg	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3140"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="[e-mail]">
-  <defs
-     id="defs3142" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.9475983"
-     inkscape:cx="35.802612"
-     inkscape:cy="30.102725"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3178"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-1.7382813e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36218)">
-    <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4198"
-       width="90"
-       height="90"
-       x="0"
-       y="962.36218" />
-    <rect
-       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3978"
-       width="12"
-       height="78.00013"
-       x="39"
-       y="968.36212" />
-    <rect
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-84"
-       x="1001.3622"
-       height="77.999985"
-       width="11.999976"
-       id="rect3998"
-       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>

=== removed file 'images/favourite.png'
Binary files images/favourite.png	2013-07-08 16:11:16 +0000 and images/favourite.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/[e-mail]'
Binary files images/[e-mail]	2013-05-08 13:13:37 +0000 and images/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/[e-mail]'
Binary files images/[e-mail]	2013-05-08 13:13:37 +0000 and images/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/no-favourite.png'
Binary files images/no-favourite.png	2013-07-08 16:11:16 +0000 and images/no-favourite.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/playlist.png'
Binary files images/playlist.png	2013-07-24 03:15:19 +0000 and images/playlist.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/queue.png'
Binary files images/queue.png	2013-10-15 19:31:26 +0000 and images/queue.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/select-press.png'
Binary files images/select-press.png	2013-07-08 16:11:16 +0000 and images/select-press.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'images/select.png'
Binary files images/select.png	2013-07-08 16:11:16 +0000 and images/select.png	1970-01-01 00:00:00 +0000 differ