Author: damoxc
Revision: 5592
Log:
use the icon theme's icon where available
Diff:
Modified: trunk/deluge/ui/gtkui/connectionmanager.py
===================================================================
--- trunk/deluge/ui/gtkui/connectionmanager.py 2009-07-30 23:38:14 UTC (rev
5591)
+++ trunk/deluge/ui/gtkui/connectionmanager.py 2009-07-30 23:41:27 UTC (rev
5592)
@@ -122,7 +122,16 @@
# Setup the ConnectionManager dialog
self.connection_manager = self.glade.get_widget("connection_manager")
self.connection_manager.set_transient_for(self.window.window)
- self.connection_manager.set_icon(common.get_logo(32))
+
+ if deluge.common.windows_check():
+ self.connection_manager.set_icon(common.get_logo(32))
+ else:
+ try:
+ icon_theme = gtk.icon_theme_get_default()
+
self.connection_manager.set_icon(icon_theme.load_icon("deluge", 32, 0))
+ except:
+ self.connection_manager.set_icon(common.get_logo(32))
+
self.glade.get_widget("image1").set_from_pixbuf(common.get_logo(32))
self.hostlist = self.glade.get_widget("hostlist")
Modified: trunk/deluge/ui/gtkui/edittrackersdialog.py
===================================================================
--- trunk/deluge/ui/gtkui/edittrackersdialog.py 2009-07-30 23:38:14 UTC (rev
5591)
+++ trunk/deluge/ui/gtkui/edittrackersdialog.py 2009-07-30 23:41:27 UTC (rev
5592)
@@ -57,7 +57,14 @@
self.edit_tracker_entry = self.glade.get_widget("edit_tracker_entry")
self.edit_tracker_entry.set_transient_for(self.dialog)
- self.dialog.set_icon(common.get_logo(32))
+ if deluge.common.windows_check():
+ self.dialog.set_icon(common.get_logo(32))
+ else:
+ try:
+ icon_theme = gtk.icon_theme_get_default()
+ self.dialog.set_icon(icon_theme.load_icon("deluge", 32, 0))
+ except:
+ self.dialog.set_icon(common.get_logo(32))
if parent != None:
self.dialog.set_transient_for(parent)
Modified: trunk/deluge/ui/gtkui/preferences.py
===================================================================
--- trunk/deluge/ui/gtkui/preferences.py 2009-07-30 23:38:14 UTC (rev
5591)
+++ trunk/deluge/ui/gtkui/preferences.py 2009-07-30 23:41:27 UTC (rev
5592)
@@ -56,7 +56,14 @@
pkg_resources.resource_filename("deluge.ui.gtkui",
"glade/preferences_dialog.glade"))
self.pref_dialog = self.glade.get_widget("pref_dialog")
- self.pref_dialog.set_icon(common.get_logo(32))
+ if deluge.common.windows_check():
+ self.pref_dialog.set_icon(common.get_logo(32))
+ else:
+ try:
+ icon_theme = gtk.icon_theme_get_default()
+ self.pref_dialog.set_icon(icon_theme.load_icon("deluge", 32,
0))
+ except:
+ self.pref_dialog.set_icon(common.get_logo(32))
self.treeview = self.glade.get_widget("treeview")
self.notebook = self.glade.get_widget("notebook")
self.gtkui_config = ConfigManager("gtkui.conf")
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---