[commit-gajim] r8445 - in trunk/src: . common - Commits

30 Jul 2007

Author: steve-e
Date: 2007-07-30 14:17:04 +0200 (Mon, 30 Jul 2007)
New Revision: 8445
Modified:
   trunk/src/chat_control.py
   trunk/src/common/helpers.py
Log:
 * Use same height for all banners. Fixes #2770
 * Show only one status line in chatwindows, indicate when it is shortened
Modified: trunk/src/chat_control.py
===================================================================

--- trunk/src/chat_control.py	2007-07-29 21:02:15 UTC (rev 8444)
+++ trunk/src/chat_control.py	2007-07-30 12:17:04 UTC (rev 8445)
@@ -133,6 +133,7 @@
# 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)
    	self.handlers[id] = widget
@@ -1117,6 +1118,8 @@
    	jid = contact.jid
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:
    		name += '/' + self.resource
@@ -1143,8 +1146,10 @@
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)
font_attrs, font_attrs_small = self.get_font_attrs()
@@ -1177,9 +1182,6 @@
    	if status_escaped:
    		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()
    	# setup the label that holds name and jid
Modified: trunk/src/common/helpers.py
===================================================================
--- trunk/src/common/helpers.py	2007-07-29 21:02:15 UTC (rev 8444)
+++ trunk/src/common/helpers.py	2007-07-30 12:17:04 UTC (rev 8445)
@@ -871,6 +871,8 @@
    		lines = map(lambda e: _cut_if_long(e), lines)
    if lines:
    	reduced_text = reduce(lambda e, e1: e + '\n' + e1, lines)
+		if reduced_text != text:
+			reduced_text += '...'
    else:
    	reduced_text = ''
    return reduced_text

    