changeset 306ec49ae6d4 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=306ec49ae6d4 description: Add GUI option for message carbons

diffstat:

data/gui/accounts_window.ui | 18 +++++++++++++++++- src/config.py | 8 ++++++++ 2 files changed, 25 insertions(+), 1 deletions(-)

diffs (60 lines):

diff -r 61b1a4500470 -r 306ec49ae6d4 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Tue Nov 11 15:32:10 2014 +0100 +++ b/data/gui/accounts_window.ui Tue Nov 11 16:03:26 2014 +0100 @@ -573,6 +573,22 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="carbons_checkbutton1"> + <property name="label" translatable="yes">Receive conversations from other resources (If server supports it)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_carbons_checkbutton_toggled"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="use_ft_proxies_checkbutton1"> <property name="label" translatable="yes">Use file transfer proxies</property> <property name="visible">True</property> @@ -586,7 +602,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object> diff -r 61b1a4500470 -r 306ec49ae6d4 src/config.py --- a/src/config.py Tue Nov 11 15:32:10 2014 +0100 +++ b/src/config.py Tue Nov 11 16:03:26 2014 +0100 @@ -1996,6 +1996,8 @@ self.xml.get_object('sync_with_global_status_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'sync_with_global_status')) + self.xml.get_object('carbons_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'enable_message_carbons')) self.xml.get_object('use_ft_proxies_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'use_ft_proxies'))

@@ -2351,6 +2353,12 @@ account=self.current_account) gajim.interface.roster.update_status_combobox()

+ def on_carbons_checkbutton_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'enable_message_carbons', + account=self.current_account) + def on_use_ft_proxies_checkbutton1_toggled(self, widget): if self.ignore_events: return