unity-scope-click

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

  1. overview-icons
  2. Merge into rtm-14.09
Proposed by Michał Sawicz
Status: Merged
Approved by: Michał Sawicz
Approved revision: 257
Merged at revision: 263
Proposed branch: lp:~unity-team/unity-scope-click/overview-icons
Merge into: lp:unity-scope-click/rtm-14.09
Diff against target: 90 lines (+23/-6) (has conflicts)
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 (+9/-0)
debian/unity-scope-click.install (+4/-2)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~unity-team/unity-scope-click/overview-icons
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+230457@code.launchpad.net

Commit message

trunk/r263: Update category renderer to match the overview.

To post a comment you must log in.

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-08-05 10:00:46 +0000
3+++ data/CMakeLists.txt 2014-08-12 10:59:13 +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-12 10:59:13 +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-12 10:59:13 +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-12 10:59:13 +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-12 10:59:13 +0000 differ
52=== modified file 'debian/changelog'
53--- debian/changelog 2014-08-07 02:48:47 +0000
54+++ debian/changelog 2014-08-12 10:59:13 +0000
55@@ -1,3 +1,4 @@
56+<<<<<<< TREE
57 unity-scope-click (0.1+14.10.20140807.1-0ubuntu1) utopic; urgency=medium
58
59 [ Alejandro J. Cura (alecu) ]
60@@ -13,6 +14,14 @@
61
62 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 07 Aug 2014 02:48:46 +0000
63
64+=======
65+unity-scope-click (0.1.1+14.10.20140724-0ubuntu1) UNRELEASED; urgency=medium
66+
67+ * Updated scope icons
68+
69+ -- Michal Hruby <michal.hruby@canonical.com> Tue, 22 Jul 2014 16:12:07 +0100
70+
71+>>>>>>> MERGE-SOURCE
72 unity-scope-click (0.1+14.10.20140805-0ubuntu1) utopic; urgency=medium
73
74 [ Alejandro J. Cura (alecu) ]
75
76=== modified file 'debian/unity-scope-click.install'
77--- debian/unity-scope-click.install 2014-07-14 16:21:26 +0000
78+++ debian/unity-scope-click.install 2014-08-12 10:59:13 +0000
79@@ -1,7 +1,9 @@
80 usr/lib/*/unity-scopes/*
81 usr/lib/unity-scope-click/*
82-usr/share/unity/scopes/clickstore/*
83+usr/share/unity/scopes/clickstore/*jpg
84+usr/share/unity/scopes/clickstore/*png
85+usr/share/unity/scopes/clickstore/*svg
86 usr/share/unity/scopes/clickapps/*jpg
87-usr/share/unity/scopes/clickapps/*svg
88+usr/share/unity/scopes/clickapps/*png
89 usr/share/glib-2.0/schemas/*
90 usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo

Subscribers

People subscribed via source and target branches

to all changes: