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

Timestamp:

01/06/07 12:00:50 (23 months ago)

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Files:

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

branches/gajim_0.11/src/config.py

@@ -85 +85 @@
                 self.one_window_type_combobox =\
                         self.xml.get_widget('one_window_type_combobox')
+                self.treat_incoming_messages_combobox =\
+                        self.xml.get_widget('treat_incoming_messages_combobox')
 
                 #FIXME: remove when ANC will be implemented
@@ -141 +143 @@
                         emoticons_combobox.set_active(len(l)-1)
 
-                #iconset
+                # iconset
                 iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets'))
                 # new model, image in 0, string in 1
@@ -183 +185 @@
                         self.one_window_type_combobox.set_active(0)
 
+                # Set default for treat incoming messages
+                choices = common.config.opt_treat_incoming_messages
+                type = gajim.config.get('treat_incoming_messages')
+                if type in choices:
+                        self.treat_incoming_messages_combobox.set_active(choices.index(type))
+                else:
+                        self.treat_incoming_messages_combobox.set_active(0)
+
                 # Use transports iconsets
                 st = gajim.config.get('use_transports_iconsets')
@@ -354 +364 @@
                                         break
 
-                #sounds treeview
+                # sounds treeview
                 self.sound_tree = self.xml.get_widget('sounds_treeview')
                 
@@ -381 +391 @@
                 self.auto_away_checkbutton.set_active(st)
 
-                #Autoawaytime
+                # Autoawaytime
                 st = gajim.config.get('autoawaytime')
                 self.auto_away_time_spinbutton.set_value(st)
                 self.auto_away_time_spinbutton.set_sensitive(gajim.config.get('autoaway'))
 
-                #autoaway message
+                # autoaway message
                 st = gajim.config.get('autoaway_message')
                 self.auto_away_message_entry.set_text(st)
                 self.auto_away_message_entry.set_sensitive(gajim.config.get('autoaway'))
 
-                #Autoxa
+                # Autoxa
                 st = gajim.config.get('autoxa')
                 self.auto_xa_checkbutton.set_active(st)
 
-                #Autoxatime
+                # Autoxatime
                 st = gajim.config.get('autoxatime')
                 self.auto_xa_time_spinbutton.set_value(st)
                 self.auto_xa_time_spinbutton.set_sensitive(gajim.config.get('autoxa'))
 
-                #autoxa message
+                # autoxa message
                 st = gajim.config.get('autoxa_message')
                 self.auto_xa_message_entry.set_text(st)
                 self.auto_xa_message_entry.set_sensitive(gajim.config.get('autoxa'))
 
-                #ask_status when online / offline
+                # ask_status when online / offline
                 st = gajim.config.get('ask_online_status')
                 self.xml.get_widget('prompt_online_status_message_checkbutton').\
@@ -439 +449 @@
                 self.fill_default_msg_treeview()
 
-                #Status messages
+                # Status messages
                 self.msg_tree = self.xml.get_widget('msg_treeview')
                 model = gtk.ListStore(str, str)
@@ -454 +464 @@
                 buf.connect('changed', self.on_msg_textview_changed)
 
-                #open links with
+                # open links with
                 if os.name == 'nt':
                         applications_frame = self.xml.get_widget('applications_frame')
@@ -493 +503 @@
                 self.xml.get_widget('send_os_info_checkbutton').set_active(st)
 
+                # send os info
+                st = gajim.config.get('check_if_gajim_is_default')
+                self.xml.get_widget('check_default_client_checkbutton').set_active(st)
+
                 # set status msg from currently playing music track
                 widget = self.xml.get_widget(
@@ -646 +660 @@
                 gajim.interface.save_config()
                 gajim.interface.msg_win_mgr.reconfig()
+
+        def on_treat_incoming_messages_combobox_changed(self, widget):
+                active = widget.get_active()
+                config_type = common.config.opt_treat_incoming_messages[active]
+                gajim.config.set('treat_incoming_messages', config_type)
 
         def apply_speller(self):
@@ -998 +1017 @@
         def on_send_os_info_checkbutton_toggled(self, widget):
                 self.on_checkbutton_toggled(widget, 'send_os_info')
-                
+
+        def on_check_default_client_checkbutton_toggled(self, widget):
+                self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default')
+
         def on_notify_gmail_checkbutton_toggled(self, widget):
                 self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email')
@@ -1004 +1026 @@
         def on_notify_gmail_extra_checkbutton_toggled(self, widget):
                 self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email_extra')
-                
+
         def fill_msg_treeview(self):
                 self.xml.get_widget('delete_msg_button').set_sensitive(False)
@@ -1468 +1490 @@
                         gajim.status_before_autoaway[name] = \
                                 gajim.status_before_autoaway[self.account]
+                        gajim.transport_avatar[name] = gajim.transport_avatar[self.account]
 
                         gajim.contacts.change_account_name(self.account, name)
@@ -1494 +1517 @@
                         del gajim.last_message_time[self.account]
                         del gajim.status_before_autoaway[self.account]
+                        del gajim.transport_avatar[self.account]
                         gajim.connections[self.account].name = name
                         gajim.connections[name] = gajim.connections[self.account]
@@ -2055 +2079 @@
                         del gajim.last_message_time[gajim.ZEROCONF_ACC_NAME]
                         del gajim.status_before_autoaway[gajim.ZEROCONF_ACC_NAME]
+                        del gajim.transport_avatar[gajim.ZEROCONF_ACC_NAME]
                         if len(gajim.connections) >= 2:
                                 # Do not merge accounts if only one exists
@@ -2085 +2110 @@
                         gajim.last_message_time[gajim.ZEROCONF_ACC_NAME] = {}
                         gajim.status_before_autoaway[gajim.ZEROCONF_ACC_NAME] = ''
+                        gajim.transport_avatar[gajim.ZEROCONF_ACC_NAME] = {}
                         # refresh accounts window
                         if gajim.interface.instances.has_key('accounts'):
@@ -2333 +2359 @@
                 self.remove_button = {}
                 self.affiliation_treeview = {}
-                self.list_init = {} # list at the begining
+                self.list_init = {} # list at the beginning
                 ui_list = {'outcast': _('Ban List'),
                         'member': _('Member List'),
@@ -2416 +2442 @@
                 elif affiliation == 'owner':
                         title = _('Adding Owner...')
-                        prompt = _('<b>Whom do you want to make a owner?</b>\n\n')
+                        prompt = _('<b>Whom do you want to make an owner?</b>\n\n')
                 else:
                         title = _('Adding Administrator...')
@@ -2588 +2614 @@
                 del gajim.last_message_time[self.account]
                 del gajim.status_before_autoaway[self.account]
+                del gajim.transport_avatar[self.account]
                 if len(gajim.connections) >= 2: # Do not merge accounts if only one exists
                         gajim.interface.roster.regroup = gajim.config.get('mergeaccounts') 
@@ -3064 +3091 @@
                                 finish_text = '<big><b>%s</b></big>\n\n%s' % (
                                         _('Account has been added successfully'),
-                                        _('You can set advanced account options by pressing Advanced '
-                                        'button, or later by clicking in Accounts menuitem under Edit '
-                                        'menu from the main window.'))
+                                        _('You can set advanced account options by pressing the '
+                                        'Advanced button, or later by choosing the Accounts menuitem '
+                                        'under the Edit menu from the main window.'))
                                 self.finish_label.set_markup(finish_text)
                                 self.finish_button.show()
@@ -3099 +3126 @@
                 finish_text = '<big><b>%s</b></big>\n\n%s' % (
                         _('Your new account has been created successfully'),
-                        _('You can set advanced account options by pressing Advanced button, '
-                        'or later by clicking in Accounts menuitem under Edit menu from the '
-                        'main window.'))
+                        _('You can set advanced account options by pressing the Advanced '
+                        'button, or later by choosing the Accounts menuitem under the Edit '
+                        'menu from the main window.'))
                 self.finish_label.set_markup(finish_text)
                 self.notebook.set_current_page(3) # show finish page
@@ -3116 +3143 @@
                 img = self.xml.get_widget('finish_image')
                 img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
-                finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occured during '
+                finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occurred during '
                         'account creation') , reason)
                 self.finish_label.set_markup(finish_text)
@@ -3231 +3258 @@
                 gajim.last_message_time[self.account] = {}
                 gajim.status_before_autoaway[self.account] = ''
+                gajim.transport_avatar[self.account] = {}
                 # refresh accounts window
                 if gajim.interface.instances.has_key('accounts'):