Changeset 10023

Timestamp:

07/25/08 02:43:01 (3 months ago)

Author:

js

Message:

* Better rendering of mood in roster.

(Only takes space if needed now)

* Possibility to disable display of mood in roster from preferences.

(Also works on the fly with the new rendering method)

* Minor improvements in the translation of the moods to German.

Location:

trunk

Files:

• data/glade/preferences_window.glade (modified) (2 diffs)
• po/de.po (modified) (1 diff)
• src/common/pep.py (modified) (1 diff)
• src/config.py (modified) (2 diffs)
• src/roster_window.py (modified) (12 diffs)

trunk/data/glade/preferences_window.glade

@@ -74 +74 @@
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="sort_by_show_checkbutton">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip" translatable="yes">If checked, Gajim will sort contacts in roster window and groupchats by their status and not by the shown name</property>
-                                <property name="label" translatable="yes">_Sort contacts by status</property>
+                              <widget class="GtkCheckButton" id="show_mood_in_roster_checkbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property>
+                                <property name="label" translatable="yes">Display m_ood of contacts in roster</property>
                                 <property name="use_underline">True</property>
                                 <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_sort_by_show_checkbutton_toggled"/>
+                                <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/>
                               </widget>
                               <packing>
@@ -88 +88 @@
                                 <property name="fill">False</property>
                                 <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="sort_by_show_checkbutton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" translatable="yes">If checked, Gajim will sort contacts in roster window and groupchats by their status and not by the shown name</property>
+                                <property name="label" translatable="yes">_Sort contacts by status</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_sort_by_show_checkbutton_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>

trunk/po/de.po

@@ -4714 +4714 @@
 #: ../src/common/helpers.py:350
 msgid "afraid"
-msgstr "Fürchtend"
+msgstr "Verängstigt"
 
 #: ../src/common/helpers.py:350
 msgid "amazed"
-msgstr "Überrascht"
+msgstr "Verblüfft"
 
 #: ../src/common/helpers.py:350

trunk/src/common/pep.py

@@ -63 +63 @@
                                 del contact.mood['text']
 
-        gajim.interface.roster.draw_contact(user, name)
+        gajim.interface.roster.draw_mood(user, name)
         ctrl = gajim.interface.msg_win_mgr.get_control(user, name)
         if ctrl:

trunk/src/config.py

@@ -93 +93 @@
                 # Display avatars in roster
                 st = gajim.config.get('show_avatars_in_roster')
-                self.xml.get_widget('show_avatars_in_roster_checkbutton').set_active(st)
+                self.xml.get_widget('show_avatars_in_roster_checkbutton'). \
+                        set_active(st) 
 
                 # Display status msg under contact name in roster
                 st = gajim.config.get('show_status_msgs_in_roster')
-                self.xml.get_widget('show_status_msgs_in_roster_checkbutton').set_active(
-                        st)
+                self.xml.get_widget('show_status_msgs_in_roster_checkbutton'). \
+                        set_active( st)
+
+                # Display mood in roster
+                st = gajim.config.get('show_mood_in_roster')
+                self.xml.get_widget('show_mood_in_roster_checkbutton'). \
+                        set_active(st)
 
                 # Sort contacts by show
@@ -527 +533 @@
                         if ctl.type_id == message_control.TYPE_GC:
                                 ctl.update_ui()
+
+        def on_show_mood_in_roster_checkbutton_toggled(self, widget):
+                self.on_checkbutton_toggled(widget, 'show_mood_in_roster')
+                gajim.interface.roster.setup_and_draw_roster()
 
         def on_sort_by_show_checkbutton_toggled(self, widget):

trunk/src/roster_window.py

@@ -77 +77 @@
 C_JID, # the jid of the row
 C_ACCOUNT, # cellrenderer text that holds account name
-C_MOOD,
+C_MOOD_PIXBUF,
 C_AVATAR_PIXBUF, # avatar_pixbuf
 C_PADLOCK_PIXBUF, # use for account row only
@@ -609 +609 @@
                         for c, acc in brothers:
                                 self.draw_contact(c.jid, acc)
+                                self.draw_mood(c.jid, acc)
                                 self.draw_avatar(c.jid, acc)
 
@@ -653 +654 @@
 
                 self.draw_contact(jid, account)
+                self.draw_mood(jid, account)
                 self.draw_avatar(jid, account)
                 self.draw_account(account)
@@ -710 +712 @@
                         for c, acc in contacts:
                                 self.draw_contact(c.jid, acc)
+                                self.draw_mood(c.jid, acc)
                                 self.draw_avatar(c.jid, acc)
                         for group in contact.get_shown_groups():
@@ -766 +769 @@
                                         for c, acc in brothers:
                                                 self.draw_contact(c.jid, acc)
+                                                self.draw_mood(c.jid, acc)
                                                 self.draw_avatar(c.jid, acc)
 
@@ -1175 +1179 @@
                                 self.model[child_iter][C_IMG] = img
                                 self.model[child_iter][C_NAME] = name
-                                
-                                if contact.mood.has_key('mood') \
-                                and contact.mood['mood'] in MOODS:
-                                        self.model[child_iter][C_MOOD] = \
-                                                gtkgui_helpers.load_mood_icon(
-                                                contact.mood['mood'])
-                                elif contact.mood.has_key('mood'):
-                                        self.model[child_iter][C_MOOD] = \
-                                                gtkgui_helpers.load_mood_icon(
-                                                'unknown')
-                                else:
-                                        self.model[child_iter][C_MOOD] = None
 
                         # We are a little brother
@@ -1205 +1197 @@
 
 
+        def draw_mood(self, jid, account):
+                iters = self._get_contact_iter(jid, account, model = self.model)
+                if not iters or not gajim.config.get('show_mood_in_roster'):
+                        return
+                jid = self.model[iters[0]][C_JID]
+                jid = jid.decode('utf-8')
+                contact = gajim.contacts.get_contact(account, jid)
+                if contact.mood.has_key('mood') \
+                and contact.mood['mood'] in MOODS:
+                        pixbuf = gtkgui_helpers.load_mood_icon(
+                                contact.mood['mood']).get_pixbuf()
+                elif contact.mood.has_key('mood'):
+                        pixbuf = gtkgui_helpers.load_mood_image(
+                                'unknown').get_pixbuf()
+                else:
+                        pixbuf = None
+                for child_iter in iters:
+                        self.model[child_iter][C_MOOD_PIXBUF] = pixbuf
+                return False
+
+
         def draw_avatar(self, jid, account):
                 iters = self._get_contact_iter(jid, account, model = self.model)
@@ -1251 +1264 @@
                         for jid in jids:
                                 self.draw_contact(jid, account)
+                                self.draw_mood(jid, account)
                                 self.draw_avatar(jid, account)
                                 yield True
@@ -1264 +1278 @@
                 # avatar_pixbuf, padlock_pixbuf)
                 self.model = gtk.TreeStore(gtk.Image, str, str, str, str,
-                        gtk.Image, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf)
+                        gtk.gdk.Pixbuf, gtk.gdk.Pixbuf, gtk.gdk.Pixbuf)
 
                 self.model.set_sort_func(1, self._compareIters)
@@ -3666 +3680 @@
                         for c, acc in brothers:
                                 self.draw_contact(c.jid, acc)
+                                self.draw_mood(c.jid, acc)
                                 self.draw_avatar(c.jid, acc)
 
@@ -4172 +4187 @@
                                 renderer.set_property('xpad', 8)
 
+
+        def _fill_mood_pixbuf_rederer(self, column, renderer, model, titer,
+        data = None):
+                '''When a row is added, set properties for avatar renderer'''
+                theme = gajim.config.get('roster_theme')
+                type_ = model[titer][C_TYPE]
+                if type_ in ('group', 'account'):
+                        renderer.set_property('visible', False)
+                        return
+
+                # allocate space for the icon only if needed
+                if model[titer][C_MOOD_PIXBUF]:
+                        renderer.set_property('visible', True)
+                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]:
+                                # This can append at the moment we add the row
+                                return
+                        jid = model[titer][C_JID].decode('utf-8')
+                        account = model[titer][C_ACCOUNT].decode('utf-8')
+                        if jid in gajim.newly_added[account]:
+                                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(
+                                        'just_disconnected_bg_color'))
+                        else:
+                                color = gajim.config.get_per('themes', theme, 'contactbgcolor')
+                                if color:
+                                        renderer.set_property('cell-background', color)
+                                else:
+                                        renderer.set_property('cell-background', None)
+                renderer.set_property('xalign', 1) # align pixbuf to the right
+
+
         def _fill_avatar_pixbuf_rederer(self, column, renderer, model, titer,
         data = None):
@@ -5976 +6027 @@
                 col.set_cell_data_func(render_text, self._nameCellDataFunc, None)
 
-                if gajim.config.get('show_mood_in_roster'):
-                        render_image = cell_renderer_image.CellRendererImage(
-                                0, 0)
-                        col.pack_start(render_image, expand = False)
-                        col.add_attribute(render_image, 'image', C_MOOD)
-                        col.set_cell_data_func(render_image,
-                                self._iconCellDataFunc, None)
+                render_pixbuf = gtk.CellRendererPixbuf()
+                col.pack_start(render_pixbuf, expand = False)
+                col.add_attribute(render_pixbuf, 'pixbuf', C_MOOD_PIXBUF)
+                col.set_cell_data_func(render_pixbuf,
+                        self._fill_mood_pixbuf_rederer, None)
 
                 if gajim.config.get('avatar_position_in_roster') == 'right':