Changeset 10025

Timestamp:

07/25/08 03:10:14 (5 weeks ago)

Author:

js

Message:

Show own mood in account row.

Location:

trunk/src

Files:

• common/pep.py (modified) (1 diff)
• roster_window.py (modified) (11 diffs)

trunk/src/common/pep.py

@@ -63 +63 @@
                                 del contact.mood['text']
 
-        gajim.interface.roster.draw_mood(user, name)
-        ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
-        if ctrl:
-                ctrl.update_mood()
+        if jid == gajim.get_jid_from_account(name):
+                gajim.interface.roster.draw_account(name)
+        else:
+                gajim.interface.roster.draw_mood(user, name)
+                ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
+                if ctrl:
+                        ctrl.update_mood()
 
 def user_tune(items, name, jid):

trunk/src/roster_window.py

@@ -232 +232 @@
                                                                 parent_iter)
                                                 else:
-                                                        # we tested all 
+                                                        # we tested all
                                                         # contacts in this group
                                                         contact_iter = None
@@ -617 +617 @@
 
                 Nearby family is the part of the family that is grouped with the metacontact.
-                A metacontact may be over different accounts. If regroup is s False the 
+                A metacontact may be over different accounts. If regroup is s False the
                 given family is split account wise.
 
@@ -788 +788 @@
                 if gajim.account_is_connected(account):
                         show = 'online'
-                else: 
+                else:
                         show = 'offline'
                         status = ''
@@ -974 +974 @@
 
                 self.model[child_iter][C_NAME] = account_name
+
+                if gajim.connections[account].mood.has_key('mood') \
+                and gajim.connections[account].mood['mood'] in MOODS:
+                        self.model[child_iter][C_MOOD_PIXBUF] = \
+                                gtkgui_helpers.load_mood_icon(
+                                gajim.connections[account].mood['mood']). \
+                                get_pixbuf()
+                elif gajim.connections[account].mood.has_key('mood'):
+                        self.model[child_iter][C_MOOD_PIXBUF] = \
+                                gtkgui_helpers.load_mood_icon('unknown'). \
+                                get_pixbuf()
+                else:
+                        self.model[child_iter][C_MOOD_PIXBUF] = None
+
                 return False
 
@@ -1275 +1289 @@
                 '''create new empty model and draw roster'''
                 self.modelfilter = None
-                # (icon, name, type, jid, account, editable, mood_pixbuf, 
+                # (icon, name, type, jid, account, editable, mood_pixbuf,
                 # avatar_pixbuf, padlock_pixbuf)
                 self.model = gtk.TreeStore(gtk.Image, str, str, str, str,
@@ -1415 +1429 @@
                         for _acc in accounts:
                                 for contact in gajim.contacts.iter_contacts(_acc):
-                                        # Is this contact in this group ? (last part of if check if it's 
-                                        # self contact) 
+                                        # Is this contact in this group ? (last part of if check if it's
+                                        # self contact)
                                         if group in contact.get_shown_groups():
                                                 if self.contact_is_visible(contact, _acc):
@@ -1438 +1452 @@
                                         if contact and self.contact_is_visible(contact, account):
                                                 return True
-                                return False 
+                                return False
                         else:
                                 contact = gajim.contacts.get_first_contact_from_jid(account, jid)
@@ -3044 +3058 @@
                                         contact.sub = 'from'
                                         # we can't see him, but have to set it manually in contact
-                                        contact.show = 'offline' 
+                                        contact.show = 'offline'
                                         gajim.contacts.add_contact(account, contact)
                                         self.add_contact(contact.jid, account)
@@ -4193 +4207 @@
                 theme = gajim.config.get('roster_theme')
                 type_ = model[titer][C_TYPE]
-                if type_ in ('group', 'account'):
+                if type_ == 'group':
                         renderer.set_property('visible', False)
                         return
@@ -4202 +4216 @@
                 else:
                         renderer.set_property('visible', False)
-                if type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534
-                        if not model[titer][C_JID] or not model[titer][C_ACCOUNT]:
+                if type_ == 'account':
+                        color = gajim.config.get_per('themes', theme,
+                                'accountbgcolor')
+                        if color:
+                                renderer.set_property('cell-background', color)
+                        else:
+                                self.set_renderer_color(renderer,
+                                        gtk.STATE_ACTIVE
+                        # align pixbuf to the right)
+                        renderer.set_property('xalign', 1)
+                # prevent type_ = None, see http://trac.gajim.org/ticket/2534
+                elif type_:
+                        if not model[titer][C_JID] \
+                        or not model[titer][C_ACCOUNT]:
                                 # This can append at the moment we add the row
                                 return
@@ -4209 +4235 @@
                         account = model[titer][C_ACCOUNT].decode('utf-8')
                         if jid in gajim.newly_added[account]:
-                                renderer.set_property('cell-background', gajim.config.get(
+                                renderer.set_property('cell-background',
+                                        gajim.config.get(
                                         'just_connected_bg_color'))
                         elif jid in gajim.to_be_removed[account]:
-                                renderer.set_property('cell-background', gajim.config.get(
+                                renderer.set_property('cell-background',
+                                        gajim.config.get(
                                         'just_disconnected_bg_color'))
                         else:
-                                color = gajim.config.get_per('themes', theme, 'contactbgcolor')
+                                color = gajim.config.get_per('themes',
+                                        theme, 'contactbgcolor')
                                 if color:
-                                        renderer.set_property('cell-background', color)
+                                        renderer.set_property(
+                                                'cell-background', color)
                                 else:
-                                        renderer.set_property('cell-background', None)
-                renderer.set_property('xalign', 1) # align pixbuf to the right
+                                        renderer.set_property(
+                                                'cell-background', None)
+                        # align pixbuf to the right
+                        renderer.set_property('xalign', 1)