copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add markedmsgcolor option to GUI. Fixes #7436

This commit is contained in:
Yann Leboulanger 2013-08-25 15:23:22 +02:00
parent 077a6f08bf
commit 9ab803ca63
3 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
data/gui/preferences_window.ui
View File

@ -1880,7 +1880,7 @@ $T will be replaced by auto-not-available timeout</property>
<object class="GtkTable" id="table25">
<property name="visible">True</property>
<property name="can_focus">False</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>
@ -2021,8 +2021,8 @@ $T will be replaced by auto-not-available timeout</property>
</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>
@ -2287,6 +2287,57 @@ $T will be replaced by auto-not-available timeout</property>
<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>

9
src/config.py
View File

@ -926,6 +926,9 @@ class PreferencesWindow:
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')
@ -946,7 +949,8 @@ class PreferencesWindow:
'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:
@ -974,7 +978,8 @@ class PreferencesWindow:
'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()

1
src/gui_interface.py
View File

@ -2665,6 +2665,7 @@ class Interface:
'outmsgtxtcolor': gajim.config.get('outmsgtxtcolor'),
'statusmsgcolor': gajim.config.get('statusmsgcolor'),
'urlmsgcolor': gajim.config.get('urlmsgcolor'),
'markedmsgcolor': gajim.config.get('markedmsgcolor'),
}
self.handlers = {}