Rev 418: Add utility function for finding icon paths. in file:///data/jelmer/bzr-gtk/signatures/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/signatures/

------------------------------------------------------------
revno: 418
revision-id: jelmer at samba.org-20080330155852-0btngt3srvde5pj9
parent: jelmer at samba.org-20080330155115-qmf874szoqvyq9cl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: signatures
timestamp: Sun 2008-03-30 17:58:52 +0200
message:
  Add utility function for finding icon paths.
renamed:
  bzr-icon-64.png => icons/bzr-icon-64.png bzricon64.png-20070203114947-qf8qxinhjohe3yrt-1
modified:
  __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
  about.py                       about.py-20070715145104-2ihlkw9xgrwj7i3d-1
  revisionview.py                logview.py-20051024072750-4d5c28cb73611027
  setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
=== modified file '__init__.py'
--- a/__init__.py	2008-03-27 16:27:29 +0000
+++ b/__init__.py	2008-03-30 15:58:52 +0000
@@ -109,6 +109,17 @@
     return os.path.dirname(__file__)
 
 
+def icon_path(*args):
+    basedirs = [os.path.join(data_path()),
+             "/usr/share/bzr-gtk", 
+             "/usr/local/share/bzr-gtk"]
+    for basedir in basedirs:
+        path = os.path.join(basedir, 'icons', *args)
+        if os.path.exists(path):
+            return path
+    return None
+
+
 class GTKCommand(Command):
     """Abstract class providing GTK specific run commands."""
 
@@ -516,7 +527,7 @@
         from notify import NotifyPopupMenu
         gtk = self.open_display()
         menu = NotifyPopupMenu()
-        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
+        icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
         icon.connect('popup-menu', menu.display)
 
         import cgi

=== modified file 'about.py'
--- a/about.py	2008-01-27 01:13:38 +0000
+++ b/about.py	2008-03-30 15:58:52 +0000
@@ -23,7 +23,7 @@
 import bzrlib
 import gtk
 import os
-from bzrlib.plugins.gtk import data_path
+from bzrlib.plugins.gtk import icon_path
 
 class AboutDialog(gtk.AboutDialog):
     def __init__(self):
@@ -32,6 +32,6 @@
         self.set_version(bzrlib.plugins.gtk.version_string)
         self.set_website("http://bazaar-vcs.org/BzrGtk")
         self.set_license("GNU GPL v2")
-        self.set_icon(gtk.gdk.pixbuf_new_from_file(os.path.join(data_path(), "bzr-icon-64.png")))
+        self.set_icon(gtk.gdk.pixbuf_new_from_file(icon_path("bzr-icon-64.png")))
         self.connect ("response", lambda d, r: d.destroy())
 

=== renamed file 'bzr-icon-64.png' => 'icons/bzr-icon-64.png'
=== modified file 'revisionview.py'
--- a/revisionview.py	2008-03-30 15:47:08 +0000
+++ b/revisionview.py	2008-03-30 15:58:52 +0000
@@ -22,6 +22,7 @@
 import gobject
 import subprocess
 
+from bzrlib.plugins.gtk import icon_path
 from bzrlib.osutils import format_date
 from bzrlib.util.bencode import bdecode
 
@@ -91,7 +92,7 @@
 
     def show_no_signature(self):
         self.signature_key_id.set_text("")
-        self.signature_image.set_from_file("icons/sign-unknown.png")
+        self.signature_image.set_from_file(icon_path("sign-unknown.png"))
         self.signature_label.set_text("This revision has not been signed.")
 
     def show_signature(self, text):
@@ -101,10 +102,10 @@
             self.signature_key_id.set_text(signature.key_id)
 
         if signature.is_valid():
-            self.signature_image.set_from_file("icons/sign-ok.png")
+            self.signature_image.set_from_file(icon_path("sign-ok.png"))
             self.signature_label.set_text("This revision has been signed.")
         else:
-            self.signature_image.set_from_file("icons/sign-bad.png")
+            self.signature_image.set_from_file(icon_path("sign-bad.png"))
             self.signature_label.set_text("This revision has been signed, " + 
                     "but the authenticity of the signature cannot be verified.")
 

=== modified file 'setup.py'
--- a/setup.py	2008-03-15 21:10:05 +0000
+++ b/setup.py	2008-03-30 15:58:52 +0000
@@ -130,13 +130,14 @@
                                  'icons/refresh.png',
                                  'icons/oliveicon2.png']),
                 ('share/bzr-gtk/icons', ['icons/sign-bad.png',
-                                 'icons/sign-ok',
-                                 'icons/sign',
-                                 'icons/sign-unknown']),
+                                 'icons/sign-ok.png',
+                                 'icons/sign.png',
+                                 'icons/sign-unknown.png',
+                                 'icons/bzr-icon-64.png']),
                 ('share/applications', ['olive-gtk.desktop',
                                         'bazaar-properties.desktop',
                                         'bzr-notify.desktop']),
-                ('share/pixmaps', ['icons/olive-gtk.png']),
+                ('share/pixmaps', ['icons/olive-gtk.png', 'icons/bzr-icon-64.png']),
                 ('share/icons/hicolor/scalable/emblems', 
                     ['icons/emblem-bzr-added.svg', 
                         'icons/emblem-bzr-conflict.svg',