Merge lp:~pshchelo/olive/bugfix_lp632336 into lp:olive

[Pavlo Shchelokovskyy]

added olive-specific icons and functions for handling them

[lp:~pshchelo/olive/bugfix_lp632336]

696. By Pavlo Shchelokovskyy on 2011-02-07

removed one forgotten debug line

[Jelmer Vernooij (jelmer)]

Thanks! Please merge.

review: Approve (code)

=== modified file 'olive/__init__.py'
--- olive/__init__.py	2010-06-17 20:27:53 +0000
+++ olive/__init__.py	2011-02-07 09:51:34 +0000
@@ -58,7 +58,8 @@
 
 def about():
     """ Display the AboutDialog. """
-    from bzrlib.plugins.gtk import __version__, icon_path
+    from bzrlib.plugins.gtk import __version__
+    from guifiles import olive_icon_path
     
     dialog = gtk.AboutDialog()
     dialog.set_name("Olive")
@@ -66,8 +67,8 @@
     dialog.set_copyright("Copyright (C) 2006-2008 Szilveszter Farkas (Phanatic)")
     dialog.set_website("https://launchpad.net/bzr-gtk")
     dialog.set_website_label("https://launchpad.net/bzr-gtk")
-    dialog.set_icon_from_file(icon_path("oliveicon2.png"))
-    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")))
+    dialog.set_icon_from_file(olive_icon_path("oliveicon2.png"))
+    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(olive_icon_path("oliveicon2.png")))
     dialog.set_authors([ _i18n("Lead Developer:"),
 			 "Szilveszter Farkas <[e-mail]>",
 			 _i18n("Contributors:"),

=== modified file 'olive/guifiles.py'
--- olive/guifiles.py	2010-05-25 17:10:52 +0000
+++ olive/guifiles.py	2011-02-07 09:51:34 +0000
@@ -12,36 +12,42 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-"""cmenu.ui path"""
+"""cmenu.ui and icons path"""
 
 import os
 import sys
 
 from bzrlib.plugins.gtk import _i18n
 
-UIFILENAMES = ["/usr/share/olive/cmenu.ui",
-                  "/usr/local/share/olive/cmenu.ui",
-                  "/opt/share/olive/cmenu.ui",
-                  "/opt/local/share/olive/cmenu.ui",
-                  "~/share/olive/cmenu.ui",
-                 ]
+def olive_data_basedirs():
+    _dir=os.path.dirname(__file__)
+    return [_dir,
+            os.path.dirname(_dir),
+            os.path.expanduser("~/share/olive"),
+            "/usr/share/olive",
+            "/usr/local/share/olive",
+            "/opt/share/olive",
+            "/opt/local/share/olive",
+            ]
+
+def olive_data_path(*args):
+    for basedir in olive_data_basedirs():
+        path = os.path.join(basedir, *args)
+        if os.path.exists(path):
+            return path
+    return None
+
+def olive_icon_path(*args):
+    return olive_data_path(os.path.join('icons', *args))
 
 # Get the glade file name
+UIFILENAME = olive_data_path('cmenu.ui')
+
 if sys.platform == 'win32':
-    UIFILENAMES = [os.path.join(os.path.dirname(sys.executable),
-                                   "share/olive/cmenu.ui")]
-
-dir_ = os.path.split(os.path.dirname(__file__))[0]
-# Check first if we are running from source
-UIFILENAMES.insert(0, os.path.join(dir_, "cmenu.ui"))
-
-UIFILENAME = None
-
-for path in UIFILENAMES:
-    path = os.path.expanduser(path)
-    if os.path.isfile(path):
-        UIFILENAME = path
-        break
+    UIFILENAME = os.path.join(os.path.dirname(sys.executable),
+                                   "share/olive/cmenu.ui")
+    if not os.path.exists(path):
+        UIFILENAME=None
 
 if UIFILENAME is None:
     # Fail

=== added directory 'olive/icons'
=== added file 'olive/icons/olive-gtk.png'
Binary files olive/icons/olive-gtk.png	1970-01-01 00:00:00 +0000 and olive/icons/olive-gtk.png	2011-02-07 09:51:34 +0000 differ
=== added file 'olive/icons/oliveicon2.png'
Binary files olive/icons/oliveicon2.png	1970-01-01 00:00:00 +0000 and olive/icons/oliveicon2.png	2011-02-07 09:51:34 +0000 differ
=== modified file 'olive/info.py'
--- olive/info.py	2010-05-25 17:10:52 +0000
+++ olive/info.py	2011-02-07 09:51:34 +0000
@@ -29,6 +29,7 @@
 from bzrlib.plugins.gtk import _i18n, icon_path
 from bzrlib.plugins.gtk.dialog import error_dialog
 
+from guifiles import olive_icon_path
 
 def info(location):
     """ Get info about branch, working tree, and repository
@@ -160,8 +161,8 @@
                                   parent = None,
                                   flags=0,
                                   buttons=None)
-        self.window.set_icon_list(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")),
-                                  gtk.gdk.pixbuf_new_from_file(icon_path("olive-gtk.png")))
+        self.window.set_icon_list(gtk.gdk.pixbuf_new_from_file(olive_icon_path("oliveicon2.png")),
+                                  gtk.gdk.pixbuf_new_from_file(olive_icon_path("olive-gtk.png")))
         self.window.vbox.set_spacing(3)
         self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
         

=== modified file 'olive/window.py'
--- olive/window.py	2010-05-25 17:10:52 +0000
+++ olive/window.py	2011-02-07 09:51:34 +0000
@@ -23,6 +23,7 @@
 
 from bzrlib.plugins.gtk import _i18n, icon_path
 
+from guifiles import olive_icon_path
 
 class OliveGui(gtk.Window):
     """ Olive main window """
@@ -34,8 +35,8 @@
         # Initialise window
         gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
         self.set_title(_i18n("Olive - Bazaar GUI"))
-        self.set_icon_list(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")),
-                           gtk.gdk.pixbuf_new_from_file(icon_path("olive-gtk.png")),
+        self.set_icon_list(gtk.gdk.pixbuf_new_from_file(olive_icon_path("oliveicon2.png")),
+                           gtk.gdk.pixbuf_new_from_file(olive_icon_path("olive-gtk.png")),
                            # Who has the svg version of the icon? Would be nice to include
                            #gtk.gdk.pixbuf_new_from_file(icon_path("olive.svg"))
                            )

=== modified file 'setup.py'
--- setup.py	2010-05-25 17:09:02 +0000
+++ setup.py	2011-02-07 09:51:34 +0000
@@ -67,7 +67,9 @@
         ],
         data_files=[('share/olive', ['cmenu.ui',]),
                     ('share/applications', ['olive-gtk.desktop', ]),
-                    ('share/pixmaps', ['icons/olive-gtk.png']),
+                    ('share/olive/icons', ['olive/icons/olive-gtk.png', 
+                                            'olive/icons/oliveicon2.png']),
+                    ('share/pixmaps', ['olive/icons/olive-gtk.png',]),
                     ],
         cmdclass={'install_data': InstallData}
         )