Author: andar
Revision: 5980
Log:
Add some checks for OSX since it doesn't support SVG icons
Diff:
Modified: branches/1.2_RC/deluge/ui/gtkui/common.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/common.py 2009-11-28 12:37:14 UTC (rev
5979)
+++ branches/1.2_RC/deluge/ui/gtkui/common.py 2009-11-29 00:52:00 UTC (rev
5980)
@@ -50,7 +50,7 @@
def get_logo(size):
"""Returns a deluge logo pixbuf based on the size parameter."""
- if deluge.common.windows_check():
+ if deluge.common.windows_check() or deluge.common.osx_check():
return
gtk.gdk.pixbuf_new_from_file_at_size(deluge.common.get_pixmap("deluge.png"), \
size, size)
else:
@@ -162,7 +162,7 @@
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():
+ if os.path.splitext(image_filename)[1] == ".svg" and
(deluge.common.windows_check() or deluge.common.osx_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)
Modified: branches/1.2_RC/deluge/ui/gtkui/new_release_dialog.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/new_release_dialog.py 2009-11-28
12:37:14 UTC (rev 5979)
+++ branches/1.2_RC/deluge/ui/gtkui/new_release_dialog.py 2009-11-29
00:52:00 UTC (rev 5980)
@@ -47,7 +47,7 @@
glade = component.get("MainWindow").main_glade
self.dialog = glade.get_widget("new_release_dialog")
# Set the version labels
- if deluge.common.windows_check():
+ if deluge.common.windows_check() or deluge.common.osx_check():
glade.get_widget("image_new_release").set_from_file(
deluge.common.get_pixmap("deluge16.png"))
else:
Modified: branches/1.2_RC/deluge/ui/gtkui/systemtray.py
===================================================================
--- branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-11-28 12:37:14 UTC
(rev 5979)
+++ branches/1.2_RC/deluge/ui/gtkui/systemtray.py 2009-11-29 00:52:00 UTC
(rev 5980)
@@ -82,7 +82,7 @@
pkg_resources.resource_filename("deluge.ui.gtkui",
"glade/tray_menu.glade"))
- if deluge.common.windows_check():
+ if deluge.common.windows_check() or deluge.common.osx_check():
self.tray = gtk.status_icon_new_from_pixbuf(
common.get_logo(32))
else:
Modified: trunk/deluge/ui/gtkui/common.py
===================================================================
--- trunk/deluge/ui/gtkui/common.py 2009-11-28 12:37:14 UTC (rev 5979)
+++ trunk/deluge/ui/gtkui/common.py 2009-11-29 00:52:00 UTC (rev 5980)
@@ -50,7 +50,7 @@
def get_logo(size):
"""Returns a deluge logo pixbuf based on the size parameter."""
- if deluge.common.windows_check():
+ if deluge.common.windows_check() or deluge.common.osx_check():
return
gtk.gdk.pixbuf_new_from_file_at_size(deluge.common.get_pixmap("deluge.png"), \
size, size)
else:
@@ -162,7 +162,7 @@
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():
+ if os.path.splitext(image_filename)[1] == ".svg" and
(deluge.common.windows_check() or deluge.common.osx_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)
Modified: trunk/deluge/ui/gtkui/new_release_dialog.py
===================================================================
--- trunk/deluge/ui/gtkui/new_release_dialog.py 2009-11-28 12:37:14 UTC (rev
5979)
+++ trunk/deluge/ui/gtkui/new_release_dialog.py 2009-11-29 00:52:00 UTC (rev
5980)
@@ -47,7 +47,7 @@
glade = component.get("MainWindow").main_glade
self.dialog = glade.get_widget("new_release_dialog")
# Set the version labels
- if deluge.common.windows_check():
+ if deluge.common.windows_check() or deluge.common.osx_check():
glade.get_widget("image_new_release").set_from_file(
deluge.common.get_pixmap("deluge16.png"))
else:
Modified: trunk/deluge/ui/gtkui/systemtray.py
===================================================================
--- trunk/deluge/ui/gtkui/systemtray.py 2009-11-28 12:37:14 UTC (rev 5979)
+++ trunk/deluge/ui/gtkui/systemtray.py 2009-11-29 00:52:00 UTC (rev 5980)
@@ -82,7 +82,7 @@
pkg_resources.resource_filename("deluge.ui.gtkui",
"glade/tray_menu.glade"))
- if deluge.common.windows_check():
+ if deluge.common.windows_check() or deluge.common.osx_check():
self.tray = gtk.status_icon_new_from_pixbuf(
common.get_logo(32))
else:
--
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.
