diff -ubBwr gajim-0.11.2/data/glade/message_window.glade gajim-0.11.2-sexy/data/glade/message_window.glade --- gajim-0.11.2/data/glade/message_window.glade 2007-09-05 16:13:09.000000000 +0200 +++ gajim-0.11.2-sexy/data/glade/message_window.glade 2007-10-04 12:23:42.124868799 +0200 @@ -104,19 +104,31 @@ + + + 0 True True Tylko w gajim-0.11.2-sexy/data/glade: message_window.glade.bak Tylko w gajim-0.11.2-sexy/data/glade: message_window.gladep Tylko w gajim-0.11.2-sexy/data/glade: message_window.gladep.bak diff -ubBwr gajim-0.11.2/src/chat_control.py gajim-0.11.2-sexy/src/chat_control.py --- gajim-0.11.2/src/chat_control.py 2007-09-04 20:10:16.000000000 +0200 +++ gajim-0.11.2-sexy/src/chat_control.py 2007-10-04 13:03:54.241255029 +0200 @@ -25,6 +25,7 @@ import dialogs import history_window import notify +import re from common import gajim from common import helpers @@ -43,6 +44,12 @@ except: HAS_GTK_SPELL = False +try: + import sexy + HAS_SEXY = True + +except: + HAS_SEXY = False # the next script, executed in the "po" directory, # generates the following list. @@ -51,6 +58,10 @@ #echo "{_('en'):'en'",$LANG"}" langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Briton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basc'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'} +urlfinder = re.compile("(https?://|www|ftp)[^ ]+") + +def make_href(match): + return '%s' % (match.group(), match.group()) ################################################################################ class ChatControlBase(MessageControl): @@ -117,6 +128,9 @@ event_keymod): pass # Derived should implement this rather than connecting to the event itself. + def status_url_clicked(self, widget, url): + helpers.launch_browser_mailer('url',url) + def __init__(self, type_id, parent_win, widget_name, contact, acct, resource = None): MessageControl.__init__(self, type_id, parent_win, widget_name, @@ -135,6 +149,18 @@ self._on_banner_eventbox_button_press_event) self.handlers[id] = widget + if HAS_SEXY: + self.banner_status_label = sexy.UrlLabel() + self.banner_status_label.connect('url_activated', self.status_url_clicked) + else: + self.banner_status_label = gtk.Label() + self.banner_status_label.set_selectable(True) + self.banner_status_label.set_alignment(0,0.5) + + banner_vbox = self.xml.get_widget('banner_vbox') + banner_vbox.pack_start(self.banner_status_label) + self.banner_status_label.show() + # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) @@ -218,7 +243,6 @@ 'words feature will not be used')) gajim.config.set('use_speller', False) - self.style_event_id = 0 self.conv_textview.tv.show() self._paint_banner() @@ -285,55 +309,7 @@ def _paint_banner(self): '''Repaint banner with theme color''' - theme = gajim.config.get('roster_theme') - bgcolor = gajim.config.get_per('themes', theme, 'bannerbgcolor') - textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') - # the backgrounds are colored by using an eventbox by - # setting the bg color of the eventbox and the fg of the name_label - banner_eventbox = self.xml.get_widget('banner_eventbox') - banner_name_label = self.xml.get_widget('banner_name_label') - self.disconnect_style_event(banner_name_label) - if bgcolor: - banner_eventbox.modify_bg(gtk.STATE_NORMAL, - gtk.gdk.color_parse(bgcolor)) - default_bg = False - else: - default_bg = True - if textcolor: - banner_name_label.modify_fg(gtk.STATE_NORMAL, - gtk.gdk.color_parse(textcolor)) - default_fg = False - else: - default_fg = True - if default_bg or default_fg: - self._on_style_set_event(banner_name_label, None, default_fg, - default_bg) - - def disconnect_style_event(self, widget): - if self.style_event_id: - widget.disconnect(self.style_event_id) - del self.handlers[self.style_event_id] - self.style_event_id = 0 - - def connect_style_event(self, widget, set_fg = False, set_bg = False): - self.disconnect_style_event(widget) - self.style_event_id = widget.connect('style-set', - self._on_style_set_event, set_fg, set_bg) - self.handlers[self.style_event_id] = widget - - def _on_style_set_event(self, widget, style, *opts): - '''set style of widget from style class *.Frame.Eventbox - opts[0] == True -> set fg color - opts[1] == True -> set bg color''' - banner_eventbox = self.xml.get_widget('banner_eventbox') - self.disconnect_style_event(widget) - if opts[1]: - bg_color = widget.style.bg[gtk.STATE_SELECTED] - banner_eventbox.modify_bg(gtk.STATE_NORMAL, bg_color) - if opts[0]: - fg_color = widget.style.fg[gtk.STATE_SELECTED] - widget.modify_fg(gtk.STATE_NORMAL, fg_color) - self.connect_style_event(widget, opts[0], opts[1]) + pass def _on_keypress_event(self, widget, event): if event.state & gtk.gdk.CONTROL_MASK: @@ -1043,6 +1019,7 @@ jid = contact.jid banner_name_label = self.xml.get_widget('banner_name_label') + banner_vbox = self.xml.get_widget('banner_vbox') banner_eventbox = self.xml.get_widget('banner_eventbox') name = contact.get_shown_name() @@ -1074,6 +1051,7 @@ self.status_tooltip.set_tip(banner_eventbox, status) self.status_tooltip.enable() banner_name_label.set_ellipsize(pango.ELLIPSIZE_END) + self.banner_status_label.set_ellipsize(pango.ELLIPSIZE_END) status = helpers.reduce_chars_newlines(status, max_lines = 1) status_escaped = gtkgui_helpers.escape_for_pango_markup(status) @@ -1104,9 +1082,15 @@ # weight="heavy" size="x-large" label_text = '%s%s' % \ (font_attrs, name, font_attrs_small, acct_info) + if status_escaped: - label_text += '\n%s' %\ - (font_attrs_small, status_escaped) + if HAS_SEXY: + status_text = urlfinder.sub(make_href, status_escaped) + status_text = '%s' % (font_attrs_small, status_text) + else: + status_text = '%s' % (font_attrs_small, status_escaped) + + self.banner_status_label.set_markup(status_text) else: self.status_tooltip.disable() # setup the label that holds name and jid