changeset 5879c89f2497 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=5879c89f2497 description: fix ColorSelectionDialog in xhtml popup menu
diffstat:
src/chat_control.py | 6 +++--- src/message_textview.py | 17 +++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-)
diffs (50 lines):
diff -r 00cd06fc3b78 -r 5879c89f2497 src/chat_control.py --- a/src/chat_control.py Tue Jan 08 21:56:36 2013 +0100 +++ b/src/chat_control.py Wed Jan 09 22:58:51 2013 +0400 @@ -1097,9 +1097,9 @@ self.parent_win)
def on_color_menuitem_activale(self, widget): - color_dialog = Gtk.ColorSelectionDialog('Select a color') - color_dialog.connect('response', self.msg_textview.color_set, - color_dialog.colorsel) + color_dialog = Gtk.ColorChooserDialog(None, self.parent_win.window) + color_dialog.set_use_alpha(False) + color_dialog.connect('response', self.msg_textview.color_set) color_dialog.show_all()
def on_font_menuitem_activale(self, widget): diff -r 00cd06fc3b78 -r 5879c89f2497 src/message_textview.py --- a/src/message_textview.py Tue Jan 08 21:56:36 2013 +0100 +++ b/src/message_textview.py Wed Jan 09 22:58:51 2013 +0400 @@ -146,19 +146,24 @@ start, finish = self.get_active_iters() _buffer.remove_all_tags(start, finish)
- def color_set(self, widget, response, color): - if response == -6: + def color_set(self, widget, response): + print (response) + if response == -6 or response == -4: widget.destroy() return + + color = widget.get_property('rgba') + widget.destroy() _buffer = self.get_buffer() - color = color.get_current_color() - widget.destroy() - color_string = gtkgui_helpers.make_color_string(color) + # Create #aabbcc color string from rgba color + color_string = '#%02X%02X%02X' % (round(color.red*255), + round(color.green*255), round(color.blue*255)) + tag_name = 'color' + color_string if not tag_name in self.color_tags: tagColor = _buffer.create_tag(tag_name) tagColor.set_property('foreground', color_string) - self.begin_tags[tag_name] = '<span style="color: ' + color_string + ';">' + self.begin_tags[tag_name] = '<span style="color: %s;">' % color_string self.end_tags[tag_name] = '</span>' self.color_tags.append(tag_name)