From 09962db66a57abe2bc9573d3cc80f36f8d1f4062 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Thu, 10 Jan 2013 00:13:41 +0400 Subject: [PATCH] fix FontChooserDialog in xhtml popup menu.(fonts in html broken now) --- src/chat_control.py | 5 ++--- src/message_textview.py | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index e307e8a5d..8da54d35c 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1103,9 +1103,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): color_dialog.show_all() def on_font_menuitem_activale(self, widget): - font_dialog = Gtk.FontSelectionDialog('Select a font') - font_dialog.connect('response', self.msg_textview.font_set, - font_dialog.fontsel) + font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window) + font_dialog.connect('response', self.msg_textview.font_set) font_dialog.show_all() def on_actions_button_clicked(self, widget): diff --git a/src/message_textview.py b/src/message_textview.py index 6c41be4ac..4fea823b5 100644 --- a/src/message_textview.py +++ b/src/message_textview.py @@ -174,15 +174,15 @@ class MessageTextView(Gtk.TextView): _buffer.apply_tag_by_name(tag_name, start, finish) - def font_set(self, widget, response, font): - if response == -6: + def font_set(self, widget, response): + if response == -6 or response == -4: widget.destroy() return _buffer = self.get_buffer() - font = font.get_font_name() - font_desc = Pango.FontDescription(font) + font = widget.get_font() + font_desc = widget.get_font_desc() family = font_desc.get_family() size = font_desc.get_size() size = size / Pango.SCALE