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

Proposed by Michal Hruby on 2014-07-25
Status: Merged
Approved by: Michał Sawicz on 2014-08-11
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 on 2014-08-07
Paweł Stołowski 2014-07-25 Approve on 2014-07-29
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.
Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve
124. By Michal Hruby on 2014-08-07

Update the assets

125. By Michal Hruby on 2014-08-07

Merge trunk

126. By Michal Hruby on 2014-08-07

Fix overlay color definitions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-07-31 10:49:37 +0000
3+++ data/CMakeLists.txt 2014-08-07 13:32:44 +0000
4@@ -25,12 +25,12 @@
5 add_custom_target(ini-i18n ALL DEPENDS ${SCOPE_CONFIG_FILES})
6
7 install(
8- FILES music.png mediascanner-music-screenshot.jpg
9+ FILES music.png music-scope.png mediascanner-music-screenshot.jpg
10 DESTINATION "${SCOPES_DATADIR}/mediascanner-music"
11 )
12
13 install(
14- FILES video.png mediascanner-video-screenshot.jpg
15+ FILES video.png video-scope.png mediascanner-video-screenshot.jpg
16 DESTINATION "${SCOPES_DATADIR}/mediascanner-video"
17 )
18
19
20=== modified file 'data/mediascanner-music.ini.in.in'
21--- data/mediascanner-music.ini.in.in 2014-07-23 15:18:45 +0000
22+++ data/mediascanner-music.ini.in.in 2014-08-07 13:32:44 +0000
23@@ -3,10 +3,13 @@
24 _Description=This is an Ubuntu search plugin that scans the device for music and allows it to be searched and displayed in the Dash.
25 Author=Canonical Ltd.
26 Art=@SCOPES_DATADIR@/mediascanner-music/mediascanner-music-screenshot.jpg
27-Icon=@SCOPES_DATADIR@/mediascanner-music/music.png
28+Icon=@SCOPES_DATADIR@/mediascanner-music/music-scope.png
29 _SearchHint=Search local music collection
30 HotKey=
31
32+[Appearance]
33+LogoOverlayColor=#26000000
34+
35 [Desktop Entry]
36 X-Ubuntu-Gettext-Domain=unity-scope-mediascanner
37
38
39=== modified file 'data/mediascanner-video.ini.in.in'
40--- data/mediascanner-video.ini.in.in 2014-07-31 05:09:47 +0000
41+++ data/mediascanner-video.ini.in.in 2014-08-07 13:32:44 +0000
42@@ -3,9 +3,12 @@
43 _Description=This is an Ubuntu search plugin that scans the device for videos and allows them to be searched and displayed in the Dash.
44 Author=Canonical Ltd.
45 Art=@SCOPES_DATADIR@/mediascanner-video/mediascanner-video-screenshot.jpg
46-Icon=@SCOPES_DATADIR@/mediascanner-video/video.png
47+Icon=@SCOPES_DATADIR@/mediascanner-video/video-scope.png
48 _SearchHint=
49 HotKey=
50
51+[Appearance]
52+LogoOverlayColor=#26000000
53+
54 [Desktop Entry]
55 X-Ubuntu-Gettext-Domain=unity-scope-hollywood
56
57=== added file 'data/music-scope.png'
58Binary 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
59=== modified file 'data/musicaggregator.ini.in.in'
60--- data/musicaggregator.ini.in.in 2014-04-29 16:24:20 +0000
61+++ data/musicaggregator.ini.in.in 2014-08-07 13:32:44 +0000
62@@ -3,10 +3,13 @@
63 _Description=This is an Ubuntu search plugin that merges all music sources into one.
64 Author=Canonical Ltd.
65 Art=@SCOPES_DATADIR@/musicaggregator/musicaggregator-screenshot.jpg
66-Icon=@SCOPES_DATADIR@/mediascanner-music/music.png
67+Icon=@SCOPES_DATADIR@/mediascanner-music/music-scope.png
68 _SearchHint=Search music
69 HotKey=
70
71+[Appearance]
72+LogoOverlayColor=#26000000
73+
74 [Desktop Entry]
75 X-Ubuntu-Gettext-Domain=unity-scope-musicaggregator
76
77
78=== added file 'data/video-scope.png'
79Binary 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
80=== modified file 'data/videoaggregator.ini.in.in'
81--- data/videoaggregator.ini.in.in 2014-04-29 16:24:20 +0000
82+++ data/videoaggregator.ini.in.in 2014-08-07 13:32:44 +0000
83@@ -3,10 +3,13 @@
84 _Description=This is an Ubuntu search plugin that merges all video sources into one.
85 Author=Canonical Ltd.
86 Art=@SCOPES_DATADIR@/videoaggregator/videoaggregator-screenshot.jpg
87-Icon=@SCOPES_DATADIR@/mediascanner-video/video.png
88+Icon=@SCOPES_DATADIR@/mediascanner-video/video-scope.png
89 _SearchHint=Search video
90 HotKey=
91
92+[Appearance]
93+LogoOverlayColor=#26000000
94+
95 [Desktop Entry]
96 X-Ubuntu-Gettext-Domain=unity-scope-videoaggregator
97
98
99=== modified file 'debian/changelog'
100--- debian/changelog 2014-08-01 16:07:29 +0000
101+++ debian/changelog 2014-08-07 13:32:44 +0000
102@@ -29,6 +29,12 @@
103
104 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 30 Jul 2014 10:52:17 +0000
105
106+unity-scope-mediascanner (0.2+14.10.20140724-0ubuntu1) UNRELEASED; urgency=medium
107+
108+ * Updated icons
109+
110+ -- Michal Hruby <michal.hruby@canonical.com> Fri, 25 Jul 2014 09:14:57 +0100
111+
112 unity-scope-mediascanner (0.2+14.10.20140718-0ubuntu1) utopic; urgency=low
113
114 [ Jussi Pakkanen ]

Subscribers

People subscribed via source and target branches

to all changes: