Merge lp:~danielholm/music-app/resolve-missing-images-plus-new-ones into lp:music-app/trusty

[Daniel Holm]

Resolve bug #1198889 and added some other new icons by Lucas.

Resolved bug #1198889 that images/icons for playlist and scrobble was missing. Also some new icons from Lucas to be used later, perhaps.

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

FAILED: Continuous integration, rev:39
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~danielholm/music-app/resolve-missing-images-plus-new-ones/+merge/173540/+edit-commit-message

http://91.189.93.70:8080/job/music-app-ci/2/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/2

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

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Daniel, I'd like to fix 2 things. 1) Could you remove the link "[e-mail]" and 2) Could you commit the following change to change "[e-mail]" to "settings.png"?

bzr diff=== modified file 'MusicTracks.qml'
--- MusicTracks.qml 2013-07-04 07:25:42 +0000
+++ MusicTracks.qml 2013-07-09 00:18:24 +0000
@@ -60,7 +60,7 @@
             // Settings dialog
             ToolbarButton {
                 objectName: "settingsaction"
- iconSource: Qt.resolvedUrl("images/[e-mail]")
+ iconSource: Qt.resolvedUrl("images/settings.png")
                 text: i18n.tr("Settings")

                 onTriggered: {

[Victor Thompson (vthompson)]

Also, could you keep the existing "folder.png" and rename the one you propose to merge "music_folder.png"?

[Daniel Holm (danielholm)]

Sure. I'll fix it later on today.

[lp:~danielholm/music-app/resolve-missing-images-plus-new-ones]

40. By Daniel Holm on 2013-07-09

Remove link to old settings icon; take back previous dir icon, and removed default-album icon.

[Daniel Holm (danielholm)]

Done!

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

PASSED: Continuous integration, rev:40
http://91.189.93.70:8080/job/music-app-ci/4/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/4
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/4

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Thanks! Looks perfect!

review: Approve

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2013-07-04 07:25:42 +0000
+++ MusicTracks.qml	2013-07-09 09:56:29 +0000
@@ -60,7 +60,7 @@
             // Settings dialog
             ToolbarButton {
                 objectName: "settingsaction"
-                iconSource: Qt.resolvedUrl("images/[e-mail]")
+                iconSource: Qt.resolvedUrl("images/settings.png")
                 text: i18n.tr("Settings")
 
                 onTriggered: {

=== added file 'images/add-to-playback.png'
Binary files images/add-to-playback.png	1970-01-01 00:00:00 +0000 and images/add-to-playback.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/add-to-playlist.png'
Binary files images/add-to-playlist.png	1970-01-01 00:00:00 +0000 and images/add-to-playlist.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/clear.png'
Binary files images/clear.png	1970-01-01 00:00:00 +0000 and images/clear.png	2013-07-09 09:56:29 +0000 differ
=== removed file 'images/default-album.png'
Binary files images/default-album.png	2013-05-08 13:13:37 +0000 and images/default-album.png	1970-01-01 00:00:00 +0000 differ
=== added file 'images/favourite.png'
Binary files images/favourite.png	1970-01-01 00:00:00 +0000 and images/favourite.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/lastfm.png'
Binary files images/lastfm.png	1970-01-01 00:00:00 +0000 and images/lastfm.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/lastfm_color.png'
Binary files images/lastfm_color.png	1970-01-01 00:00:00 +0000 and images/lastfm_color.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/morebutton.png'
Binary files images/morebutton.png	1970-01-01 00:00:00 +0000 and images/morebutton.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/music_folder.png'
Binary files images/music_folder.png	1970-01-01 00:00:00 +0000 and images/music_folder.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/no-favourite.png'
Binary files images/no-favourite.png	1970-01-01 00:00:00 +0000 and images/no-favourite.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/playlist.png'
Binary files images/playlist.png	1970-01-01 00:00:00 +0000 and images/playlist.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/search.png'
Binary files images/search.png	1970-01-01 00:00:00 +0000 and images/search.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/select-press.png'
Binary files images/select-press.png	1970-01-01 00:00:00 +0000 and images/select-press.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/select.png'
Binary files images/select.png	1970-01-01 00:00:00 +0000 and images/select.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/settings.png'
Binary files images/settings.png	1970-01-01 00:00:00 +0000 and images/settings.png	2013-07-09 09:56:29 +0000 differ
=== removed file 'images/[e-mail]'
Binary files images/[e-mail]	2013-06-04 07:04:01 +0000 and images/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== added file 'images/ubuntuonemusic.png'
Binary files images/ubuntuonemusic.png	1970-01-01 00:00:00 +0000 and images/ubuntuonemusic.png	2013-07-09 09:56:29 +0000 differ
=== added file 'images/wikipedia.png'
Binary files images/wikipedia.png	1970-01-01 00:00:00 +0000 and images/wikipedia.png	2013-07-09 09:56:29 +0000 differ