diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade index 831599d4b..b604fb39d 100644 --- a/data/glade/preferences_window.glade +++ b/data/glade/preferences_window.glade @@ -127,96 +127,28 @@ 6 6 - + True - If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons - - - True - 0 - 1 - Emoticons: - - + 0 + 1 + Treat all incoming messages as: + 1 + 2 GTK_FILL - + True - - - - 1 - 2 - GTK_FILL - - - - - True - _Highlight misspelled words + 0 + 1 + Use only one message _window: True - 0 - True - + one_window_type_combobox - 2 - 5 - 6 - GTK_FILL - - - - - True - True - Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text. - Ignore rich content in incoming messages - True - 0 - True - - - - 2 - 4 - 5 - GTK_FILL - - - - - True - Hides buttons in chatwindows to - _Make message windows compact - True - 0 - True - - - - 2 - 3 - 4 - GTK_FILL - - - - - True - Never -Always -Per account -Per type - - - - 1 - 2 2 3 GTK_FILL @@ -239,30 +171,98 @@ Single message - + True - 0 - 1 - Use only one message _window: - True - one_window_type_combobox + Never +Always +Per account +Per type + + 1 + 2 2 3 GTK_FILL - - True - 0 - 1 - Treat all incoming messages as: + + True + Hides buttons in chatwindows to + _Make message windows compact + True + 0 + True + + + + 2 + 3 + 4 + GTK_FILL + + + + + True + True + Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text. + Ignore rich content in incoming messages + True + 0 + True + + + + 2 + 4 + 5 + GTK_FILL + + + + + True + _Highlight misspelled words + True + 0 + True + + + + 2 + 5 + 6 + GTK_FILL + + + + + True + + + + 1 + 2 + GTK_FILL + + + + + True + If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons + + + True + 0 + 1 + Emoticons: + + - 1 - 2 GTK_FILL @@ -307,69 +307,26 @@ Single message 6 6 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + 2 4 - - - - - True - True - If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...) - Use _transports iconsets - True - 0 - True - - - - 4 - 2 - 3 - - - - - True - - - - 1 - 2 1 2 - GTK_FILL - GTK_FILL - + True 0 - Status _iconset: + T_heme: True - iconset_combobox + theme_combobox - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - - - - 1 - 2 GTK_FILL GTK_FILL @@ -392,28 +349,71 @@ Single message - + True - 0 - T_heme: - True - theme_combobox + + 1 + 2 GTK_FILL GTK_FILL - + + True + 0 + Status _iconset: + True + iconset_combobox + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...) + Use _transports iconsets + True + 0 + True + + + + 4 + 2 + 3 + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + 3 4 - 1 - 2 @@ -474,36 +474,33 @@ Single message 6 6 - - True - True - Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster - _Ignore events from contacts not in the roster - True - 0 - True - - - - 2 - 2 - 3 - GTK_FILL - - - - + True All chat states Composing only Disabled - + 1 2 - 1 - 2 + GTK_FILL + + + + + True + Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party. + + + True + 0 + _Send chat state notifications: + True + + + + GTK_FILL @@ -527,33 +524,36 @@ Disabled - - True - Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party. - - - True - 0 - _Send chat state notifications: - True - - - - - GTK_FILL - - - - + True All chat states Composing only Disabled - + 1 2 + 1 + 2 + GTK_FILL + + + + + True + True + Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster + _Ignore events from contacts not in the roster + True + 0 + True + + + + 2 + 2 + 3 GTK_FILL @@ -599,132 +599,55 @@ Disabled 12 6 - - True - 0 - _Incoming message: - True - GTK_JUSTIFY_CENTER - True - incoming_msg_colorbutton - - - GTK_FILL - - - - - + True True - True - True - True - 0 - - - - 1 - 2 - - - - - - - True - 0 - _Outgoing message: + Use system _default True - GTK_JUSTIFY_CENTER - True - outgoing_msg_colorbutton + 0 + True + 2 - 3 - GTK_FILL - - - - - - True - True - 0 - - - - 3 4 + 3 + 4 GTK_FILL - + True - 0 - _Status message: - True - GTK_JUSTIFY_CENTER - True - status_msg_colorbutton + 6 + + + True + 0 + _Font: + True + conversation_fontbutton + + + + + True + True + 0 + + + + False + 1 + + - 1 - 2 - GTK_FILL - - - - - - True - True - 0 - - - - 1 2 - 1 - 2 - - - - - - - True - 0 - _URL: - True - url_msg_colorbutton - - - 2 - 3 - 1 - 2 + 3 + 4 GTK_FILL - - - - - - True - True - 0 - - - - 3 - 4 - 1 - 2 - GTK_FILL - @@ -796,53 +719,130 @@ Disabled - + True - 6 - - - True - 0 - _Font: - True - conversation_fontbutton - - - - - True - True - 0 - - - - False - 1 - - + True + 0 + - 2 - 3 - 4 + 3 + 4 + 1 + 2 GTK_FILL + - + True - True - Use system _default + 0 + _URL: True - 0 - True - + url_msg_colorbutton 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + True + 0 + + + + 1 + 2 + 1 + 2 + + + + + + + True + 0 + _Status message: + True + GTK_JUSTIFY_CENTER + True + status_msg_colorbutton + + + 1 + 2 + GTK_FILL + + + + + + True + True + 0 + + + + 3 4 - 3 - 4 + GTK_FILL + + + + + + True + 0 + _Outgoing message: + True + GTK_JUSTIFY_CENTER + True + outgoing_msg_colorbutton + + + 2 + 3 + GTK_FILL + + + + + + True + True + True + True + True + 0 + + + + 1 + 2 + + + + + + + True + 0 + _Incoming message: + True + GTK_JUSTIFY_CENTER + True + incoming_msg_colorbutton + + GTK_FILL @@ -1249,88 +1249,33 @@ Show only in roster 12 6 - + True True - Auto _away after: - True - 0 - True - + The auto not available status message + - GTK_FILL + 3 + 4 + 1 + 2 - + True True - Auto _not available after: - True - 0 - True - + The auto away status message + - 1 - 2 - GTK_FILL + 3 + 4 - - - True - 0 - minutes - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - minutes - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - - - 50 - True - True - 12 1 720 1 10 10 - 1 - - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - True @@ -1357,30 +1302,85 @@ Show only in roster - + True - True - The auto away status message - + 1 + 0 + + + 50 + True + True + 12 1 720 1 10 10 + 1 + + + - 3 - 4 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + minutes + + + 2 + 3 + 1 + 2 + GTK_FILL - + True - True - The auto not available status message - + 0 + minutes + + + 2 + 3 + GTK_FILL + + + + + + True + True + Auto _not available after: + True + 0 + True + - 3 - 4 1 2 + GTK_FILL + + + + + + True + True + Auto _away after: + True + 0 + True + + + + GTK_FILL @@ -1643,6 +1643,193 @@ Show only in roster False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Publish _Mood + True + 0 + True + + + + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Publish _Activity + True + 0 + True + + + + False + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Publish _Tune + True + 0 + True + + + + False + 2 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Publish Personal Events</b> + True + + + label_item + + + + + False + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Subscribe to M_ood + True + 0 + True + + + + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Subscribe to A_ctivity + True + 0 + True + + + + False + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Subscribe to T_une + True + 0 + True + + + + False + 2 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Subscribe to Personal Events</b> + True + + + label_item + + + + + False + 1 + + + + + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Personal Events + + + tab + 4 + False + + True @@ -1690,56 +1877,16 @@ Custom 12 6 - - True - 0 - _Browser: - True - custom_browser_entry - - - GTK_FILL - - - - - - True - 0 - _Mail client: - True - custom_mail_client_entry - - - 1 - 2 - GTK_FILL - - - - - + True True - - - - 1 - 2 - 1 - 2 - - - - - - True - True - + 1 2 + 2 + 3 @@ -1759,16 +1906,56 @@ Custom - + True True - + 1 2 - 2 - 3 + + + + + + True + True + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + _Mail client: + True + custom_mail_client_entry + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Browser: + True + custom_browser_entry + + + GTK_FILL @@ -2037,7 +2224,7 @@ Custom - 4 + 5 @@ -2045,193 +2232,6 @@ Custom True Advanced - - tab - 4 - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Publish _Mood - True - 0 - True - - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Publish _Activity - True - 0 - True - - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Publish _Tune - True - 0 - True - - - - False - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Publish Personal Events</b> - True - - - label_item - - - - - False - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - GTK_SHADOW_NONE - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Subscribe to M_ood - True - 0 - True - - - - False - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Subscribe to A_ctivity - True - 0 - True - - - - False - 1 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Subscribe to T_une - True - 0 - True - - - - False - 2 - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Subscribe to Personal Events</b> - True - - - label_item - - - - - False - 1 - - - - - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Personal Events - tab 5 diff --git a/src/config.py b/src/config.py index e2a8999dc..b344e3203 100644 --- a/src/config.py +++ b/src/config.py @@ -542,7 +542,7 @@ class PreferencesWindow: self.notebook.set_current_page(0) if not gajim.config.get('use_pep'): - self.notebook.remove_page(5) + self.notebook.remove_page(4) self.window.show_all() gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)