changeset f012fc8afd48 in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f012fc8afd48 description: add markedmsgcolor option to GUI. Fixes #7436
diffstat:
data/gui/preferences_window.ui | 57 +++++++++++++++++++++++++++++++++++++++-- src/config.py | 9 +++++- src/gui_interface.py | 1 + 3 files changed, 62 insertions(+), 5 deletions(-)
diffs (125 lines):
diff -r 20066547330e -r f012fc8afd48 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Aug 25 14:07:49 2013 +0200 +++ b/data/gui/preferences_window.ui Sun Aug 25 15:23:22 2013 +0200 @@ -1650,7 +1650,7 @@ <child> <object class="GtkTable" id="table25"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">5</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> <property name="row_spacing">6</property> @@ -1778,8 +1778,8 @@ </object> <packing> <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -2011,6 +2011,57 @@ <property name="y_options"/> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkColorButton" id="muc_highlight_colorbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="xalign">0</property> + <property name="color">#000000000000</property> + <signal name="color_set" handler="on_muc_highlight_colorbutton_color_set"/> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Group chat highlight:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"/> + </packing> + </child> </object> </child> </object> diff -r 20066547330e -r f012fc8afd48 src/config.py --- a/src/config.py Sun Aug 25 14:07:49 2013 +0200 +++ b/src/config.py Sun Aug 25 15:23:22 2013 +0200 @@ -923,6 +923,9 @@ def on_status_msg_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'statusmsgcolor')
+ def on_muc_highlight_colorbutton_color_set(self, widget): + self.on_preference_widget_color_set(widget, 'markedmsgcolor') + def on_conversation_fontbutton_font_set(self, widget): self.on_preference_widget_font_set(widget, 'conversation_font')
@@ -943,7 +946,8 @@ 'outmsgtxtcolor': ['outgoing_msg_colorbutton', 'outgoing_msg_checkbutton'], 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton'} + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} for c in col_to_widget: col = gajim.config.get(c) if col: @@ -971,7 +975,8 @@ 'inmsgtxtcolor': 'incoming_msg_colorbutton', 'outmsgtxtcolor': 'outgoing_msg_colorbutton', 'statusmsgcolor': 'status_msg_colorbutton', - 'urlmsgcolor': 'url_msg_colorbutton'} + 'urlmsgcolor': 'url_msg_colorbutton', + 'markedmsgcolor': 'muc_highlight_colorbutton'} for c in col_to_widget: gajim.config.set(c, gajim.interface.default_colors[c]) self.draw_color_widgets() diff -r 20066547330e -r f012fc8afd48 src/gui_interface.py --- a/src/gui_interface.py Sun Aug 25 14:07:49 2013 +0200 +++ b/src/gui_interface.py Sun Aug 25 15:23:22 2013 +0200 @@ -2723,6 +2723,7 @@ 'outmsgtxtcolor': gajim.config.get('outmsgtxtcolor'), 'statusmsgcolor': gajim.config.get('statusmsgcolor'), 'urlmsgcolor': gajim.config.get('urlmsgcolor'), + 'markedmsgcolor': gajim.config.get('markedmsgcolor'), }
self.handlers = {}