From bdee7369781c521819aab346e25fe935a5c7f01f Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 1 Mar 2009 14:28:55 +0000 Subject: [PATCH] fix focus problem in pref window. see #4835 --- data/glade/preferences_window.glade | 909 ++++++++++++++-------------- 1 file changed, 453 insertions(+), 456 deletions(-) diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade index 8f7df6a7f..b366b90fd 100644 --- a/data/glade/preferences_window.glade +++ b/data/glade/preferences_window.glade @@ -211,62 +211,37 @@ 6 6 - + + 50 True - 0 - 1 - _Window behavior: - True - one_window_type_combobox - - - 1 - 2 - GTK_FILL - - - - - True - + Detached roster with detached chats +Detached roster with single chat +Single window for everything +Detached roster with chat grouped by account +Detached roster with chat grouped by type + 1 2 + 1 + 2 - - True - If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons - - - True - 0 - 1 - _Emoticons: - True - - - - - GTK_FILL - - - - + True - Hide all buttons in chat windows - Ma_ke message windows compact + If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat. + _Highlight misspelled words True 0 True - + 2 - 2 - 3 + 4 + 5 GTK_FILL @@ -289,38 +264,63 @@ - + True - If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat. - _Highlight misspelled words + Hide all buttons in chat windows + Ma_ke message windows compact True 0 True - + 2 - 4 - 5 + 2 + 3 GTK_FILL - - 50 + True - Detached roster with detached chats -Detached roster with single chat -Single window for everything -Detached roster with chat grouped by account -Detached roster with chat grouped by type - + If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons + + + True + 0 + 1 + _Emoticons: + True + + + + + GTK_FILL + + + + + True + 1 2 + + + + + True + 0 + 1 + _Window behavior: + True + one_window_type_combobox + + 1 2 + GTK_FILL @@ -730,18 +730,33 @@ Always 6 6 - + True All chat states Composing only Disabled - + 1 2 - 1 - 2 + + + + + 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 @@ -764,33 +779,18 @@ 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 @@ -854,90 +854,37 @@ Disabled 12 6 - + True True - If checked, Gajim will change status to Away when the computer is unused. - _Away after: - True - 0 - True - + The auto not available status message. If empty, Gajim will not change the current status message +$S will be replaced by previous status message +$T will be replaced by auto-not-available timeout + - GTK_FILL + 3 + 4 + 1 + 2 - + True True - If checked, Gajim will change status to Not Available when the computer has not been used even longer - _Not available after: - True - 0 - True - + The auto away status message. If empty, Gajim will not change the current status message +$S will be replaced by previous status message +$T will be replaced by auto-away timeout + - 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 @@ -964,34 +911,87 @@ Disabled - + True - True - The auto away status message. If empty, Gajim will not change the current status message -$S will be replaced by previous status message -$T will be replaced by auto-away timeout - + 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. If empty, Gajim will not change the current status message -$S will be replaced by previous status message -$T will be replaced by auto-not-available timeout - + 0 + minutes + + + 2 + 3 + GTK_FILL + + + + + + True + True + If checked, Gajim will change status to Not Available when the computer has not been used even longer + _Not available after: + True + 0 + True + - 3 - 4 1 2 + GTK_FILL + + + + + + True + True + If checked, Gajim will change status to Away when the computer is unused. + _Away after: + True + 0 + True + + + + GTK_FILL @@ -1151,6 +1151,46 @@ $T will be replaced by auto-not-available timeout + + + True + True + GTK_POLICY_NEVER + GTK_POLICY_NEVER + GTK_SHADOW_IN + + + True + True + 3 + GTK_WRAP_WORD + + + + + 1 + 2 + GTK_FILL + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + False + + + + + + True @@ -1189,46 +1229,6 @@ $T will be replaced by auto-not-available timeout GTK_FILL - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_IN - - - True - True - 3 - GTK_WRAP_WORD - - - - - 1 - 2 - GTK_FILL - - @@ -1291,15 +1291,14 @@ $T will be replaced by auto-not-available timeout - + True - True - 0 - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Chat message: - 1 - 2 + GTK_FILL + GTK_FILL @@ -1320,14 +1319,15 @@ $T will be replaced by auto-not-available timeout - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Chat message: + True + 0 + - GTK_FILL - GTK_FILL + 1 + 2 @@ -1377,62 +1377,18 @@ $T will be replaced by auto-not-available timeout - - 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 icons - True - 0 - True - - - - 1 - 3 - 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 - - True @@ -1451,18 +1407,62 @@ $T will be replaced by auto-not-available timeout - + True - 0 - T_heme: - True - theme_combobox + + 1 + 2 + + + + + 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 icons + True + 0 + True + + + + 1 + 3 + 2 + 3 + + @@ -1501,135 +1501,6 @@ $T will be replaced by auto-not-available timeout 4 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: - True - GTK_JUSTIFY_CENTER - True - outgoing_msg_colorbutton - - - 2 - 3 - GTK_FILL - - - - - - True - True - 0 - - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - _Status message: - True - GTK_JUSTIFY_CENTER - True - status_msg_colorbutton - - - 1 - 2 - GTK_FILL - - - - - - True - True - 0 - - - - 1 - 2 - 1 - 2 - - - - - - - True - 0 - _URL highlight: - True - url_msg_colorbutton - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - True - 0 - - - - 3 - 4 - 1 - 2 - GTK_FILL - - - True @@ -1698,6 +1569,132 @@ $T will be replaced by auto-not-available timeout GTK_FILL + + + True + True + 0 + + + + 3 + 4 + 1 + 2 + GTK_FILL + + + + + + True + 0 + _URL highlight: + 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 + GTK_FILL + + + + + + True + 0 + _Outgoing message: + True + GTK_JUSTIFY_CENTER + True + outgoing_msg_colorbutton + + + 2 + 3 + GTK_FILL + + + + + + True + True + 0 + + + + 1 + 2 + + + + + + + True + 0 + _Incoming message: + True + GTK_JUSTIFY_CENTER + True + incoming_msg_colorbutton + + + GTK_FILL + + + @@ -1782,60 +1779,18 @@ Custom 12 6 - - True - True - - - - 1 - 2 - 2 - 3 - - - - - + True 0 - _File manager: + _Browser: True - custom_file_manager_entry + custom_browser_entry - 2 - 3 GTK_FILL - - - True - True - - - - 1 - 2 - - - - - - True - True - - - - 1 - 2 - 1 - 2 - - - True @@ -1852,18 +1807,60 @@ Custom - + True - 0 - _Browser: - True - custom_browser_entry + True + + 1 + 2 + 1 + 2 + + + + + + True + True + + + + 1 + 2 + + + + + + True + 0 + _File manager: + True + custom_file_manager_entry + + + 2 + 3 GTK_FILL + + + True + True + + + + 1 + 2 + 2 + 3 + + + @@ -1924,18 +1921,19 @@ Custom 6 6 - + True True - If checked, Gajim will ignore incoming events from unauthorized contacts. 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 + If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged. + Log _encrypted chat session True 0 True - + - GTK_FILL + 2 + 3 @@ -1955,19 +1953,18 @@ Custom - + True True - If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged. - Log _encrypted chat session + If checked, Gajim will ignore incoming events from unauthorized contacts. 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 - 3 + GTK_FILL