Ubuntu Software Center

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

  1. use_new_icons
  2. Merge into trunk
Proposed by Kiwinote
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 Approve
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.
Revision history for this message
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
=== modified file 'data/software-center.menu.in'
--- data/software-center.menu.in 2010-03-04 21:12:22 +0000
+++ data/software-center.menu.in 2010-03-24 21:57:19 +0000
@@ -86,7 +86,7 @@
8686
87 <Menu>87 <Menu>
88 <_Name>Java</_Name>88 <_Name>Java</_Name>
89 <SCIcon>applications-other</SCIcon>89 <SCIcon>applications-java</SCIcon>
90 <Include>90 <Include>
91 <Or>91 <Or>
92 <SCSection>java</SCSection>92 <SCSection>java</SCSection>
@@ -135,7 +135,7 @@
135135
136 <Menu>136 <Menu>
137 <_Name>Mono/CLI</_Name>137 <_Name>Mono/CLI</_Name>
138 <SCIcon>applications-other</SCIcon>138 <SCIcon>applications-monodevelopment</SCIcon>
139 <Include>139 <Include>
140 <Or>140 <Or>
141 <SCSection>cli-mono</SCSection>141 <SCSection>cli-mono</SCSection>
@@ -182,7 +182,7 @@
182182
183 <Menu>183 <Menu>
184 <_Name>Python</_Name>184 <_Name>Python</_Name>
185 <SCIcon>applications-other</SCIcon>185 <SCIcon>applications-python</SCIcon>
186 <Include>186 <Include>
187 <Or>187 <Or>
188 <SCSection>python</SCSection>188 <SCSection>python</SCSection>
@@ -195,7 +195,7 @@
195195
196 <Menu>196 <Menu>
197 <_Name>Ruby</_Name>197 <_Name>Ruby</_Name>
198 <SCIcon>applications-other</SCIcon>198 <SCIcon>applications-ruby</SCIcon>
199 <Include>199 <Include>
200 <Or>200 <Or>
201 <SCSection>ruby</SCSection>201 <SCSection>ruby</SCSection>
@@ -257,7 +257,7 @@
257 </Menu>257 </Menu>
258 <Menu>258 <Menu>
259 <_Name>Biology</_Name>259 <_Name>Biology</_Name>
260 <SCIcon>applications-other</SCIcon>260 <SCIcon>applications-biology</SCIcon>
261 <Include><Category>Biology</Category></Include>261 <Include><Category>Biology</Category></Include>
262 </Menu>262 </Menu>
263 <Menu>263 <Menu>
@@ -278,7 +278,7 @@
278 </Menu>278 </Menu>
279 <Menu>279 <Menu>
280 <_Name>Electronics</_Name>280 <_Name>Electronics</_Name>
281 <SCIcon>applications-other</SCIcon>281 <SCIcon>applications-electronics</SCIcon>
282 <Include><Category>Electronics</Category></Include>282 <Include><Category>Electronics</Category></Include>
283 </Menu>283 </Menu>
284 <Menu>284 <Menu>
@@ -288,19 +288,19 @@
288 </Menu>288 </Menu>
289 <Menu>289 <Menu>
290 <_Name>Geography</_Name>290 <_Name>Geography</_Name>
291 <SCIcon>applications-other</SCIcon>291 <SCIcon>applications-geography</SCIcon>
292 <Include><Category>Geography</Category></Include>292 <Include><Category>Geography</Category></Include>
293 </Menu>293 </Menu>
294 <Menu>294 <Menu>
295 <_Name>Geology</_Name>295 <_Name>Geology</_Name>
296 <SCIcon>applications-other</SCIcon>296 <SCIcon>applications-geology</SCIcon>
297 <Include>297 <Include>
298 <Or><Category>Geology</Category><Category>Geoscience</Category></Or>298 <Or><Category>Geology</Category><Category>Geoscience</Category></Or>
299 </Include>299 </Include>
300 </Menu>300 </Menu>
301 <Menu>301 <Menu>
302 <_Name>Mathematics</_Name>302 <_Name>Mathematics</_Name>
303 <SCIcon>applications-other</SCIcon>303 <SCIcon>applications-mathematics</SCIcon>
304 <Include>304 <Include>
305 <Or>305 <Or>
306 <Category>DataVisualization</Category>306 <Category>DataVisualization</Category>
@@ -319,7 +319,7 @@
319 </Menu>319 </Menu>
320 <Menu>320 <Menu>
321 <_Name>Physics</_Name>321 <_Name>Physics</_Name>
322 <SCIcon>applications-other</SCIcon>322 <SCIcon>applications-physics</SCIcon>
323 <Include><Category>Physics</Category></Include>323 <Include><Category>Physics</Category></Include>
324 </Menu>324 </Menu>
325 </Menu> <!-- End Science & Engineering -->325 </Menu> <!-- End Science & Engineering -->
@@ -327,7 +327,7 @@
327 <!-- Fonts -->327 <!-- Fonts -->
328 <Menu>328 <Menu>
329 <_Name>Fonts</_Name>329 <_Name>Fonts</_Name>
330 <SCIcon>font-x-generic</SCIcon>330 <SCIcon>applications-fonts</SCIcon>
331 <Include>331 <Include>
332 <Or>332 <Or>
333 <SCPkgnameWildcard>ttf*</SCPkgnameWildcard>333 <SCPkgnameWildcard>ttf*</SCPkgnameWildcard>
@@ -355,28 +355,28 @@
355 </Menu>355 </Menu>
356 <Menu>356 <Menu>
357 <_Name>Board Games</_Name>357 <_Name>Board Games</_Name>
358 <SCIcon>gnome-glchess</SCIcon>358 <SCIcon>applications-boardgames</SCIcon>
359 <Include>359 <Include>
360 <Category>BoardGame</Category>360 <Category>BoardGame</Category>
361 </Include>361 </Include>
362 </Menu>362 </Menu>
363 <Menu>363 <Menu>
364 <_Name>Card Games</_Name>364 <_Name>Card Games</_Name>
365 <SCIcon>gnome-aisleriot</SCIcon>365 <SCIcon>applications-cardgames</SCIcon>
366 <Include>366 <Include>
367 <Category>CardGame</Category>367 <Category>CardGame</Category>
368 </Include>368 </Include>
369 </Menu>369 </Menu>
370 <Menu>370 <Menu>
371 <_Name>Puzzles</_Name>371 <_Name>Puzzles</_Name>
372 <SCIcon>system-run</SCIcon>372 <SCIcon>applications-puzzles</SCIcon>
373 <Include>373 <Include>
374 <Category>LogicGame</Category>374 <Category>LogicGame</Category>
375 </Include>375 </Include>
376 </Menu>376 </Menu>
377 <Menu>377 <Menu>
378 <_Name>Role Playing</_Name>378 <_Name>Role Playing</_Name>
379 <SCIcon>stock_person</SCIcon>379 <SCIcon>applications-roleplaying</SCIcon>
380 <Include>380 <Include>
381 <Category>RolePlaying</Category>381 <Category>RolePlaying</Category>
382 </Include>382 </Include>
@@ -384,6 +384,7 @@
384 <Menu>384 <Menu>
385 <_Name>Simulation</_Name>385 <_Name>Simulation</_Name>
386 <Directory>SimulationGames.directory</Directory>386 <Directory>SimulationGames.directory</Directory>
387 <SCIcon>applications-simulation</SCIcon>
387 <Include>388 <Include>
388 <Category>Simulation</Category>389 <Category>Simulation</Category>
389 </Include>390 </Include>
@@ -391,6 +392,7 @@
391 <Menu>392 <Menu>
392 <_Name>Sports</_Name>393 <_Name>Sports</_Name>
393 <Directory>SportsGames.directory</Directory>394 <Directory>SportsGames.directory</Directory>
395 <SCIcon>applications-sports</SCIcon>
394 <Include>396 <Include>
395 <Category>SportsGame</Category>397 <Category>SportsGame</Category>
396 </Include>398 </Include>
@@ -409,27 +411,27 @@
409 </Include>411 </Include>
410 <Menu>412 <Menu>
411 <_Name>3D</_Name>413 <_Name>3D</_Name>
412 <SCIcon>applications-other</SCIcon>414 <SCIcon>applications-3D</SCIcon>
413 <Include><And><Category>3DGraphics</Category></And></Include>415 <Include><And><Category>3DGraphics</Category></And></Include>
414 </Menu>416 </Menu>
415 <Menu>417 <Menu>
416 <_Name>Drawing</_Name>418 <_Name>Drawing</_Name>
417 <SCIcon>applications-other</SCIcon>419 <SCIcon>applications-drawing</SCIcon>
418 <Include><And><Category>VectorGraphics</Category></And></Include>420 <Include><And><Category>VectorGraphics</Category></And></Include>
419 </Menu>421 </Menu>
420 <Menu>422 <Menu>
421 <_Name>Painting &amp; Editing</_Name>423 <_Name>Painting &amp; Editing</_Name>
422 <SCIcon>applications-other</SCIcon>424 <SCIcon>applications-painting</SCIcon>
423 <Include><And><Category>RasterGraphics</Category></And></Include>425 <Include><And><Category>RasterGraphics</Category></And></Include>
424 </Menu>426 </Menu>
425 <Menu>427 <Menu>
426 <_Name>Photography</_Name>428 <_Name>Photography</_Name>
427 <SCIcon>camera-photo</SCIcon>429 <SCIcon>applications-photography</SCIcon>
428 <Include><And><Category>Photography</Category></And></Include>430 <Include><And><Category>Photography</Category></And></Include>
429 </Menu>431 </Menu>
430 <Menu>432 <Menu>
431 <_Name>Publishing</_Name>433 <_Name>Publishing</_Name>
432 <SCIcon>applications-other</SCIcon>434 <SCIcon>applications-publishing</SCIcon>
433 <Include><And><Category>Publishing</Category></And></Include>435 <Include><And><Category>Publishing</Category></And></Include>
434 </Menu>436 </Menu>
435 <Menu>437 <Menu>
@@ -460,22 +462,22 @@
460 </Include>462 </Include>
461 <Menu>463 <Menu>
462 <_Name>Chat</_Name>464 <_Name>Chat</_Name>
463 <SCIcon>applications-other</SCIcon>465 <SCIcon>applications-chat</SCIcon>
464 <Include><And><Category>InstantMessaging</Category></And></Include>466 <Include><And><Category>InstantMessaging</Category></And></Include>
465 </Menu>467 </Menu>
466 <Menu>468 <Menu>
467 <_Name>File Sharing</_Name>469 <_Name>File Sharing</_Name>
468 <SCIcon>applications-other</SCIcon>470 <SCIcon>applications-filesharing</SCIcon>
469 <Include><And><Category>FileTransfer</Category></And></Include>471 <Include><And><Category>FileTransfer</Category></And></Include>
470 </Menu>472 </Menu>
471 <Menu>473 <Menu>
472 <_Name>Mail</_Name>474 <_Name>Mail</_Name>
473 <SCIcon>applications-other</SCIcon>475 <SCIcon>applications-mail</SCIcon>
474 <Include><And><Category>Email</Category></And></Include>476 <Include><And><Category>Email</Category></And></Include>
475 </Menu>477 </Menu>
476 <Menu>478 <Menu>
477 <_Name>Web Browsers</_Name>479 <_Name>Web Browsers</_Name>
478 <SCIcon>applications-other</SCIcon>480 <SCIcon>applications-webbrowsers</SCIcon>
479 <Include><And><Category>WebBrowser</Category></And></Include>481 <Include><And><Category>WebBrowser</Category></And></Include>
480 </Menu>482 </Menu>
481 </Menu> <!-- End Internet -->483 </Menu> <!-- End Internet -->

Subscribers

People subscribed via source and target branches