Add some correction to ([7838]remove timestamp and before/after_nickname from GUI).
Fixes #2913.
This commit is contained in:
parent
2113d1a326
commit
a8eeb56cb4
2 changed files with 1 additions and 10 deletions
|
@ -372,6 +372,6 @@ class OptionsParser:
|
||||||
def update_config_to_01101(self):
|
def update_config_to_01101(self):
|
||||||
'''fill time_stamp from before_time and after_time'''
|
'''fill time_stamp from before_time and after_time'''
|
||||||
if self.old_values.has_key('before_time'):
|
if self.old_values.has_key('before_time'):
|
||||||
gajim.config.set('time_stamp', '%s%%H:%%M%s ' % (
|
gajim.config.set('time_stamp', '%s%%X%s ' % (
|
||||||
self.old_values['before_time'], self.old_values['after_time']))
|
self.old_values['before_time'], self.old_values['after_time']))
|
||||||
gajim.config.set('version', '0.11.0.1')
|
gajim.config.set('version', '0.11.0.1')
|
||||||
|
|
|
@ -233,10 +233,8 @@ class PreferencesWindow:
|
||||||
|
|
||||||
if gajim.config.get('print_time') == 'never':
|
if gajim.config.get('print_time') == 'never':
|
||||||
self.xml.get_widget('time_never_radiobutton').set_active(True)
|
self.xml.get_widget('time_never_radiobutton').set_active(True)
|
||||||
self._set_sensitivity_for_before_after_time_widgets(False)
|
|
||||||
elif gajim.config.get('print_time') == 'sometimes':
|
elif gajim.config.get('print_time') == 'sometimes':
|
||||||
self.xml.get_widget('time_sometimes_radiobutton').set_active(True)
|
self.xml.get_widget('time_sometimes_radiobutton').set_active(True)
|
||||||
self._set_sensitivity_for_before_after_time_widgets(False)
|
|
||||||
else:
|
else:
|
||||||
self.xml.get_widget('time_always_radiobutton').set_active(True)
|
self.xml.get_widget('time_always_radiobutton').set_active(True)
|
||||||
|
|
||||||
|
@ -696,26 +694,19 @@ class PreferencesWindow:
|
||||||
def on_xhtml_checkbutton_toggled(self, widget):
|
def on_xhtml_checkbutton_toggled(self, widget):
|
||||||
self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml')
|
self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml')
|
||||||
|
|
||||||
def _set_sensitivity_for_before_after_time_widgets(self, sensitive):
|
|
||||||
self.xml.get_widget('time_stamp_label').set_sensitive(sensitive)
|
|
||||||
self.xml.get_widget('time_stamp_textview').set_sensitive(sensitive)
|
|
||||||
|
|
||||||
def on_time_never_radiobutton_toggled(self, widget):
|
def on_time_never_radiobutton_toggled(self, widget):
|
||||||
if widget.get_active():
|
if widget.get_active():
|
||||||
gajim.config.set('print_time', 'never')
|
gajim.config.set('print_time', 'never')
|
||||||
self._set_sensitivity_for_before_after_time_widgets(False)
|
|
||||||
gajim.interface.save_config()
|
gajim.interface.save_config()
|
||||||
|
|
||||||
def on_time_sometimes_radiobutton_toggled(self, widget):
|
def on_time_sometimes_radiobutton_toggled(self, widget):
|
||||||
if widget.get_active():
|
if widget.get_active():
|
||||||
gajim.config.set('print_time', 'sometimes')
|
gajim.config.set('print_time', 'sometimes')
|
||||||
self._set_sensitivity_for_before_after_time_widgets(False)
|
|
||||||
gajim.interface.save_config()
|
gajim.interface.save_config()
|
||||||
|
|
||||||
def on_time_always_radiobutton_toggled(self, widget):
|
def on_time_always_radiobutton_toggled(self, widget):
|
||||||
if widget.get_active():
|
if widget.get_active():
|
||||||
gajim.config.set('print_time', 'always')
|
gajim.config.set('print_time', 'always')
|
||||||
self._set_sensitivity_for_before_after_time_widgets(True)
|
|
||||||
gajim.interface.save_config()
|
gajim.interface.save_config()
|
||||||
|
|
||||||
def update_text_tags(self):
|
def update_text_tags(self):
|
||||||
|
|
Loading…
Add table
Reference in a new issue