Changeset 8445

Timestamp:

07/30/07 14:17:04 (18 months ago)

Author:

steve-e

Message:

• Use same height for all banners. Fixes #2770
• Show only one status line in chatwindows, indicate when it is shortened

Location:

trunk/src

Files:

• chat_control.py (modified) (4 diffs)
• common/helpers.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -134 +134 @@
                 # Create banner and connect signals
                 widget = self.xml.get_widget('banner_eventbox')
+                widget.set_property('height-request', gajim.config.get('chat_avatar_height'))
                 id = widget.connect('button-press-event',
                         self._on_banner_eventbox_button_press_event)
@@ -1118 +1119 @@
 
                 banner_name_label = self.xml.get_widget('banner_name_label')
+                banner_eventbox = self.xml.get_widget('banner_eventbox')
+                
                 name = contact.get_shown_name()
                 if self.resource:
@@ -1144 +1147 @@
                 status = contact.status
                 if status is not None:
+                        self.status_tooltip.set_tip(banner_eventbox, status)
+                        self.status_tooltip.enable()
                         banner_name_label.set_ellipsize(pango.ELLIPSIZE_END)
-                        status = helpers.reduce_chars_newlines(status, max_lines = 2)
+                        status = helpers.reduce_chars_newlines(status, max_lines = 1)
                 status_escaped = gobject.markup_escape_text(status)
 
@@ -1178 +1183 @@
                         label_text += '\n<span %s>%s</span>' %\
                                 (font_attrs_small, status_escaped)
-                        banner_eventbox = self.xml.get_widget('banner_eventbox')
-                        self.status_tooltip.set_tip(banner_eventbox, status)
-                        self.status_tooltip.enable()
                 else:
                         self.status_tooltip.disable()

trunk/src/common/helpers.py

@@ -872 +872 @@
         if lines:
                 reduced_text = reduce(lambda e, e1: e + '\n' + e1, lines)
+                if reduced_text != text:
+                        reduced_text += '...'
         else:
                 reduced_text = ''