From 9385f1074fab2bee69ed2d238e784856d526667e Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sun, 25 Dec 2005 23:48:08 +0000 Subject: [PATCH] [greblus] preferences window now can control the color of URLs --- src/common/config.py | 1 + src/common/xmpp/transports.py | 1 + src/config.py | 12 +++++++- src/conversation_textview.py | 5 ++-- src/gajim.py | 1 + src/gtkgui.glade | 56 +++++++++++++++++++++++++++++++---- 6 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index 75ad2a736..85517767c 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -76,6 +76,7 @@ class Config: 'outmsgcolor': [ opt_color, '#164e6f' ], 'statusmsgcolor': [ opt_color, '#1eaa1e' ], 'markedmsgcolor': [ opt_color, '#ff8080' ], + 'urlmsgcolor': [ opt_color, '#0000ff' ], 'collapsed_rows': [ opt_str, '' ], 'roster_theme': [ opt_str, 'green' ], 'saveposition': [ opt_bool, True ], diff --git a/src/common/xmpp/transports.py b/src/common/xmpp/transports.py index 3c4e13ac7..179636a77 100644 --- a/src/common/xmpp/transports.py +++ b/src/common/xmpp/transports.py @@ -43,6 +43,7 @@ def temp_failure_retry(func, *args, **kwargs): try: return func(*args, **kwargs) except (os.error, IOError, select.error), ex: + print ex, dir(ex) if ex.errno == errno.EINTR: continue else: diff --git a/src/config.py b/src/config.py index bb7aad70f..8e940bc77 100644 --- a/src/config.py +++ b/src/config.py @@ -222,6 +222,11 @@ class PreferencesWindow: colSt = gajim.config.get('statusmsgcolor') self.xml.get_widget('status_msg_colorbutton').set_color( gtk.gdk.color_parse(colSt)) + + #Color for hyperlinks + colSt = gajim.config.get('urlmsgcolor') + self.xml.get_widget('url_msg_colorbutton').set_color( + gtk.gdk.color_parse(colSt)) #Font for messages font = gajim.config.get('conversation_font') @@ -719,6 +724,9 @@ class PreferencesWindow: def on_outgoing_msg_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'outmsgcolor') + def on_url_msg_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'urlmsgcolor') + def on_status_msg_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'statusmsgcolor') @@ -726,7 +734,7 @@ class PreferencesWindow: self.on_preference_widget_font_set(widget, 'conversation_font') def on_reset_colors_button_clicked(self, widget): - for i in ('inmsgcolor', 'outmsgcolor', 'statusmsgcolor'): + for i in ('inmsgcolor', 'outmsgcolor', 'statusmsgcolor', 'urlmsgcolor'): gajim.config.set(i, gajim.interface.default_values[i]) self.xml.get_widget('incoming_msg_colorbutton').set_color(\ @@ -735,6 +743,8 @@ class PreferencesWindow: gtk.gdk.color_parse(gajim.config.get('outmsgcolor'))) self.xml.get_widget('status_msg_colorbutton').set_color(\ gtk.gdk.color_parse(gajim.config.get('statusmsgcolor'))) + self.xml.get_widget('url_msg_colorbutton').set_color(\ + gtk.gdk.color_parse(gajim.config.get('urlmsgcolor'))) self.update_text_tags() gajim.interface.save_config() diff --git a/src/conversation_textview.py b/src/conversation_textview.py index 8fe28418c..35614ceed 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -100,12 +100,13 @@ class ConversationTextview(gtk.TextView): tag.set_property('foreground', color) tag = buffer.create_tag('url') - tag.set_property('foreground', 'blue') + color = gajim.config.get('urlmsgcolor') + tag.set_property('foreground', color) tag.set_property('underline', pango.UNDERLINE_SINGLE) tag.connect('event', self.hyperlink_handler, 'url') tag = buffer.create_tag('mail') - tag.set_property('foreground', 'blue') + tag.set_property('foreground', color) tag.set_property('underline', pango.UNDERLINE_SINGLE) tag.connect('event', self.hyperlink_handler, 'mail') diff --git a/src/gajim.py b/src/gajim.py index 4f3c97f4f..8ad5ecd57 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -1310,6 +1310,7 @@ class Interface: 'inmsgcolor': gajim.config.get('inmsgcolor'), 'outmsgcolor': gajim.config.get('outmsgcolor'), 'statusmsgcolor': gajim.config.get('statusmsgcolor'), + 'urlmsgcolor': gajim.config.get('urlmsgcolor'), } parser.read() diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 0f03aae8f..8506b4c85 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -4121,7 +4121,7 @@ Agent JID - node True - 5 + 6 2 False 6 @@ -4343,8 +4343,8 @@ Agent JID - node 0 2 - 4 - 5 + 5 + 6 fill @@ -4371,8 +4371,8 @@ Agent JID - node 0 1 - 3 - 4 + 4 + 5 fill @@ -4392,12 +4392,58 @@ Agent JID - node 1 2 + 4 + 5 + fill + + + + + + + True + URL: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 3 4 fill + + + + True + True + False + True + + + + 1 + 2 + 3 + 4 + + + + 0