Merge lp:~kiwinote/software-center/use_new_icons into lp:software-center

Proposed by Kiwinote on 2010-03-24
Status: Merged
Merged at revision: not available
Proposed branch: lp:~kiwinote/software-center/use_new_icons
Merge into: lp:software-center
Diff against target: 207 lines (+26/-24)
1 file modified
data/software-center.menu.in (+26/-24)
To merge this branch: bzr merge lp:~kiwinote/software-center/use_new_icons
Reviewer Review Type Date Requested Status
Michael Vogt 2010-03-24 Approve on 2010-03-25
Review via email: mp+22080@code.launchpad.net

Commit message

* data/software-center.menu.in:
  - Use new category icons from humanity-icon theme.

Description of the change

This makes s-c use the new icons available in the humanity-icon-theme of today. I am using the list of icons at http://paste.ubuntu.com/400652/. One of the icon names contains a spelling mistake (applications-eletronics), so I have made software-center use the correct spelling. This means that until https://bugs.launchpad.net/ubuntu/+source/humanity-icon-theme/+bug/546430 gets fixed, the electronics subcategory will not display an icon.

To post a comment you must log in.
Michael Vogt (mvo) wrote :

You rock! Many thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/software-center.menu.in'
2--- data/software-center.menu.in 2010-03-04 21:12:22 +0000
3+++ data/software-center.menu.in 2010-03-24 21:57:19 +0000
4@@ -86,7 +86,7 @@
5
6 <Menu>
7 <_Name>Java</_Name>
8- <SCIcon>applications-other</SCIcon>
9+ <SCIcon>applications-java</SCIcon>
10 <Include>
11 <Or>
12 <SCSection>java</SCSection>
13@@ -135,7 +135,7 @@
14
15 <Menu>
16 <_Name>Mono/CLI</_Name>
17- <SCIcon>applications-other</SCIcon>
18+ <SCIcon>applications-monodevelopment</SCIcon>
19 <Include>
20 <Or>
21 <SCSection>cli-mono</SCSection>
22@@ -182,7 +182,7 @@
23
24 <Menu>
25 <_Name>Python</_Name>
26- <SCIcon>applications-other</SCIcon>
27+ <SCIcon>applications-python</SCIcon>
28 <Include>
29 <Or>
30 <SCSection>python</SCSection>
31@@ -195,7 +195,7 @@
32
33 <Menu>
34 <_Name>Ruby</_Name>
35- <SCIcon>applications-other</SCIcon>
36+ <SCIcon>applications-ruby</SCIcon>
37 <Include>
38 <Or>
39 <SCSection>ruby</SCSection>
40@@ -257,7 +257,7 @@
41 </Menu>
42 <Menu>
43 <_Name>Biology</_Name>
44- <SCIcon>applications-other</SCIcon>
45+ <SCIcon>applications-biology</SCIcon>
46 <Include><Category>Biology</Category></Include>
47 </Menu>
48 <Menu>
49@@ -278,7 +278,7 @@
50 </Menu>
51 <Menu>
52 <_Name>Electronics</_Name>
53- <SCIcon>applications-other</SCIcon>
54+ <SCIcon>applications-electronics</SCIcon>
55 <Include><Category>Electronics</Category></Include>
56 </Menu>
57 <Menu>
58@@ -288,19 +288,19 @@
59 </Menu>
60 <Menu>
61 <_Name>Geography</_Name>
62- <SCIcon>applications-other</SCIcon>
63+ <SCIcon>applications-geography</SCIcon>
64 <Include><Category>Geography</Category></Include>
65 </Menu>
66 <Menu>
67 <_Name>Geology</_Name>
68- <SCIcon>applications-other</SCIcon>
69+ <SCIcon>applications-geology</SCIcon>
70 <Include>
71 <Or><Category>Geology</Category><Category>Geoscience</Category></Or>
72 </Include>
73 </Menu>
74 <Menu>
75 <_Name>Mathematics</_Name>
76- <SCIcon>applications-other</SCIcon>
77+ <SCIcon>applications-mathematics</SCIcon>
78 <Include>
79 <Or>
80 <Category>DataVisualization</Category>
81@@ -319,7 +319,7 @@
82 </Menu>
83 <Menu>
84 <_Name>Physics</_Name>
85- <SCIcon>applications-other</SCIcon>
86+ <SCIcon>applications-physics</SCIcon>
87 <Include><Category>Physics</Category></Include>
88 </Menu>
89 </Menu> <!-- End Science & Engineering -->
90@@ -327,7 +327,7 @@
91 <!-- Fonts -->
92 <Menu>
93 <_Name>Fonts</_Name>
94- <SCIcon>font-x-generic</SCIcon>
95+ <SCIcon>applications-fonts</SCIcon>
96 <Include>
97 <Or>
98 <SCPkgnameWildcard>ttf*</SCPkgnameWildcard>
99@@ -355,28 +355,28 @@
100 </Menu>
101 <Menu>
102 <_Name>Board Games</_Name>
103- <SCIcon>gnome-glchess</SCIcon>
104+ <SCIcon>applications-boardgames</SCIcon>
105 <Include>
106 <Category>BoardGame</Category>
107 </Include>
108 </Menu>
109 <Menu>
110 <_Name>Card Games</_Name>
111- <SCIcon>gnome-aisleriot</SCIcon>
112+ <SCIcon>applications-cardgames</SCIcon>
113 <Include>
114 <Category>CardGame</Category>
115 </Include>
116 </Menu>
117 <Menu>
118 <_Name>Puzzles</_Name>
119- <SCIcon>system-run</SCIcon>
120+ <SCIcon>applications-puzzles</SCIcon>
121 <Include>
122 <Category>LogicGame</Category>
123 </Include>
124 </Menu>
125 <Menu>
126 <_Name>Role Playing</_Name>
127- <SCIcon>stock_person</SCIcon>
128+ <SCIcon>applications-roleplaying</SCIcon>
129 <Include>
130 <Category>RolePlaying</Category>
131 </Include>
132@@ -384,6 +384,7 @@
133 <Menu>
134 <_Name>Simulation</_Name>
135 <Directory>SimulationGames.directory</Directory>
136+ <SCIcon>applications-simulation</SCIcon>
137 <Include>
138 <Category>Simulation</Category>
139 </Include>
140@@ -391,6 +392,7 @@
141 <Menu>
142 <_Name>Sports</_Name>
143 <Directory>SportsGames.directory</Directory>
144+ <SCIcon>applications-sports</SCIcon>
145 <Include>
146 <Category>SportsGame</Category>
147 </Include>
148@@ -409,27 +411,27 @@
149 </Include>
150 <Menu>
151 <_Name>3D</_Name>
152- <SCIcon>applications-other</SCIcon>
153+ <SCIcon>applications-3D</SCIcon>
154 <Include><And><Category>3DGraphics</Category></And></Include>
155 </Menu>
156 <Menu>
157 <_Name>Drawing</_Name>
158- <SCIcon>applications-other</SCIcon>
159+ <SCIcon>applications-drawing</SCIcon>
160 <Include><And><Category>VectorGraphics</Category></And></Include>
161 </Menu>
162 <Menu>
163 <_Name>Painting &amp; Editing</_Name>
164- <SCIcon>applications-other</SCIcon>
165+ <SCIcon>applications-painting</SCIcon>
166 <Include><And><Category>RasterGraphics</Category></And></Include>
167 </Menu>
168 <Menu>
169 <_Name>Photography</_Name>
170- <SCIcon>camera-photo</SCIcon>
171+ <SCIcon>applications-photography</SCIcon>
172 <Include><And><Category>Photography</Category></And></Include>
173 </Menu>
174 <Menu>
175 <_Name>Publishing</_Name>
176- <SCIcon>applications-other</SCIcon>
177+ <SCIcon>applications-publishing</SCIcon>
178 <Include><And><Category>Publishing</Category></And></Include>
179 </Menu>
180 <Menu>
181@@ -460,22 +462,22 @@
182 </Include>
183 <Menu>
184 <_Name>Chat</_Name>
185- <SCIcon>applications-other</SCIcon>
186+ <SCIcon>applications-chat</SCIcon>
187 <Include><And><Category>InstantMessaging</Category></And></Include>
188 </Menu>
189 <Menu>
190 <_Name>File Sharing</_Name>
191- <SCIcon>applications-other</SCIcon>
192+ <SCIcon>applications-filesharing</SCIcon>
193 <Include><And><Category>FileTransfer</Category></And></Include>
194 </Menu>
195 <Menu>
196 <_Name>Mail</_Name>
197- <SCIcon>applications-other</SCIcon>
198+ <SCIcon>applications-mail</SCIcon>
199 <Include><And><Category>Email</Category></And></Include>
200 </Menu>
201 <Menu>
202 <_Name>Web Browsers</_Name>
203- <SCIcon>applications-other</SCIcon>
204+ <SCIcon>applications-webbrowsers</SCIcon>
205 <Include><And><Category>WebBrowser</Category></And></Include>
206 </Menu>
207 </Menu> <!-- End Internet -->

Subscribers

People subscribed via source and target branches