deskbar-applet r2062 - in trunk: . deskbar/core deskbar/ui

[sebp svn gnome org]

Author: sebp
Date: Thu Apr  3 19:54:30 2008
New Revision: 2062
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2062&view=rev

Log:


Modified:
   trunk/ChangeLog
   trunk/deskbar/core/Utils.py
   trunk/deskbar/ui/DeskbarStatusIcon.py

Modified: trunk/deskbar/core/Utils.py
==============================================================================
--- trunk/deskbar/core/Utils.py	(original)
+++ trunk/deskbar/core/Utils.py	Thu Apr  3 19:54:30 2008
@@ -3,6 +3,7 @@
 from gettext import gettext as _
 from htmlentitydefs import name2codepoint
 from os.path import *
+import cgi
 import deskbar
 import deskbar.core.Categories
 import deskbar.core.gnomedesktop
@@ -12,7 +13,8 @@
 import gtk
 import gtk.gdk
 import logging
-import os, cgi, re
+import os
+import re
 
 LOGGER = logging.getLogger(__name__)
 

Modified: trunk/deskbar/ui/DeskbarStatusIcon.py
==============================================================================
--- trunk/deskbar/ui/DeskbarStatusIcon.py	(original)
+++ trunk/deskbar/ui/DeskbarStatusIcon.py	Thu Apr  3 19:54:30 2008
@@ -77,11 +77,11 @@
     
     def set_button_image_from_file (self, filename, size):
         # We use an intermediate pixbuf to scale the image
-        if gtk.StatusIcon.get_property(self, "orientation") == gtk.ORIENTATION_HORIZONTAL:
+        if self.get_property("orientation") == gtk.ORIENTATION_HORIZONTAL:
             pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (filename, -1, size)
         else:
             pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (filename, size, -1)
-        gtk.StatusIcon.set_from_pixbuf (self, pixbuf)
+        self.set_from_pixbuf (pixbuf)
         
     def _on_size_changed (self, status_icon, size):
         image_name = "deskbar-applet-panel"
@@ -104,7 +104,13 @@
         
     def _on_popup_menu (self, status_icon, button, activate_time):
         self._menu.show_all()
-        self._menu.popup(None, None, None, button, activate_time)
+        self._menu.popup(None, None, self._get_menu_position, button, activate_time)
+        
+    def _get_menu_position (self, menu):
+        (screen, rectangle, orient) = self.get_geometry ()
+        x = rectangle.x
+        y = rectangle.y + rectangle.height
+        return (x, y, True)
         
     def create_button_ui(self):
         raise NotImplementedError