deskbar-applet r2075 - in trunk: . deskbar/ui

[sebp svn gnome org]

Author: sebp
Date: Mon Apr  7 13:30:28 2008
New Revision: 2075
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2075&view=rev

Log:
Added check for SVG support to DeskbarStatusIcon, too

Modified:
   trunk/ChangeLog
   trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py
   trunk/deskbar/ui/DeskbarStatusIcon.py
   trunk/deskbar/ui/DeskbarTray.py

Modified: trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py
==============================================================================
--- trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py	(original)
+++ trunk/deskbar/ui/AbstractCuemiacDeskbarIcon.py	Mon Apr  7 13:30:28 2008
@@ -71,7 +71,13 @@
             else:
                 self.create_button_ui()
             self._active_view = name
-       
+        
+    def _has_svg_support (self):
+        for format in gtk.gdk.pixbuf_get_formats():
+            if format["name"] == "svg":
+                return True
+        return False
+   
     def on_loaded(self, sender):
         """
         Called when all modules have been loaded and

Modified: trunk/deskbar/ui/DeskbarStatusIcon.py
==============================================================================
--- trunk/deskbar/ui/DeskbarStatusIcon.py	(original)
+++ trunk/deskbar/ui/DeskbarStatusIcon.py	Mon Apr  7 13:30:28 2008
@@ -93,12 +93,12 @@
         else:
             image_name += "-v"
         
-        if size <= 36:
-            image_name += ".png"
-            s = -1
-        else:
+        if size > 36 and self._has_svg_support():
             image_name += ".svg"
             s = size-12
+        else:
+            image_name += ".png"
+            s = -1
         
         self.set_button_image_from_file (join(deskbar.ART_DATA_DIR, image_name), s)
         

Modified: trunk/deskbar/ui/DeskbarTray.py
==============================================================================
--- trunk/deskbar/ui/DeskbarTray.py	(original)
+++ trunk/deskbar/ui/DeskbarTray.py	Mon Apr  7 13:30:28 2008
@@ -21,6 +21,7 @@
         
         self.applet = applet
         self.applet.set_background_widget(applet)
+        self.applet.set_applet_flags (gnomeapplet.EXPAND_MINOR)
         self.applet.connect ("change-size", self.on_change_size)
         # popup_dir = gnomeapplet.ORIENT_UP,gnomeapplet.ORIENT_{UP,DOWN,LEFT,RIGHT}
         self.popup_dir = applet.get_orient()
@@ -62,7 +63,7 @@
         else:
             image_name += "-v"
         
-        if size > 36 and self.__has_svg_support():
+        if size > 36 and self._has_svg_support():
             image_name += ".svg"
             s = size-12
         else:
@@ -72,13 +73,7 @@
         self.set_button_image_from_file (join(deskbar.ART_DATA_DIR, image_name), s)
         
         self.set_size_request (size, size)
-        
-    def __has_svg_support (self):
-        for format in gtk.gdk.pixbuf_get_formats():
-            if format["name"] == "svg":
-                return True
-        return False
-      
+    
     def setup_menu(self):
         self.applet.setup_menu_from_file (
             deskbar.SHARED_DATA_DIR, "Deskbar_Applet.xml",