Unity Media Scanner Scope

Merge lp:~unity-team/unity-scope-mediascanner/overview-icons into lp:unity-scope-mediascanner

  1. overview-icons
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michał Sawicz
Approved revision: 126
Merged at revision: 141
Proposed branch: lp:~unity-team/unity-scope-mediascanner/overview-icons
Merge into: lp:unity-scope-mediascanner
Diff against target: 114 lines (+24/-6)
6 files modified
data/CMakeLists.txt (+2/-2)
data/mediascanner-music.ini.in.in (+4/-1)
data/mediascanner-video.ini.in.in (+4/-1)
data/musicaggregator.ini.in.in (+4/-1)
data/videoaggregator.ini.in.in (+4/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~unity-team/unity-scope-mediascanner/overview-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Paweł Stołowski (community) Approve
Review via email: mp+228254@code.launchpad.net

Commit message

Updated icons to fit with the scopes overview.

Description of the change

Updated icons to fit with the scopes overview.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:123
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/114/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve
lp:~unity-team/unity-scope-mediascanner/overview-icons updated
124. By Michal Hruby

Update the assets

125. By Michal Hruby

Merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/133/rebuild

review: Approve (continuous-integration)
lp:~unity-team/unity-scope-mediascanner/overview-icons updated
126. By Michal Hruby

Fix overlay color definitions

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/38
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/136/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt 2014-07-31 10:49:37 +0000
+++ data/CMakeLists.txt 2014-08-07 13:32:44 +0000
@@ -25,12 +25,12 @@
25add_custom_target(ini-i18n ALL DEPENDS ${SCOPE_CONFIG_FILES})25add_custom_target(ini-i18n ALL DEPENDS ${SCOPE_CONFIG_FILES})
2626
27install(27install(
28 FILES music.png mediascanner-music-screenshot.jpg28 FILES music.png music-scope.png mediascanner-music-screenshot.jpg
29 DESTINATION "${SCOPES_DATADIR}/mediascanner-music"29 DESTINATION "${SCOPES_DATADIR}/mediascanner-music"
30)30)
3131
32install(32install(
33 FILES video.png mediascanner-video-screenshot.jpg33 FILES video.png video-scope.png mediascanner-video-screenshot.jpg
34 DESTINATION "${SCOPES_DATADIR}/mediascanner-video"34 DESTINATION "${SCOPES_DATADIR}/mediascanner-video"
35)35)
3636
3737
=== modified file 'data/mediascanner-music.ini.in.in'
--- data/mediascanner-music.ini.in.in 2014-07-23 15:18:45 +0000
+++ data/mediascanner-music.ini.in.in 2014-08-07 13:32:44 +0000
@@ -3,10 +3,13 @@
3_Description=This is an Ubuntu search plugin that scans the device for music and allows it to be searched and displayed in the Dash.3_Description=This is an Ubuntu search plugin that scans the device for music and allows it to be searched and displayed in the Dash.
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@SCOPES_DATADIR@/mediascanner-music/mediascanner-music-screenshot.jpg5Art=@SCOPES_DATADIR@/mediascanner-music/mediascanner-music-screenshot.jpg
6Icon=@SCOPES_DATADIR@/mediascanner-music/music.png6Icon=@SCOPES_DATADIR@/mediascanner-music/music-scope.png
7_SearchHint=Search local music collection7_SearchHint=Search local music collection
8HotKey=8HotKey=
99
10[Appearance]
11LogoOverlayColor=#26000000
12
10[Desktop Entry]13[Desktop Entry]
11X-Ubuntu-Gettext-Domain=unity-scope-mediascanner14X-Ubuntu-Gettext-Domain=unity-scope-mediascanner
1215
1316
=== modified file 'data/mediascanner-video.ini.in.in'
--- data/mediascanner-video.ini.in.in 2014-07-31 05:09:47 +0000
+++ data/mediascanner-video.ini.in.in 2014-08-07 13:32:44 +0000
@@ -3,9 +3,12 @@
3_Description=This is an Ubuntu search plugin that scans the device for videos and allows them to be searched and displayed in the Dash.3_Description=This is an Ubuntu search plugin that scans the device for videos and allows them to be searched and displayed in the Dash.
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@SCOPES_DATADIR@/mediascanner-video/mediascanner-video-screenshot.jpg5Art=@SCOPES_DATADIR@/mediascanner-video/mediascanner-video-screenshot.jpg
6Icon=@SCOPES_DATADIR@/mediascanner-video/video.png6Icon=@SCOPES_DATADIR@/mediascanner-video/video-scope.png
7_SearchHint=7_SearchHint=
8HotKey=8HotKey=
99
10[Appearance]
11LogoOverlayColor=#26000000
12
10[Desktop Entry]13[Desktop Entry]
11X-Ubuntu-Gettext-Domain=unity-scope-hollywood14X-Ubuntu-Gettext-Domain=unity-scope-hollywood
1215
=== added file 'data/music-scope.png'
13Binary files data/music-scope.png 1970-01-01 00:00:00 +0000 and data/music-scope.png 2014-08-07 13:32:44 +0000 differ16Binary files data/music-scope.png 1970-01-01 00:00:00 +0000 and data/music-scope.png 2014-08-07 13:32:44 +0000 differ
=== modified file 'data/musicaggregator.ini.in.in'
--- data/musicaggregator.ini.in.in 2014-04-29 16:24:20 +0000
+++ data/musicaggregator.ini.in.in 2014-08-07 13:32:44 +0000
@@ -3,10 +3,13 @@
3_Description=This is an Ubuntu search plugin that merges all music sources into one.3_Description=This is an Ubuntu search plugin that merges all music sources into one.
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@SCOPES_DATADIR@/musicaggregator/musicaggregator-screenshot.jpg5Art=@SCOPES_DATADIR@/musicaggregator/musicaggregator-screenshot.jpg
6Icon=@SCOPES_DATADIR@/mediascanner-music/music.png6Icon=@SCOPES_DATADIR@/mediascanner-music/music-scope.png
7_SearchHint=Search music7_SearchHint=Search music
8HotKey=8HotKey=
99
10[Appearance]
11LogoOverlayColor=#26000000
12
10[Desktop Entry]13[Desktop Entry]
11X-Ubuntu-Gettext-Domain=unity-scope-musicaggregator14X-Ubuntu-Gettext-Domain=unity-scope-musicaggregator
1215
1316
=== added file 'data/video-scope.png'
14Binary files data/video-scope.png 1970-01-01 00:00:00 +0000 and data/video-scope.png 2014-08-07 13:32:44 +0000 differ17Binary files data/video-scope.png 1970-01-01 00:00:00 +0000 and data/video-scope.png 2014-08-07 13:32:44 +0000 differ
=== modified file 'data/videoaggregator.ini.in.in'
--- data/videoaggregator.ini.in.in 2014-04-29 16:24:20 +0000
+++ data/videoaggregator.ini.in.in 2014-08-07 13:32:44 +0000
@@ -3,10 +3,13 @@
3_Description=This is an Ubuntu search plugin that merges all video sources into one.3_Description=This is an Ubuntu search plugin that merges all video sources into one.
4Author=Canonical Ltd.4Author=Canonical Ltd.
5Art=@SCOPES_DATADIR@/videoaggregator/videoaggregator-screenshot.jpg5Art=@SCOPES_DATADIR@/videoaggregator/videoaggregator-screenshot.jpg
6Icon=@SCOPES_DATADIR@/mediascanner-video/video.png6Icon=@SCOPES_DATADIR@/mediascanner-video/video-scope.png
7_SearchHint=Search video7_SearchHint=Search video
8HotKey=8HotKey=
99
10[Appearance]
11LogoOverlayColor=#26000000
12
10[Desktop Entry]13[Desktop Entry]
11X-Ubuntu-Gettext-Domain=unity-scope-videoaggregator14X-Ubuntu-Gettext-Domain=unity-scope-videoaggregator
1215
1316
=== modified file 'debian/changelog'
--- debian/changelog 2014-08-01 16:07:29 +0000
+++ debian/changelog 2014-08-07 13:32:44 +0000
@@ -29,6 +29,12 @@
2929
30 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 30 Jul 2014 10:52:17 +000030 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 30 Jul 2014 10:52:17 +0000
3131
32unity-scope-mediascanner (0.2+14.10.20140724-0ubuntu1) UNRELEASED; urgency=medium
33
34 * Updated icons
35
36 -- Michal Hruby <michal.hruby@canonical.com> Fri, 25 Jul 2014 09:14:57 +0100
37
32unity-scope-mediascanner (0.2+14.10.20140718-0ubuntu1) utopic; urgency=low38unity-scope-mediascanner (0.2+14.10.20140718-0ubuntu1) utopic; urgency=low
3339
34 [ Jussi Pakkanen ]40 [ Jussi Pakkanen ]

Subscribers

People subscribed via source and target branches

to all changes: