Changeset 8261

Timestamp:

06/11/07 10:37:46 (18 months ago)

Author:

steve-e

Message:

Enable ellipsization in roster and chatwindow. Fixes #2079, #2739
Reorder occupantlist in groupchat to match roster. Fixes #2102

Location:

trunk

Files:

• data/glade/message_window.glade (modified) (1 diff)
• src/config.py (modified) (1 diff)
• src/groupchat_control.py (modified) (3 diffs)
• src/roster_window.py (modified) (3 diffs)

trunk/data/glade/message_window.glade

@@ -592 +592 @@
                       <property name="xpad">0</property>
                       <property name="ypad">0</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                      <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
                       <property name="width_chars">-1</property>
                       <property name="single_line_mode">False</property>

trunk/src/config.py

@@ -581 +581 @@
                 self.on_checkbutton_toggled(widget, 'show_avatars_in_roster')
                 gajim.interface.roster.draw_roster()
-
+                # Redraw connected groupchats (in an ugly way)
+                for account in gajim.connections:
+                        if gajim.connections[account].connected:
+                                for gc_control in gajim.interface.msg_win_mgr.get_controls(
+                                        message_control.TYPE_GC) + \
+                                        gajim.interface.minimized_controls[account].values():
+                                                gc_control.draw_roster()
+        
         def on_emoticons_combobox_changed(self, widget):
                 active = widget.get_active()

trunk/src/groupchat_control.py

@@ -289 +289 @@
                 column = gtk.TreeViewColumn()
 
+                renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img
+                renderer_image.set_property('width', 26)
+                column.pack_start(renderer_image, expand = False)
+                column.add_attribute(renderer_image, 'image', C_IMG)
+                column.set_cell_data_func(renderer_image, tree_cell_data_func, 
+                        self.list_treeview)
+
+                renderer_text = gtk.CellRendererText() # nickname
+                column.pack_start(renderer_text, expand = True)
+                column.add_attribute(renderer_text, 'markup', C_TEXT)
+                renderer_text.set_property("ellipsize", pango.ELLIPSIZE_END)
+                column.set_cell_data_func(renderer_text, tree_cell_data_func,
+                        self.list_treeview)
+
                 renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image
                 column.pack_start(renderer_pixbuf, expand = False)
@@ -295 +309 @@
                         self.list_treeview)
                 renderer_pixbuf.set_property('xalign', 1) # align pixbuf to the right
-
-                renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img
-                column.pack_start(renderer_image, expand = False)
-                column.add_attribute(renderer_image, 'image', C_IMG)
-                column.set_cell_data_func(renderer_image, tree_cell_data_func, 
-                        self.list_treeview)
-
-                renderer_text = gtk.CellRendererText() # nickname
-                column.pack_start(renderer_text, expand = True)
-                column.add_attribute(renderer_text, 'markup', C_TEXT)
-                column.set_cell_data_func(renderer_text, tree_cell_data_func,
-                        self.list_treeview)
 
                 self.list_treeview.append_column(column)
@@ -802 +804 @@
                                                 gc_contact.affiliation, gc_contact.status,
                                                 gc_contact.jid)
+                # Recalculate column width for ellipsizin
+                self.list_treeview.columns_autosize()
 
         def on_send_pm(self, widget = None, model = None, iter = None, nick = None,

trunk/src/roster_window.py

@@ -17 +17 @@
 
 import gtk
+import pango
 import gobject
 import os
@@ -1189 +1190 @@
                         self.add_account_to_roster(acct)
                         self.add_account_contacts(acct)
+                # Recalculate column width for ellipsizing 
+                self.tree.columns_autosize()
 
         def add_account_contacts(self, account):
@@ -5046 +5049 @@
 
                 render_text = gtk.CellRendererText() # contact or group or account name
+                render_text.set_property("ellipsize", pango.ELLIPSIZE_END)
                 col.pack_start(render_text, expand = True)
                 col.add_attribute(render_text, 'markup', C_NAME) # where we hold the name