Merge lp:~agateau/ubuntu-mono/gnome-cc-categories into lp:~ubuntu-art-pkg/ubuntu-mono/trunk

Proposed by Aurélien Gâteau on 2012-01-24
Status: Merged
Merged at revision: 127
Proposed branch: lp:~agateau/ubuntu-mono/gnome-cc-categories
Merge into: lp:~ubuntu-art-pkg/ubuntu-mono/trunk
Diff against target: 151 lines (+114/-0)
7 files modified
debian/changelog (+6/-0)
ubuntu-mono-dark/categories/24/preferences-desktop-peripherals-directory.svg (+11/-0)
ubuntu-mono-dark/categories/24/preferences-desktop-personal-directory.svg (+20/-0)
ubuntu-mono-dark/categories/24/preferences-system-directory.svg (+23/-0)
ubuntu-mono-light/categories/24/preferences-desktop-peripherals-directory.svg (+11/-0)
ubuntu-mono-light/categories/24/preferences-desktop-personal-directory.svg (+20/-0)
ubuntu-mono-light/categories/24/preferences-system-directory.svg (+23/-0)
To merge this branch: bzr merge lp:~agateau/ubuntu-mono/gnome-cc-categories
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-02-08
Paul Sladen 2012-01-24 Approve on 2012-02-06
Review via email: mp+89948@code.launchpad.net

Description of the change

Include icon for the new category headers in gnome-control-center

To post a comment you must log in.
Paul Sladen (sladen) wrote :

What's the source for these icons?

I think 'preferences-desktop-personal.svg' might already be in there, and could possibly be added as a symlink.

Aurélien Gâteau (agateau) wrote :

I got the icons from Rosie. I must confess I haven't checked whether they already exist in the repository.

Sebastien Bacher (seb128) wrote :

what about the light theme users?

Aurélien Gâteau (agateau) wrote :

light theme should use the same icons. Just added them as well.

126. By Aurélien Gâteau on 2012-02-01

Add gnome-control center category icons for ubuntu-mono-light as well

Paul Sladen (sladen) wrote :

nb. to self: the light and dark icons in r126 are identical.

Paul Sladen (sladen) wrote :

agateu: re: "light theme should use the same icons. Just added them as well."; where's that?

127. By Aurélien Gâteau on 2012-02-06

Rename category icons to avoid overriding application icons

These new icons are designed to be used in gnome-control-center, but at least
one of them (preferences-system.svg) is used by as the application icon of
gnome-control-center itself as well as other applications such as
gnome-tweak-tool.

This change goes with a matching change to the gnome-menu package which appends
the "-directory" suffix to the Icon key of the Personal.directory,
System.directory and Hardware.directory files.

Paul Sladen (sladen) wrote :

r126 validated as /working/ when installed alongside:

  lp:~agateau/gnome-control-center/category-headers

(Got bogged down in FTBFS for 'ubuntu-mono' and scour breakage). It works, I haven't checked whether there's duplicate of icons (as the visual level). The 'gnome-control-center' icon itself does not appear bt to affected and still remains the full-colour cog.

However, it appears to be good-to-go, and can be refined later so not to hold things up for the moment.

review: Approve
Sebastien Bacher (seb128) wrote :

Thanks for the review Paul, can you sponsor the update if you are happy with it?

Didier Roche (didrocks) wrote :

