Author: andar
Revision: 5912
Log:
Fix showing the 'Other' speed dialogs in Windows
Diff:
Modified: branches/1.2_RC/ChangeLog
===================================================================
--- branches/1.2_RC/ChangeLog 2009-11-02 17:50:32 UTC (rev 5911)
+++ branches/1.2_RC/ChangeLog 2009-11-03 03:19:30 UTC (rev 5912)
@@ -1,4 +1,7 @@
=== Deluge 1.2.0_rc4 (In Development) ===
+==== GtkUI ====
+ * Fix showing the 'Other' speed dialogs in Windows
+
==== Web ====
* Fix installing the deluge-web manpage
* Escape hyphens in the manpage
Modified: branches/1.2_RC/deluge/ui/gtkui/common.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/common.py 2009-11-02 17:50:32 UTC (rev
5911)
+++ branches/1.2_RC/deluge/ui/gtkui/common.py 2009-11-03 03:19:30 UTC (rev
5912)
@@ -159,6 +159,9 @@
if image_stockid:
glade.get_widget("image").set_from_stock(image_stockid,
gtk.ICON_SIZE_LARGE_TOOLBAR)
if image_filename:
+ # Hack for Windows since it doesn't support svg
+ if os.path.splitext(image_filename)[1] == ".svg" and
deluge.common.windows_check():
+ image_filename = os.path.splitext(image_filename)[0] + "16.png"
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
deluge.common.get_pixmap(image_filename), 32, 32)
glade.get_widget("image").set_from_pixbuf(pixbuf)
Modified: trunk/deluge/ui/gtkui/common.py
===================================================================
--- trunk/deluge/ui/gtkui/common.py 2009-11-02 17:50:32 UTC (rev 5911)
+++ trunk/deluge/ui/gtkui/common.py 2009-11-03 03:19:30 UTC (rev 5912)
@@ -159,6 +159,9 @@
if image_stockid:
glade.get_widget("image").set_from_stock(image_stockid,
gtk.ICON_SIZE_LARGE_TOOLBAR)
if image_filename:
+ # Hack for Windows since it doesn't support svg
+ if os.path.splitext(image_filename)[1] == ".svg" and
deluge.common.windows_check():
+ image_filename = os.path.splitext(image_filename)[0] + "16.png"
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
deluge.common.get_pixmap(image_filename), 32, 32)
glade.get_widget("image").set_from_pixbuf(pixbuf)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
