copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* Use same height for all banners. Fixes #2770

Browse source 
* Show only one status line in chatwindows, indicate when it is shortened
This commit is contained in:
Stephan Erb 2007-07-30 12:17:04 +00:00
parent bb7283de02
commit 8bbc23dfd6
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/chat_control.py
View file

@ -133,6 +133,7 @@ class ChatControlBase(MessageControl):
# Create banner and connect signals # Create banner and connect signals
widget = self.xml.get_widget('banner_eventbox') widget = self.xml.get_widget('banner_eventbox')
widget.set_property('height-request', gajim.config.get('chat_avatar_height'))
id = widget.connect('button-press-event', id = widget.connect('button-press-event',
self._on_banner_eventbox_button_press_event) self._on_banner_eventbox_button_press_event)
self.handlers[id] = widget self.handlers[id] = widget
@ -1117,6 +1118,8 @@ class ChatControl(ChatControlBase):
jid = contact.jid jid = contact.jid
banner_name_label = self.xml.get_widget('banner_name_label') banner_name_label = self.xml.get_widget('banner_name_label')
banner_eventbox = self.xml.get_widget('banner_eventbox')
name = contact.get_shown_name() name = contact.get_shown_name()
if self.resource: if self.resource:
name += '/' + self.resource name += '/' + self.resource
@ -1143,8 +1146,10 @@ class ChatControl(ChatControlBase):
status = contact.status status = contact.status
if status is not None: 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) 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) status_escaped = gobject.markup_escape_text(status)
font_attrs, font_attrs_small = self.get_font_attrs() font_attrs, font_attrs_small = self.get_font_attrs()
@ -1177,9 +1182,6 @@ class ChatControl(ChatControlBase):
if status_escaped: if status_escaped:
label_text += '\n<span %s>%s</span>' %\ label_text += '\n<span %s>%s</span>' %\
(font_attrs_small, status_escaped) (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: else:
self.status_tooltip.disable() self.status_tooltip.disable()
# setup the label that holds name and jid # setup the label that holds name and jid

2
src/common/helpers.py
View file

@ -871,6 +871,8 @@ def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):
lines = map(lambda e: _cut_if_long(e), lines) lines = map(lambda e: _cut_if_long(e), lines)
if lines: if lines:
reduced_text = reduce(lambda e, e1: e + '\n' + e1, lines) reduced_text = reduce(lambda e, e1: e + '\n' + e1, lines)
if reduced_text != text:
reduced_text += '...'
else: else:
reduced_text = '' reduced_text = ''
return reduced_text return reduced_text