Tribunal

Merge lp:~jelmer/tribunal/icon into lp:tribunal

  1. icon
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Pool
Approved revision: 169
Merged at revision: 170
Proposed branch: lp:~jelmer/tribunal/icon
Merge into: lp:tribunal
Diff against target: 34 lines (+3/-3)
2 files modified
setup.py (+2/-2)
tribunal-subunit.desktop (+1/-1)
To merge this branch: bzr merge lp:~jelmer/tribunal/icon
Reviewer Review Type Date Requested Status
Martin Pool Approve
The Tribunal code Pending
Review via email: mp+42285@code.launchpad.net

Commit message

Install application icon using tribunal-gavel.

Description of the change

This makes us use xdg-icon-resource to install the application icon; this makes it possible to e.g. install in the users home directory.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2010-09-26 21:38:52 +0000
3+++ setup.py 2010-11-30 18:41:52 +0000
4@@ -12,7 +12,8 @@
5 subprocess.check_call(['xdg-mime', 'install', 'tribunal-subunit.xml'])
6 subprocess.check_call(['xdg-desktop-menu', 'install',
7 'tribunal-subunit.desktop'])
8-
9+ subprocess.check_call(['xdg-icon-resource', 'install', '--size', '64',
10+ 'tribunal/gavel_64x64.png', 'tribunal-gavel'])
11
12
13 setup(name='tribunal',
14@@ -26,7 +27,6 @@
15 ['gavel_64x64.png', 'ui.glade']},
16 data_files=[
17 ('share/application-registry', ['tribunal.applications']),
18- ('share/pixmaps', ['tribunal/gavel_64x64.png']),
19 ],
20 scripts=['tribunal-subunit'],
21 classifiers=[
22
23=== modified file 'tribunal-subunit.desktop'
24--- tribunal-subunit.desktop 2010-09-26 21:26:20 +0000
25+++ tribunal-subunit.desktop 2010-11-30 18:41:52 +0000
26@@ -1,7 +1,7 @@
27 [Desktop Entry]
28 Name=Tribunal
29 Comment=View Subunit File
30-Icon=gavel_64x64
31+Icon=tribunal-gavel
32 Exec=tribunal-subunit %f
33 Terminal=false
34 Type=Application

Subscribers

People subscribed via source and target branches

to all changes: