Changeset 9154 for branches/one_window/src/common/config.py

Timestamp:

12/15/07 22:04:49 (11 months ago)

Author:

nicfit

Message:

Scratch the chckbox for with roster mode, use one_message_window opt and combo

Files:

• branches/one_window/src/common/config.py (modified) (2 diffs)

branches/one_window/src/common/config.py

@@ -46 +46 @@
 opt_bool = [ 'boolean', 0 ]
 opt_color = [ 'color', '^(#[0-9a-fA-F]{6})|()$' ]
-opt_one_window_types = ['never', 'always', 'peracct', 'pertype']
+opt_one_window_types = ['never', 'always', 'always_with_roster', 'peracct', 'pertype']
 opt_treat_incoming_messages = ['', 'chat', 'normal']
 
@@ -230 +230 @@
                 'one_message_window': [opt_str, 'always',
 #always, never, peracct, pertype should not be translated
-                        _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect.')],
-                'one_message_window_with_roster': [opt_bool, False,
-                                _('If True, messages will appear in the roster instead of a separate window.  This option has no effect if one_message_window is not \'always\'')],
+                        _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window.')],
                 'show_avatar_in_chat': [opt_bool, True, _('If False, you will no longer see the avatar in the chat window.')],
                 'escape_key_closes': [opt_bool, True, _('If True, pressing the escape key closes a tab/window.')],