sponsoring

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-11-18 18:11:02 +0000
3+++ debian/changelog 2012-02-06 13:04:19 +0000
4@@ -1,3 +1,9 @@
5+ubuntu-mono (0.0.39) precise; urgency=low
6+
7+ * Add icons for gnome-control-center category headers (LP: #921061)
8+
9+ -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Tue, 24 Jan 2012 17:34:16 +0100
10+
11 ubuntu-mono (0.0.38) precise; urgency=low
12
13 * debian/control:
14
15=== added file 'ubuntu-mono-dark/categories/24/preferences-desktop-peripherals-directory.svg'
16--- ubuntu-mono-dark/categories/24/preferences-desktop-peripherals-directory.svg 1970-01-01 00:00:00 +0000
17+++ ubuntu-mono-dark/categories/24/preferences-desktop-peripherals-directory.svg 2012-02-06 13:04:19 +0000
18@@ -0,0 +1,11 @@
19+<?xml version="1.0" encoding="utf-8"?>
20+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
21+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
22+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
23+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
24+<path fill="#363636" d="M8.622,8.622L5.206,8.883L2.248,5.927C1.659,7.834,2.118,10,3.63,11.511c1.727,1.731,4.309,2.08,6.388,1.063
25+ l-0.009,0.007l4.917,6.55c1.159,1.159,3.042,1.159,4.203,0c1.161-1.16,1.159-3.041,0-4.204l-6.548-4.918l-0.01,0.011
26+ c1.018-2.079,0.666-4.66-1.062-6.389C9.999,2.119,7.835,1.659,5.927,2.248l2.958,2.96L8.622,8.622z M17.799,16.226
27+ c0.435,0.433,0.435,1.139,0,1.575c-0.436,0.434-1.143,0.434-1.574,0c-0.438-0.437-0.438-1.143,0-1.575
28+ C16.656,15.788,17.363,15.788,17.799,16.226z"/>
29+</svg>
30
31=== added file 'ubuntu-mono-dark/categories/24/preferences-desktop-personal-directory.svg'
32--- ubuntu-mono-dark/categories/24/preferences-desktop-personal-directory.svg 1970-01-01 00:00:00 +0000
33+++ ubuntu-mono-dark/categories/24/preferences-desktop-personal-directory.svg 2012-02-06 13:04:19 +0000
34@@ -0,0 +1,20 @@
35+<?xml version="1.0" encoding="utf-8"?>
36+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
37+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
38+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
39+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
40+<g>
41+ <g>
42+ <path fill="#363636" d="M16.323,16.496c-1.8-0.896-2.621-2.444-2.621-3.179c0-0.49,0.326-1.248,0.642-1.616
43+ c0.309-0.361,0.766-0.54,0.983-0.941c0.352-0.655,0.541-1.963,0.43-2.538c-0.078-0.41-0.43-0.451-0.43-0.818
44+ c0-0.328,0.077-0.859,0.077-1.76c0-1.27-0.485-1.948-1.139-2.538C13.675,2.573,12.496,2,11.002,2
45+ c-0.316,0-0.659,0.029-0.942,0.083C9.412,2.205,8.974,2.511,8.752,2.75L8.743,2.745L8.692,2.811h0
46+ C8.691,2.813,8.687,2.816,8.685,2.819C8.409,2.86,7.964,2.924,7.584,3.228C7.072,3.637,6.601,4.374,6.601,5.644
47+ c0,0.9,0.078,1.432,0.078,1.76c0,0.368-0.354,0.409-0.432,0.818c-0.111,0.575,0.079,1.883,0.432,2.538
48+ c0.217,0.401,0.675,0.58,0.982,0.941c0.315,0.368,0.642,1.126,0.642,1.616c0,0.734-0.828,2.282-2.627,3.179
49+ C3.211,17.725,2,18.289,2,20h18C20,18.289,18.788,17.725,16.323,16.496z M9.008,2.219L8.831,2.071
50+ c-0.094,0.113-0.159,0.24-0.19,0.368c-0.12-0.042-0.256-0.062-0.412-0.062v0.231c0.185,0,0.332,0.033,0.45,0.1l0.064,0.037
51+ L8.85,2.608C8.85,2.479,8.906,2.341,9.008,2.219z"/>
52+ </g>
53+</g>
54+</svg>
55
56=== added file 'ubuntu-mono-dark/categories/24/preferences-system-directory.svg'
57--- ubuntu-mono-dark/categories/24/preferences-system-directory.svg 1970-01-01 00:00:00 +0000
58+++ ubuntu-mono-dark/categories/24/preferences-system-directory.svg 2012-02-06 13:04:19 +0000
59@@ -0,0 +1,23 @@
60+<?xml version="1.0" encoding="utf-8"?>
61+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
62+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
63+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
64+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
65+<g>
66+ <g>
67+ <path fill="#363636" d="M11,2C6.03,2,2,6.029,2,11c0,4.97,4.03,9,9,9c4.97,0,9-4.03,9-9C20,6.029,15.971,2,11,2z M12.873,5.366
68+ c0.342-0.593,1.099-0.795,1.689-0.453c0.592,0.342,0.795,1.099,0.454,1.69c-0.341,0.593-1.099,0.795-1.69,0.453
69+ C12.733,6.714,12.531,5.958,12.873,5.366z M5.073,12.346c-0.684,0-1.239-0.554-1.239-1.237S4.389,9.87,5.073,9.87
70+ c0.683,0,1.237,0.555,1.237,1.238S5.756,12.346,5.073,12.346z M7.332,14.764c-0.614-0.614-1.054-1.355-1.297-2.165
71+ c0.489-0.315,0.812-0.865,0.812-1.49s-0.323-1.174-0.812-1.49c0.243-0.81,0.683-1.551,1.297-2.166
72+ c0.219-0.219,0.455-0.416,0.705-0.59l1.06,1.839c-0.712,0.56-1.171,1.431-1.171,2.407c0,0.975,0.459,1.845,1.171,2.407
73+ l-1.062,1.838C7.787,15.18,7.551,14.983,7.332,14.764z M14.563,17.302c-0.592,0.342-1.348,0.139-1.69-0.453
74+ c-0.341-0.592-0.139-1.348,0.454-1.689c0.592-0.342,1.349-0.14,1.69,0.452C15.359,16.202,15.156,16.96,14.563,17.302z
75+ M14.753,14.65c-0.518-0.264-1.154-0.27-1.694,0.043c-0.542,0.313-0.855,0.867-0.885,1.448c-0.385,0.089-0.782,0.137-1.186,0.137
76+ c-0.775,0-1.522-0.17-2.202-0.49l1.061-1.838c0.352,0.143,0.737,0.221,1.141,0.221c1.541,0,2.819-1.146,3.03-2.63h2.121
77+ C16.043,12.707,15.561,13.793,14.753,14.65z M14.019,10.674c-0.211-1.483-1.489-2.627-3.03-2.627c-0.403,0-0.788,0.078-1.14,0.22
78+ L8.787,6.427c0.68-0.32,1.428-0.489,2.202-0.489c0.403,0,0.801,0.047,1.184,0.137c0.031,0.58,0.345,1.135,0.885,1.446
79+ c0.542,0.312,1.177,0.308,1.695,0.044c0.807,0.856,1.291,1.943,1.388,3.109H14.019z"/>
80+ </g>
81+</g>
82+</svg>
83
84=== added file 'ubuntu-mono-light/categories/24/preferences-desktop-peripherals-directory.svg'
85--- ubuntu-mono-light/categories/24/preferences-desktop-peripherals-directory.svg 1970-01-01 00:00:00 +0000
86+++ ubuntu-mono-light/categories/24/preferences-desktop-peripherals-directory.svg 2012-02-06 13:04:19 +0000
87@@ -0,0 +1,11 @@
88+<?xml version="1.0" encoding="utf-8"?>
89+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
90+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
91+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
92+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
93+<path fill="#363636" d="M8.622,8.622L5.206,8.883L2.248,5.927C1.659,7.834,2.118,10,3.63,11.511c1.727,1.731,4.309,2.08,6.388,1.063
94+ l-0.009,0.007l4.917,6.55c1.159,1.159,3.042,1.159,4.203,0c1.161-1.16,1.159-3.041,0-4.204l-6.548-4.918l-0.01,0.011
95+ c1.018-2.079,0.666-4.66-1.062-6.389C9.999,2.119,7.835,1.659,5.927,2.248l2.958,2.96L8.622,8.622z M17.799,16.226
96+ c0.435,0.433,0.435,1.139,0,1.575c-0.436,0.434-1.143,0.434-1.574,0c-0.438-0.437-0.438-1.143,0-1.575
97+ C16.656,15.788,17.363,15.788,17.799,16.226z"/>
98+</svg>
99
100=== added file 'ubuntu-mono-light/categories/24/preferences-desktop-personal-directory.svg'
101--- ubuntu-mono-light/categories/24/preferences-desktop-personal-directory.svg 1970-01-01 00:00:00 +0000
102+++ ubuntu-mono-light/categories/24/preferences-desktop-personal-directory.svg 2012-02-06 13:04:19 +0000
103@@ -0,0 +1,20 @@
104+<?xml version="1.0" encoding="utf-8"?>
105+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
106+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
107+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
108+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
109+<g>
110+ <g>
111+ <path fill="#363636" d="M16.323,16.496c-1.8-0.896-2.621-2.444-2.621-3.179c0-0.49,0.326-1.248,0.642-1.616
112+ c0.309-0.361,0.766-0.54,0.983-0.941c0.352-0.655,0.541-1.963,0.43-2.538c-0.078-0.41-0.43-0.451-0.43-0.818
113+ c0-0.328,0.077-0.859,0.077-1.76c0-1.27-0.485-1.948-1.139-2.538C13.675,2.573,12.496,2,11.002,2
114+ c-0.316,0-0.659,0.029-0.942,0.083C9.412,2.205,8.974,2.511,8.752,2.75L8.743,2.745L8.692,2.811h0
115+ C8.691,2.813,8.687,2.816,8.685,2.819C8.409,2.86,7.964,2.924,7.584,3.228C7.072,3.637,6.601,4.374,6.601,5.644
116+ c0,0.9,0.078,1.432,0.078,1.76c0,0.368-0.354,0.409-0.432,0.818c-0.111,0.575,0.079,1.883,0.432,2.538
117+ c0.217,0.401,0.675,0.58,0.982,0.941c0.315,0.368,0.642,1.126,0.642,1.616c0,0.734-0.828,2.282-2.627,3.179
118+ C3.211,17.725,2,18.289,2,20h18C20,18.289,18.788,17.725,16.323,16.496z M9.008,2.219L8.831,2.071
119+ c-0.094,0.113-0.159,0.24-0.19,0.368c-0.12-0.042-0.256-0.062-0.412-0.062v0.231c0.185,0,0.332,0.033,0.45,0.1l0.064,0.037
120+ L8.85,2.608C8.85,2.479,8.906,2.341,9.008,2.219z"/>
121+ </g>
122+</g>
123+</svg>
124
125=== added file 'ubuntu-mono-light/categories/24/preferences-system-directory.svg'
126--- ubuntu-mono-light/categories/24/preferences-system-directory.svg 1970-01-01 00:00:00 +0000
127+++ ubuntu-mono-light/categories/24/preferences-system-directory.svg 2012-02-06 13:04:19 +0000
128@@ -0,0 +1,23 @@
129+<?xml version="1.0" encoding="utf-8"?>
130+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
131+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
132+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
133+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
134+<g>
135+ <g>
136+ <path fill="#363636" d="M11,2C6.03,2,2,6.029,2,11c0,4.97,4.03,9,9,9c4.97,0,9-4.03,9-9C20,6.029,15.971,2,11,2z M12.873,5.366
137+ c0.342-0.593,1.099-0.795,1.689-0.453c0.592,0.342,0.795,1.099,0.454,1.69c-0.341,0.593-1.099,0.795-1.69,0.453
138+ C12.733,6.714,12.531,5.958,12.873,5.366z M5.073,12.346c-0.684,0-1.239-0.554-1.239-1.237S4.389,9.87,5.073,9.87
139+ c0.683,0,1.237,0.555,1.237,1.238S5.756,12.346,5.073,12.346z M7.332,14.764c-0.614-0.614-1.054-1.355-1.297-2.165
140+ c0.489-0.315,0.812-0.865,0.812-1.49s-0.323-1.174-0.812-1.49c0.243-0.81,0.683-1.551,1.297-2.166
141+ c0.219-0.219,0.455-0.416,0.705-0.59l1.06,1.839c-0.712,0.56-1.171,1.431-1.171,2.407c0,0.975,0.459,1.845,1.171,2.407
142+ l-1.062,1.838C7.787,15.18,7.551,14.983,7.332,14.764z M14.563,17.302c-0.592,0.342-1.348,0.139-1.69-0.453
143+ c-0.341-0.592-0.139-1.348,0.454-1.689c0.592-0.342,1.349-0.14,1.69,0.452C15.359,16.202,15.156,16.96,14.563,17.302z
144+ M14.753,14.65c-0.518-0.264-1.154-0.27-1.694,0.043c-0.542,0.313-0.855,0.867-0.885,1.448c-0.385,0.089-0.782,0.137-1.186,0.137
145+ c-0.775,0-1.522-0.17-2.202-0.49l1.061-1.838c0.352,0.143,0.737,0.221,1.141,0.221c1.541,0,2.819-1.146,3.03-2.63h2.121
146+ C16.043,12.707,15.561,13.793,14.753,14.65z M14.019,10.674c-0.211-1.483-1.489-2.627-3.03-2.627c-0.403,0-0.788,0.078-1.14,0.22
147+ L8.787,6.427c0.68-0.32,1.428-0.489,2.202-0.489c0.403,0,0.801,0.047,1.184,0.137c0.031,0.58,0.345,1.135,0.885,1.446
148+ c0.542,0.312,1.177,0.308,1.695,0.044c0.807,0.856,1.291,1.943,1.388,3.109H14.019z"/>
149+ </g>
150+</g>
151+</svg>

Subscribers

People subscribed via source and target branches