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

Proposed by Michal Hruby on 2014-07-22
Status: Merged
Approved by: Michał Sawicz on 2014-08-11
Approved revision: 257
Merged at revision: 263
Proposed branch: lp:~unity-team/unity-scope-click/overview-icons
Merge into: lp:unity-scope-click
Diff against target: 80 lines (+20/-6)
5 files modified
data/CMakeLists.txt (+2/-2)
data/clickscope.ini.in.in (+4/-1)
data/com.canonical.scopes.clickstore.ini.in.in (+4/-1)
debian/changelog (+6/-0)
debian/unity-scope-click.install (+4/-2)
To merge this branch: bzr merge lp:~unity-team/unity-scope-click/overview-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-08-07
dobey (community) 2014-07-22 Needs Information on 2014-07-30
Paweł Stołowski Approve on 2014-07-29
Review via email: mp+227731@code.launchpad.net

Commit message

Update the icons to fit with the scopes overview.

Description of the change

Update the icons to fit with the scopes overview.

To post a comment you must log in.
Michal Hruby (mhr3) wrote :

Please don't merge yet, just misusing jenkins to get armhf debs. :)

248. By Michal Hruby on 2014-07-22

Update debian

249. By Michal Hruby on 2014-07-22

Simplify

250. By Michal Hruby on 2014-07-22

Add overlay color definition

251. By Michal Hruby on 2014-07-23

Remove the simplification, cause it breaks the departmentdb pkg

dobey (dobey) wrote :

This needs to be a branch of lp:unity-scope-click/devel and proposed to it I think? I don't see any reason this should land directly to trunk here, as it doesn't appear to be a pressing issue related to gcc versions or build dependencies breaking ABI.

review: Needs Fixing
252. By Michal Hruby on 2014-07-24

Merge trunk

Michal Hruby (mhr3) wrote :

Actually, it's a super isolated change and we'll want to land it together with the rest of the scopes overview feature.

253. By Michal Hruby on 2014-07-25

Merge trunk

Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve
dobey (dobey) wrote :

Where are the SVGs for these new PNGs that are added? Why aren't the SVGs added and used directly instead? Can we please get the SVGs added, in case they need to be changed in the future?

review: Needs Information
254. By Michal Hruby on 2014-07-31

Merge trunk

255. By Michal Hruby on 2014-08-07

Update the assets

256. By Michal Hruby on 2014-08-07

Merge trunk

257. 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-14 16:53:54 +0000
3+++ data/CMakeLists.txt 2014-08-07 13:30:55 +0000
4@@ -30,12 +30,12 @@
5 )
6
7 install(
8- FILES clickscope-screenshot.jpg apps-scope.svg store-scope-icon.svg
9+ FILES clickscope-screenshot.jpg ubuntu-store-scope.png store-scope-icon.svg
10 DESTINATION "${STORE_DATA_DIR}"
11 )
12
13 install(
14- FILES clickscope-screenshot.jpg apps-scope.svg
15+ FILES clickscope-screenshot.jpg apps-scope.png
16 DESTINATION "${APPS_DATA_DIR}"
17 )
18
19
20=== added file 'data/apps-scope.png'
21Binary files data/apps-scope.png 1970-01-01 00:00:00 +0000 and data/apps-scope.png 2014-08-07 13:30:55 +0000 differ
22=== modified file 'data/clickscope.ini.in.in'
23--- data/clickscope.ini.in.in 2014-07-25 13:11:26 +0000
24+++ data/clickscope.ini.in.in 2014-08-07 13:30:55 +0000
25@@ -3,5 +3,8 @@
26 _Description=Scope for searching the installed click apps
27 Author=Canonical Ltd.
28 Art=@APPS_DATA_DIR@/clickscope-screenshot.jpg
29-Icon=@APPS_DATA_DIR@/apps-scope.svg
30+Icon=@APPS_DATA_DIR@/apps-scope.png
31 _SearchHint=Search apps
32+
33+[Appearance]
34+LogoOverlayColor=#ffffffff
35
36=== modified file 'data/com.canonical.scopes.clickstore.ini.in.in'
37--- data/com.canonical.scopes.clickstore.ini.in.in 2014-07-25 13:11:26 +0000
38+++ data/com.canonical.scopes.clickstore.ini.in.in 2014-08-07 13:30:55 +0000
39@@ -3,5 +3,8 @@
40 _Description=Scope for searching the click app store
41 Author=Canonical Ltd.
42 Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg
43-Icon=@STORE_DATA_DIR@/apps-scope.svg
44+Icon=@STORE_DATA_DIR@/ubuntu-store-scope.png
45 _SearchHint=Search store
46+
47+[Appearance]
48+LogoOverlayColor=#26000000
49
50=== added file 'data/ubuntu-store-scope.png'
51Binary files data/ubuntu-store-scope.png 1970-01-01 00:00:00 +0000 and data/ubuntu-store-scope.png 2014-08-07 13:30:55 +0000 differ
52=== modified file 'debian/changelog'
53--- debian/changelog 2014-08-05 13:11:42 +0000
54+++ debian/changelog 2014-08-07 13:30:55 +0000
55@@ -1,3 +1,9 @@
56+unity-scope-click (0.1.1+14.10.20140724-0ubuntu1) UNRELEASED; urgency=medium
57+
58+ * Updated scope icons
59+
60+ -- Michal Hruby <michal.hruby@canonical.com> Tue, 22 Jul 2014 16:12:07 +0100
61+
62 unity-scope-click (0.1+14.10.20140805-0ubuntu1) utopic; urgency=medium
63
64 [ Alejandro J. Cura (alecu) ]
65
66=== modified file 'debian/unity-scope-click.install'
67--- debian/unity-scope-click.install 2014-07-14 16:21:26 +0000
68+++ debian/unity-scope-click.install 2014-08-07 13:30:55 +0000
69@@ -1,7 +1,9 @@
70 usr/lib/*/unity-scopes/*
71 usr/lib/unity-scope-click/*
72-usr/share/unity/scopes/clickstore/*
73+usr/share/unity/scopes/clickstore/*jpg
74+usr/share/unity/scopes/clickstore/*png
75+usr/share/unity/scopes/clickstore/*svg
76 usr/share/unity/scopes/clickapps/*jpg
77-usr/share/unity/scopes/clickapps/*svg
78+usr/share/unity/scopes/clickapps/*png
79 usr/share/glib-2.0/schemas/*
80 usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo

Subscribers

People subscribed via source and target branches

to all changes: