Changeset 4503

Timestamp:

04/14/09 11:47:09 (4 years ago)

Author:

nopper

Message:

Adding win32 statusicon and ballons implementation trough win32 apis

Location:

branch/UmitPlugins/source-plugins/tray-icon

Files:

• setup.py (modified) (1 diff)
• sources/main.py (modified) (8 diffs)
• sources/notification (added)
• sources/notification/__init__.py (added)
• sources/notification/win32.py (added)

branch/UmitPlugins/source-plugins/tray-icon/setup.py

@@ -23 +23 @@
 setup(
     name='Tray Icon',
-    version='1.0',
+    version='2.0',
     author='Francesco Piccinno',
-    url='http://snippets.pornosecurity.org',
+    url='http://blog.archpwn.org',
     start_file='main',
-    provides='=tray-1.0',
+    provides='=tray-2.0',
     description='A simple tray icon for Umit',
     scripts=['sources/main.py'],
     data_files=[('data', ['dist/logo.png', 'dist/preferences.xml'])],
+    package_dir={'notification' : 'sources/notification'},
+    packages=['notification'],
+    license='GPL',
     output='TrayIcon.ump'
 )

branch/UmitPlugins/source-plugins/tray-icon/sources/main.py

@@ -34 +34 @@
 from umit.plugin.Parser import Parser
 
+WIN32_PRESENT = False
+
+if os.name == 'nt':
+    try:
+        from notification.win32 import StatusIcon
+        WIN32_PRESENT = True
+    except ImportError:
+        raise Exception('If you are using Windows you need Win32 Extensions package for python to use that plugin.\nDownload a copy from\n\nhttp://starship.python.net/crew/mhammond/win32/\n\nand reenable the plugin.')
+
+try:
+    import pynotify
+    NOTIFY_PRESENT = True
+except ImportError:
+    NOTIFY_PRESENT = False
+
 class Preferences(object):
     def __init__(self):
@@ -76 +91 @@
             self.change_cb(self.parser['notifications']['type'].value)
 
-tray_prefs = Preferences()
+if not WIN32_PRESENT:
+    tray_prefs = Preferences()
 
 class TrayPlugin(Plugin):
     TYPE_LIBNOTIFY = 0
     TYPE_HIGTOOLTIP = 1
+    TYPE_WINDOWS = 2
 
     def start(self, reader):
@@ -86 +103 @@
         self.toggle_visibility = True
 
+        self.icon = None
+
         self.menu = gtk.Menu()
         self.menu.show()
@@ -97 +116 @@
         self.menu.append(item)
 
-        logo = os.path.join(Path.icons_dir, 'umit_16.ico')
-        log.debug('Creating status icon with %s as logo' % logo)
-
-        self.icon = gtk.status_icon_new_from_file(logo)
+        self.type = self.notifier = None
+
+        # Force to use win32 module
+        if WIN32_PRESENT:
+            self.set_type(TrayPlugin.TYPE_WINDOWS)
+        else:
+            self.set_type(tray_prefs.parser['notifications']['type'].value)
+            tray_prefs.parser['notifications']['type'].value = self.type
+
+            logo = os.path.join(Path.icons_dir, 'umit_16.ico')
+            log.debug('Creating status icon with %s as logo' % logo)
+
+            self.icon = gtk.status_icon_new_from_file(logo)
+            tray_prefs.change_cb = self.set_type
+
         self.icon.connect('popup-menu', self.__on_right_click)
         self.icon.connect('activate', self.__on_activate)
 
-        self.type = self.notifier = None
-
-        self.set_type(tray_prefs.parser['notifications']['type'].value)
-        tray_prefs.parser['notifications']['type'].value = self.type
-
-        tray_prefs.change_cb = self.set_type
-
     def set_type(self, typo):
-        if typo == TrayPlugin.TYPE_LIBNOTIFY:
-            try:
-                # Try to use libnotify for notifications
-                import pynotify
-
+        log.debug('called with type = %d' % typo)
+
+        if typo == TrayPlugin.TYPE_WINDOWS and WIN32_PRESENT:
+
+            self.icon = StatusIcon()
+            self.type = TrayPlugin.TYPE_WINDOWS
+
+            log.debug('Now notifications will use win32 api')
+
+        elif typo == TrayPlugin.TYPE_LIBNOTIFY and NOTIFY_PRESENT:
+            
+            if pynotify.init('UMIT'):
+                self.notifier = pynotify.Notification
                 self.type = TrayPlugin.TYPE_LIBNOTIFY
 
-                if pynotify.init('UMIT'):
-                    self.notifier = pynotify.Notification
-                    log.debug('Now notifications will use LibNotify')
-                else:
-                    self.set_type(TrayPlugin.TYPE_HIGTOOLTIP)
-            except ImportError:
+                log.debug('Now notifications will use LibNotify')
+            else:
                 self.set_type(TrayPlugin.TYPE_HIGTOOLTIP)
         else:
+
             self.type = TrayPlugin.TYPE_HIGTOOLTIP
             self.notifier = HIGTooltip()
@@ -132 +160 @@
             log.debug('Now notifications will use HIGTooltip')
 
+    def remove_status_icon(self):
+        if not self.icon:
+            return
+
+        if self.type == TrayPlugin.TYPE_WINDOWS:
+            self.icon.remove()
+        else:
+            self.icon.set_visible(False)
+            del self.icon
+
+        self.icon = None
+
     def stop(self):
-        self.icon.set_visible(False)
-        self.icon = None
+        self.remove_status_icon()
 
     def __on_right_click(self, w, evt, evt_time):
-        self.popup_menu.popup(None, None, gtk.status_icon_position_menu, evt, \
+        self.popup_menu.popup(None, None,
+            (self.type != TrayPlugin.TYPE_WINDOWS) and \
+                 (gtk.status_icon_position_menu)or (None), evt, \
                               evt_time, w)
 
@@ -166 +207 @@
                        (pass None for persistent notification)
         """
-        rect = self.icon.get_geometry()
-
-        if rect is not None:
-            rect = rect[1]
-        else:
-            return
-
-        if self.type == TrayPlugin.TYPE_HIGTOOLTIP:
+
+        if self.type == TrayPlugin.TYPE_WINDOWS:
+            if self.icon.notify_icon:
+                title = pango.parse_markup(title)[1]
+                msg = pango.parse_markup(msg)[1]
+                self.icon.notify_icon.show_balloon(title, msg,
+                    (timeout is None) and (0) or (timeout), stock)
+
+        elif self.type == TrayPlugin.TYPE_HIGTOOLTIP:
+            rect = self.icon.get_geometry()
+
+            if rect is not None:
+                rect = rect[1]
+            else:
+                return
+
             data = HIGTooltipData(msg, title, stock, fname)
             self.notifier.show_at(self.icon, data, rect.x, rect.y, timeout)
@@ -225 +274 @@
         # Adjusting to the current preferences
 
-        btn = (tray_prefs.parser['notifications']['type'].value == 0) and \
-              (self.typenot) or (self.typehig)
-        btn.set_active(True)
-
-        try:
-            import pynotify
-        except ImportError:
+        if tray_prefs.parser['notifications']['type'].value == 0:
+            self.typenot.set_active(True)
+        else:
+            self.typehig.set_active(True)
+
+        if not NOTIFY_PRESENT:
             self.typenot.set_sensitive(False)
             self.typehig.set_active(True)
@@ -254 +302 @@
 
 __plugins__ = [TrayPlugin]
-__pref_func__ = show_preferences
+
+# No preferences if you are using windows
+if os.name != 'nt':
+    __pref_func__ = show_preferences