[kupfer] Consistently use the icon 'system-search' for Kupfer.



commit 33bc6ffcd64b468adcd966202d89dff729b142a0
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Tue Mar 2 18:11:55 2010 +0100

    Consistently use the icon 'system-search' for Kupfer.
    
    We did not use the same icon everywhere for Kupfer, sometimes using a
    different stock icon. Now we use 'system-search', from the icon naming
    specification, consistently.
    
    This was mentioned in
    https://bugs.launchpad.net/kupfer/+bug/525711

 auxdata/kupfer.desktop.in |    2 +-
 data/preferences.ui       |    2 +-
 kupfer/ui/browser.py      |   12 +++++++-----
 kupfer/version.py         |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/auxdata/kupfer.desktop.in b/auxdata/kupfer.desktop.in
index f821552..a2e1abd 100644
--- a/auxdata/kupfer.desktop.in
+++ b/auxdata/kupfer.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
 _Name=Kupfer
 _GenericName=Application Launcher
 _Comment=Convenient command and access tool for applications and documents
-Icon=search
+Icon=system-search
 Exec=kupfer %F
 Type=Application
 Categories=Utility;
diff --git a/data/preferences.ui b/data/preferences.ui
index e5ac0c0..c623ab4 100644
--- a/data/preferences.ui
+++ b/data/preferences.ui
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">Kupfer Preferences</property>
     <property name="role">Preferences</property>
     <property name="window_position">center</property>
-    <property name="icon_name">gtk-find</property>
+    <property name="icon_name">system-search</property>
     <signal name="key_press_event" handler="on_preferenceswindow_key_press_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
diff --git a/kupfer/ui/browser.py b/kupfer/ui/browser.py
index 736bf60..d48df9e 100644
--- a/kupfer/ui/browser.py
+++ b/kupfer/ui/browser.py
@@ -1391,7 +1391,6 @@ class WindowController (pretty.OutputMixin):
 	def __init__(self):
 		"""
 		"""
-		self.icon_name = gtk.STOCK_FIND
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 
 		data_controller = data.DataController()
@@ -1418,9 +1417,10 @@ class WindowController (pretty.OutputMixin):
 
 	def _setup_status_icon(self):
 		from kupfer import kupferui
+		from kupfer import version
 
-		status = gtk.status_icon_new_from_stock(self.icon_name)
-		status.set_tooltip(_("Kupfer"))
+		status = gtk.status_icon_new_from_icon_name(version.ICON_NAME)
+		status.set_tooltip(version.PROGRAM_NAME)
 		menu = gtk.Menu()
 
 		def menu_callback(menuitem, callback):
@@ -1447,13 +1447,15 @@ class WindowController (pretty.OutputMixin):
 		"""
 		Returns window
 		"""
+		from kupfer import version
+
 		self.window.connect("delete-event", self._close_window)
 		widget = self.interface.get_widget()
 		widget.show()
 		
 		self.window.add(widget)
-		self.window.set_title(_("Kupfer"))
-		self.window.set_icon_name(self.icon_name)
+		self.window.set_title(version.PROGRAM_NAME)
+		self.window.set_icon_name(version.ICON_NAME)
 		self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_UTILITY)
 		self.window.set_property("skip-taskbar-hint", True)
 		self.window.set_keep_above(True)
diff --git a/kupfer/version.py b/kupfer/version.py
index 4c56e64..fd1b8c2 100644
--- a/kupfer/version.py
+++ b/kupfer/version.py
@@ -11,7 +11,7 @@ else:
 	VERSION = version_subst.VERSION
 	PACKAGE_NAME = version_subst.PACKAGE_NAME
 
-ICON_NAME = "search"
+ICON_NAME = "system-search"
 PROGRAM_NAME = _("Kupfer")
 
 AUTHORS = u"""Ulrik Sverdrup <ulrik sverdrup gmail com>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]