Changeset 7829 for branches/gajim_0.11/src/config.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/config.py (modified) (7 diffs)

branches/gajim_0.11/src/config.py

@@ -241 +241 @@
                         self.xml.get_widget('time_always_radiobutton').set_active(True)
 
-                # before time
-                st = gajim.config.get('before_time')
+                # TimeStamp
+                st = gajim.config.get('time_stamp')
                 st = helpers.from_one_line(st)
-                self.xml.get_widget('before_time_textview').get_buffer().set_text(st)
-
-                # after time
-                st = gajim.config.get('after_time')
-                st = helpers.from_one_line(st)
-                self.xml.get_widget('after_time_textview').get_buffer().set_text(st)
+                self.xml.get_widget('time_stamp_textview').get_buffer().set_text(st)
 
                 # before nickname
@@ -718 +713 @@
                 
         def _set_sensitivity_for_before_after_time_widgets(self, sensitive):
-                self.xml.get_widget('before_time_label').set_sensitive(sensitive)
-                self.xml.get_widget('before_time_textview').set_sensitive(sensitive)
-                self.xml.get_widget('after_time_label').set_sensitive(sensitive)
-                self.xml.get_widget('after_time_textview').set_sensitive(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):
@@ -746 +739 @@
                 return buffer.get_text(begin, end).decode('utf-8')
 
-        def on_before_time_textview_focus_out_event(self, widget, event):
+        def on_time_stamp_textview_focus_out_event(self, widget, event):
                 text = self._get_textview_text(widget)
                 text = helpers.to_one_line(text)
-                gajim.config.set('before_time', text)
-                gajim.interface.save_config()
-
-        def on_after_time_textview_focus_out_event(self, widget, event):
-                text = self._get_textview_text(widget)
-                text = helpers.to_one_line(text)
-                gajim.config.set('after_time', text)
+                gajim.config.set('time_stamp', text)
                 gajim.interface.save_config()
 
@@ -1059 +1046 @@
                 iter = model.append()
                 model.set(iter, 0, _('status message title'), 1, _('status message text'))
+                self.msg_tree.set_cursor(model.get_path(iter))
 
         def on_delete_msg_button_clicked(self, widget, data = None):
@@ -2671 +2659 @@
 
                 self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'),
-                        'in_and_out': _('Enter and leave only'), 'none': _('None')}
+                        'in_and_out': _('Enter and leave only'),
+                        'none': _('?print_status:None')}
                 opts = self.option_list.keys()
                 opts.sort()
@@ -2721 +2710 @@
 
         def on_add_bookmark_button_clicked(self, widget):
-                '''
-                Add a new bookmark.
-                '''
+                '''Add a new bookmark.'''
                 # Get the account that is currently used
                 # (the parent of the currently selected item)
@@ -2741 +2728 @@
                 account = model[add_to][1].decode('utf-8')
                 nick = gajim.nicks[account]
-                self.treestore.append(add_to, [account, _('New Group Chat'), '', False,
-                        '', nick, 'in_and_out'])
+                iter_ = self.treestore.append(add_to, [account, _('New Group Chat'), '',
+                        False, '', nick, 'in_and_out'])
+                self.view.set_cursor(model.get_path(iter_))
 
                 self.view.expand_row(model.get_path(add_to), True)