Changeset 172

Timestamp:

06/09/04 16:22:27 (4 years ago)

Author:

asterix

Message:

icon in systray (it represents state and changes when we recieve a message not poped up)

Location:

trunk

Files:

• common/i18n.py (modified) (1 prop)
• Makefile (modified) (1 diff)
• plugins/gtkgui/eggtrayicon.c (added)
• plugins/gtkgui/eggtrayicon.h (added)
• plugins/gtkgui/gtkgui.glade (modified) (3 diffs)
• plugins/gtkgui/gtkgui.py (modified) (7 diffs)
• plugins/gtkgui/Makefile (added)
• plugins/gtkgui/trayicon.defs (added)
• plugins/gtkgui/trayiconmodule.c (added)
• plugins/gtkgui/trayicon.override (added)

trunk/Makefile

@@ +1 @@
+MODULES = common plugins/gtkgui
+
 all:
-        python setup.py build_ext -i
-        mv idle.so common/
         msgfmt Messages/fr/LC_MESSAGES/gajim.po -o Messages/fr/LC_MESSAGES/gajim.mo
+        for dir in ${MODULES}; do \
+          (cd $$dir; make all); \
+        done
+
+clean:
+        find -name *.pyc -exec rm {} \;
+        for dir in ${MODULES}; do \
+          (cd $$dir; make clean); \
+        done

trunk/plugins/gtkgui/gtkgui.glade

@@ -3 +3 @@
 
 <glade-interface>
-<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="Gajim">
@@ -11 +10 @@
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="default_width">100</property>
-  <property name="default_height">300</property>
+  <property name="default_width">150</property>
+  <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
@@ -4063 +4062 @@
                   <property name="editable">True</property>
                   <property name="overwrite">False</property>
-                  <property name="accepts_tab">True</property>
+                  <property name="accepts_tab">False</property>
                   <property name="justification">GTK_JUSTIFY_LEFT</property>
                   <property name="wrap_mode">GTK_WRAP_WORD</property>

trunk/plugins/gtkgui/gtkgui.py

@@ -22 +22 @@
 import gtk
 from gtk import TRUE, FALSE
+import trayicon
 import gtk.glade,gobject
 import os,string,time,Queue
@@ -103 +104 @@
                                 self.plugin.roster.tree.get_model().set_value(i, 0, \
                                         self.plugin.roster.pixbufs[self.user.show])
+                self.plugin.set_systray()
 
         def on_msg_key_press_event(self, widget, event):
@@ -840 +842 @@
                 #table to change index in plugin.connected to index in optionmenu
                 table = {0:6, 1:0, 2:1, 3:2, 4:3, 5:4}
-                mini = min(self.plugin.connected.values())
+                maxi = max(self.plugin.connected.values())
                 optionmenu = self.xml.get_widget('optionmenu')
                 #temporarily block signal in order not to send status that we show
                 #in the optionmenu
                 optionmenu.handler_block(self.id_signal_optionmenu)
-                optionmenu.set_history(table[mini])
+                optionmenu.set_history(table[maxi])
                 optionmenu.handler_unblock(self.id_signal_optionmenu)
+                statuss = ['offline', 'online', 'away', 'xa', 'dnd', 'invisible']
+                self.plugin.set_systray(statuss[maxi])
 
         def on_status_changed(self, account, status):
@@ -892 +896 @@
                                 for i in self.get_user_iter(jid, account):
                                         model.set_value(i, 0, self.pixbufs['message'])
+                                self.plugin.set_systray('message')
                         tim = time.strftime("[%H:%M:%S]")
                         self.plugin.queues[account][jid].put((msg, tim))
@@ -1403 +1408 @@
                 return 1
 
+        def set_systray_img(self, status):
+                if not self.roster.pixbufs.has_key(status):
+                        return
+                pix = self.roster.pixbufs[status]
+                if isinstance(pix, gtk.gdk.PixbufAnimation):
+                        self.img_tray.set_from_animation(pix)
+                else:
+                        self.img_tray.set_from_pixbuf(pix)
+
+        def set_systray(self, status=None):
+                if not status:
+                        self.nb_msg -= 1
+                        if self.nb_msg == 0:
+                                self.set_systray_img(self.status)
+                elif status == 'message':
+                        self.nb_msg += 1
+                        self.set_systray_img('message')
+                else:
+                        self.status = status
+                        self.set_systray_img(status)
+
         def __init__(self, quIN, quOUT):
                 gtk.threads_init()
@@ -1421 +1447 @@
                 self.send('ASK_CONFIG', None, ('GtkGui', 'accounts'))
                 self.accounts = self.wait('CONFIG')
+                self.nb_msg = 0
                 self.windows = {'logs':{}}
                 self.queues = {}
@@ -1441 +1468 @@
                 gtk.timeout_add(1000, self.read_sleepy)
                 self.sleeper = None
+                t = trayicon.TrayIcon("Gajim")
+                tip = gtk.Tooltips()
+                tip.set_tip(t, 'Gajim')
+                self.img_tray = gtk.Image()
+                t.add(self.img_tray)
+                t.show_all()
+                self.set_systray('offline')
                 gtk.main()
                 gtk.threads_leave()