From de169b4feeeaf2013aa256ddf70276bacbd6542a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 10 Feb 2009 02:51:52 +0000 Subject: Rewrite the signature management UI from top to bottom. - Break the UI out of Glade and into small, manageable widgets: ESignatureEditor (moved from mail to widgets/misc) ESignatureManager ESignatureTreeView ESignatureScriptDialog - Move several signature utilities to e-util/e-signature-utils.c so they're accessible from widgets/misc without introducing circular dependences. - Have EMailShellModule listen for new GtkhtmlEditor windows (from which EMsgComposer and ESignatureEditor are derived) and configure the window with spelling and HTML editing user preferences. - Drastically simplifies em-composer-prefs.c. svn path=/branches/kill-bonobo/; revision=37239 --- mail/mail-config.glade | 1750 ++++++++++++++++++++++-------------------------- 1 file changed, 789 insertions(+), 961 deletions(-) (limited to 'mail/mail-config.glade') diff --git a/mail/mail-config.glade b/mail/mail-config.glade index d2d8da8ea7..42c691fb82 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -300,64 +300,64 @@ For example: "Work" or "Personal" 12 6 - + True True * - + 1 2 + 1 + 2 - + True 0 - Full Nam_e: + Email _Address: True - identity_full_name + identity_address + 1 + 2 GTK_FILL - + True 0 - Email _Address: + Full Nam_e: True - identity_address + identity_full_name - 1 - 2 GTK_FILL - + True True * - + 1 2 - 1 - 2 @@ -417,51 +417,75 @@ For example: "Work" or "Personal" 12 6 - + True - True - _Make this my default account + 0 + Signat_ure: True - 0 - True + signature_dropdown - 2 + 3 + 4 GTK_FILL - GTK_FILL + - + True - 0 - Re_ply-To: - True - GTK_JUSTIFY_CENTER - identity_reply_to + 6 + + + True + em_account_editor_dropdown_new + + + False + False + + + + + True + True + Add Ne_w Signature... + True + 0 + + + + False + False + GTK_PACK_END + 1 + + - 1 - 2 + 1 + 2 + 3 + 4 GTK_FILL - + GTK_FILL - + True True * - + 1 2 - 1 - 2 + 2 + 3 @@ -481,76 +505,52 @@ For example: "Work" or "Personal" - + True True * - + 1 2 - 2 - 3 + 1 + 2 - + True - 6 - - - True - em_account_editor_dropdown_new - - - False - False - - - - - True - True - Add Ne_w Signature... - True - 0 - - - - False - False - GTK_PACK_END - 1 - - + 0 + Re_ply-To: + True + GTK_JUSTIFY_CENTER + identity_reply_to - 1 - 2 - 3 - 4 + 1 + 2 GTK_FILL - GTK_FILL + - + True - 0 - Signat_ure: + True + _Make this my default account True - signature_dropdown + 0 + True - 3 - 4 + 2 GTK_FILL - + GTK_FILL @@ -601,28 +601,28 @@ For example: "Work" or "Personal" 12 6 - + True - em_account_editor_dropdown_new + 0 + Server _Type: + True + GTK_JUSTIFY_RIGHT + source_type_dropdown - 1 - 3 GTK_FILL - + True 0 0 - description - True + Description: + GTK_JUSTIFY_CENTER - 1 - 3 1 2 GTK_FILL @@ -630,14 +630,16 @@ For example: "Work" or "Personal" - + True 0 0 - Description: - GTK_JUSTIFY_CENTER + description + True + 1 + 3 1 2 GTK_FILL @@ -645,15 +647,13 @@ For example: "Work" or "Personal" - + True - 0 - Server _Type: - True - GTK_JUSTIFY_RIGHT - source_type_dropdown + em_account_editor_dropdown_new + 1 + 3 GTK_FILL @@ -716,34 +716,35 @@ For example: "Work" or "Personal" 12 6 - + True - Mailbox location + 0 + _Server: + True + source_host - 1 - 2 - 2 - 3 + GTK_FILL - + True 0 - _Path: + User_name: True + source_user - 2 - 3 + 1 + 2 GTK_FILL - + True True * @@ -751,13 +752,11 @@ For example: "Work" or "Personal" 1 2 - 1 - 2 - + True True * @@ -765,34 +764,35 @@ For example: "Work" or "Personal" 1 2 + 1 + 2 - + True 0 - User_name: + _Path: True - source_user - 1 - 2 + 2 + 3 GTK_FILL - + True - 0 - _Server: - True - source_host + Mailbox location - GTK_FILL + 1 + 2 + 2 + 3 @@ -1068,59 +1068,59 @@ For example: "Work" or "Personal" 12 6 - + True 0 0 - description - True + Server _Type: + True + GTK_JUSTIFY_RIGHT + transport_type_dropdown - 1 - 3 - 1 - 2 GTK_FILL - + True - em_account_editor_dropdown_new + 0 + 0 + Description: + GTK_JUSTIFY_RIGHT - 1 - 3 + 1 + 2 GTK_FILL - - + True - 0 - 0 - Description: - GTK_JUSTIFY_RIGHT + em_account_editor_dropdown_new - 1 - 2 + 1 + 3 GTK_FILL + - + True 0 0 - Server _Type: - True - GTK_JUSTIFY_RIGHT - transport_type_dropdown + description + True + 1 + 3 + 1 + 2 GTK_FILL @@ -1184,18 +1184,6 @@ For example: "Work" or "Personal" 2 12 6 - - - True - True - * - - - 1 - 2 - - - True @@ -1210,6 +1198,18 @@ For example: "Work" or "Personal" + + + True + True + * + + + 1 + 2 + + + False @@ -1400,6 +1400,50 @@ For example: "Work" or "Personal" 2 12 6 + + + True + 0 + T_ype: + True + GTK_JUSTIFY_CENTER + transport_auth_dropdown + + + GTK_FILL + + + + + + True + 0 + User_name: + True + GTK_JUSTIFY_RIGHT + transport_user + + + 1 + 2 + GTK_FILL + + + + + + True + True + * + + + 1 + 2 + 1 + 2 + + + True @@ -1443,50 +1487,6 @@ For example: "Work" or "Personal" GTK_FILL - - - True - True - * - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - User_name: - True - GTK_JUSTIFY_RIGHT - transport_user - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - T_ype: - True - GTK_JUSTIFY_CENTER - transport_auth_dropdown - - - GTK_FILL - - - False @@ -1607,57 +1607,45 @@ For example: "Work" or "Personal" - + True - - - True - True - gtk-revert-to-saved - True - 0 - - - False - False - - - - - True - - - 1 - - + 0 + Drafts _Folder: + True + drafts_button - 1 - 3 - 2 - 3 + GTK_FILL + - + True + 0 + Sent _Messages Folder: + True + sent_button - 2 - 3 1 2 GTK_FILL - GTK_FILL + - + True + em_account_editor_folder_selector_button_new + Select Sent Folder - 2 - 3 + 1 + 2 + 1 + 2 + GTK_FILL GTK_FILL @@ -1674,46 +1662,58 @@ For example: "Work" or "Personal" - + True - em_account_editor_folder_selector_button_new - Select Sent Folder - 1 - 2 - 1 - 2 - GTK_FILL + 2 + 3 GTK_FILL - + True - 0 - Sent _Messages Folder: - True - sent_button + 2 + 3 1 2 GTK_FILL - + GTK_FILL - + True - 0 - Drafts _Folder: - True - drafts_button + + + True + True + gtk-revert-to-saved + True + 0 + + + False + False + + + + + True + + + 1 + + - GTK_FILL - + 1 + 3 + 2 + 3 @@ -1777,14 +1777,14 @@ For example: "Work" or "Personal" 12 6 - + True 6 - + True True - Always _blind carbon-copy (bcc) to: + Alway_s carbon-copy (cc) to: True 0 True @@ -1795,10 +1795,10 @@ For example: "Work" or "Personal" - + True - + True 12 @@ -1808,16 +1808,16 @@ For example: "Work" or "Personal" - + True 6 2 - + True 6 - + True True * @@ -1836,20 +1836,16 @@ For example: "Work" or "Personal" - - 1 - 2 - - + True 6 - + True True - Alway_s carbon-copy (cc) to: + Always _blind carbon-copy (bcc) to: True 0 True @@ -1860,10 +1856,10 @@ For example: "Work" or "Personal" - + True - + True 12 @@ -1873,16 +1869,16 @@ For example: "Work" or "Personal" - + True 6 2 - + True 6 - + True True * @@ -1901,6 +1897,10 @@ For example: "Work" or "Personal" + + 1 + 2 + @@ -2202,25 +2202,145 @@ For example: "Work" or "Personal" 12 6 - + + True + True + * + + + 1 + 2 + 1 + 2 + + + + + + True + True + * + + + 1 + 2 + 5 + 6 + + + + + + True + True + Also encrypt to sel_f when sending encrypted messages + True + 0 + True + + + 3 + 4 + 5 + GTK_FILL + + + + + + True + True + Encrypt out_going messages (by default) + True + 0 + True + + + 3 + 3 + 4 + GTK_FILL + + + + + + True + True + Digitally sign o_utgoing messages (by default) + True + 0 + True + + + 3 + GTK_FILL + + + + + + True + + + 3 + 2 + 3 + GTK_FILL + GTK_FILL + 6 + + + + + True + 0 + Encry_ption certificate: + True + smime_encrypt_key + + + 5 + 6 + GTK_FILL + + + + + + True + 0 + Sig_ning certificate: + True + smime_sign_key + + + 1 + 2 + GTK_FILL + + + + + True 6 - + True True 0 - + True 0 0 - + True 2 - + True gtk-open @@ -2230,9 +2350,9 @@ For example: "Work" or "Personal" - + True - _Select... + S_elect... True @@ -2252,21 +2372,21 @@ For example: "Work" or "Personal" - + True True 0 - + True 0 0 - + True 2 - + True gtk-clear @@ -2276,9 +2396,9 @@ For example: "Work" or "Personal" - + True - Cle_ar + Clea_r True @@ -2302,32 +2422,32 @@ For example: "Work" or "Personal" 2 3 - 1 - 2 + 5 + 6 GTK_FILL GTK_FILL - + True 6 - + True True 0 - + True 0 0 - + True 2 - + True gtk-open @@ -2337,9 +2457,9 @@ For example: "Work" or "Personal" - + True - S_elect... + _Select... True @@ -2359,21 +2479,21 @@ For example: "Work" or "Personal" - + True True 0 - + True 0 0 - + True 2 - + True gtk-clear @@ -2383,9 +2503,9 @@ For example: "Work" or "Personal" - + True - Clea_r + Cle_ar True @@ -2409,130 +2529,10 @@ For example: "Work" or "Personal" 2 3 - 5 - 6 - GTK_FILL - GTK_FILL - - - - - True - 0 - Sig_ning certificate: - True - smime_sign_key - - 1 2 GTK_FILL - - - - - - True - 0 - Encry_ption certificate: - True - smime_encrypt_key - - - 5 - 6 - GTK_FILL - - - - - - True - - - 3 - 2 - 3 - GTK_FILL - GTK_FILL - 6 - - - - - True - True - Digitally sign o_utgoing messages (by default) - True - 0 - True - - - 3 - GTK_FILL - - - - - - True - True - Encrypt out_going messages (by default) - True - 0 - True - - - 3 - 3 - 4 - GTK_FILL - - - - - - True - True - Also encrypt to sel_f when sending encrypted messages - True - 0 - True - - - 3 - 4 - 5 - GTK_FILL - - - - - - True - True - * - - - 1 - 2 - 5 - 6 - - - - - - True - True - * - - - 1 - 2 - 1 - 2 - + GTK_FILL @@ -2764,63 +2764,63 @@ For example: "Work" or "Personal" 6 6 - + True 0 - Fix_ed width Font: + S_tandard Font: True GTK_JUSTIFY_RIGHT - FontFixed + FontVariable - 1 - 2 GTK_FILL - + True True 0 - Select HTML variable width font + Select HTML fixed width font 1 2 + 1 + 2 GTK_FILL - + True True 0 - Select HTML fixed width font + Select HTML variable width font 1 2 - 1 - 2 GTK_FILL - + True 0 - S_tandard Font: + Fix_ed width Font: True GTK_JUSTIFY_RIGHT - FontVariable + FontFixed + 1 + 2 GTK_FILL @@ -3797,22 +3797,26 @@ For example: "Work" or "Personal" 9 3 - + True 6 - + True - gtk-info + _Default junk plugin: + True + default_junk_plugin False + False + 6 - + True - Option is ignored if a match for custom junk headers is found. + create_combo_text_widget False @@ -3822,40 +3826,110 @@ For example: "Work" or "Personal" - 6 - 7 + 7 + 8 GTK_FILL - + True True - _Lookup in local address book only + Checks incoming mail messages to be Junk + Check incoming _messages for junk True 0 True - 5 - 6 GTK_FILL - 25 + 4 - + + True + 3 + + + True + gtk-info + + + False + False + + + + + True + True + + + False + False + 1 + + + + + 8 + 9 + GTK_FILL + 15 + + + + + True + 4 + + + True + True + Delete junk messages on e_xit + True + 0 + True + + + False + False + + + + + True + True + 0 + + + False + False + 1 + + + + + 1 + 2 + GTK_FILL + 4 + + + + True True - Do not mar_k messages as junk if sender is in my address book + Check cu_stom headers for junk True 0 True - 4 - 5 + 2 + 3 GTK_FILL 4 @@ -3921,130 +3995,56 @@ For example: "Work" or "Personal" - + True True - Check cu_stom headers for junk + Do not mar_k messages as junk if sender is in my address book True 0 True - 2 - 3 + 4 + 5 GTK_FILL 4 - + True - 4 + True + _Lookup in local address book only + True + 0 + True + + + 5 + 6 + GTK_FILL + + 25 + + + + + True + 6 - + True - True - Delete junk messages on e_xit - True - 0 - True + gtk-info False - False - + True - True - 0 - - - False - False - 1 - - - - - 1 - 2 - GTK_FILL - 4 - - - - - True - 3 - - - True - gtk-info - - - False - False - - - - - True - True - - - False - False - 1 - - - - - 8 - 9 - GTK_FILL - 15 - - - - - True - True - Checks incoming mail messages to be Junk - Check incoming _messages for junk - True - 0 - True - - - GTK_FILL - - 4 - - - - - True - 6 - - - True - _Default junk plugin: - True - default_junk_plugin - - - False - False - 6 - - - - - True - create_combo_text_widget + Option is ignored if a match for custom junk headers is found. False @@ -4054,8 +4054,8 @@ For example: "Work" or "Personal" - 7 - 8 + 6 + 7 GTK_FILL @@ -4231,40 +4231,29 @@ For example: "Work" or "Personal" 12 6 - + True - Attachment -Inline (Outlook style) -Quoted -Do Not Quote + 0 + _Reply style: + True + GTK_JUSTIFY_CENTER - 1 - 2 1 2 + GTK_FILL + - + True - Attachment -Inline -Quoted + True + 0 1 2 - - - - - True - C_haracter set: - True - omenuCharset1 - - 2 3 GTK_FILL @@ -4285,14 +4274,13 @@ Quoted - + True - True - 0 + C_haracter set: + True + omenuCharset1 - 1 - 2 2 3 GTK_FILL @@ -4300,18 +4288,30 @@ Quoted - + True - 0 - _Reply style: - True - GTK_JUSTIFY_CENTER + Attachment +Inline +Quoted + + + 1 + 2 + + + + + True + Attachment +Inline (Outlook style) +Quoted +Do Not Quote + 1 + 2 1 2 - GTK_FILL - @@ -4499,233 +4499,61 @@ Quoted - + True - 6 + 12 - - True - - - False - False - + + + + 1 + + + + + + + True + 6 + + + True + 0 + <b>Preview</b> + True + + + False + False + + + + + True + 12 - + True False False - 1 - + True False GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_IN - - True - True - False - - Signatures Table - - + - 2 - - - - - True - 3 - - - True - 6 - GTK_BUTTONBOX_START - - - True - True - True - gtk-add - True - 0 - - - - - True - True - True - 0 - - - - True - 0 - 0 - - - True - 2 - - - True - gtk-execute - - - False - False - - - - - True - Add _Script - True - - - False - False - 1 - - - - - - - - - 1 - - - - - True - True - True - 0 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-properties - - - False - False - - - - - True - _Edit - True - - - False - False - 1 - - - - - - - - - 2 - - - - - True - True - True - gtk-remove - True - 0 - - - 3 - - - - - - - False - False - 3 - - - - - 1 - - - - - - - True - 6 - - - True - 0 - <b>Preview</b> - True - - - False - False - - - - - True - 12 - - - True - - - False - False - - - - - True - False - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - - - - 1 + 1 @@ -5045,31 +4873,29 @@ Quoted 12 6 - + True - True - 0 - Select HTML variable width font for printing - + 0 + V_ariable-width: + True + GTK_JUSTIFY_CENTER + print_variable - 1 - 2 GTK_FILL - + True - True - 0 - Select HTML fixed width font for printing - + 0 + Fi_xed-width: + True + GTK_JUSTIFY_CENTER + print_fixed - 1 - 2 1 2 GTK_FILL @@ -5077,15 +4903,16 @@ Quoted - + True - 0 - Fi_xed-width: - True - GTK_JUSTIFY_CENTER - print_fixed + True + 0 + Select HTML fixed width font for printing + + 1 + 2 1 2 GTK_FILL @@ -5093,15 +4920,16 @@ Quoted - + True - 0 - V_ariable-width: - True - GTK_JUSTIFY_CENTER - print_variable + True + 0 + Select HTML variable width font for printing + + 1 + 2 GTK_FILL @@ -5182,31 +5010,19 @@ for display purposes only. 6 6 - + True - + 0 + _Name: + True + GTK_JUSTIFY_CENTER + entry_add_script_name - 1 - 2 - 1 - 2 GTK_FILL - - - True - True - * - - - 1 - 2 - - - True @@ -5224,15 +5040,27 @@ for display purposes only. - + True - 0 - _Name: - True - GTK_JUSTIFY_CENTER - entry_add_script_name + True + * + + + 1 + 2 + + + + + + True + + 1 + 2 + 1 + 2 GTK_FILL @@ -5405,64 +5233,105 @@ for display purposes only. 6 6 - + True - True - * + 0 + H_TTP Proxy: + True + txtHttpHost + + + GTK_FILL + + + + + + True + 0 + _Secure HTTP Proxy: + True + txtHttpsHost + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + S_OCKS Host: + True + txtSocksHost + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + No _Proxy for: + True + txtIgnoreHosts - 1 - 4 3 4 + GTK_FILL - + True True - 0 0 65535 1 10 0 - 1 + * - 3 - 4 - 2 - 3 + 1 + 2 - + True True - 0 0 65535 1 10 0 - 1 + * - 3 - 4 + 1 + 2 1 2 - + True True - 0 0 65535 1 10 0 - 1 + * - 3 - 4 + 1 + 2 + 2 + 3 - + True 0 Port: @@ -5470,8 +5339,6 @@ for display purposes only. 2 3 - 2 - 3 GTK_FILL @@ -5492,7 +5359,7 @@ for display purposes only. - + True 0 Port: @@ -5500,105 +5367,66 @@ for display purposes only. 2 3 + 2 + 3 GTK_FILL - + True True - * + 0 0 65535 1 10 0 + 1 - 1 - 2 - 2 - 3 + 3 + 4 - + True True - * + 0 0 65535 1 10 0 + 1 - 1 - 2 + 3 + 4 1 2 - + True True - * - - - 1 - 2 - - - - - - True - 0 - No _Proxy for: - True - txtIgnoreHosts - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - S_OCKS Host: - True - txtSocksHost + 0 0 65535 1 10 0 + 1 + 3 + 4 2 3 - GTK_FILL - - True - 0 - _Secure HTTP Proxy: - True - txtHttpsHost - - - 1 - 2 - GTK_FILL - - - - - + True - 0 - H_TTP Proxy: - True - txtHttpHost + True + * - GTK_FILL + 1 + 4 + 3 + 4 @@ -5633,28 +5461,16 @@ for display purposes only. 6 3 - - True - True - False - * - - - 1 - 2 - 1 - 2 - - - - + True - True - * + 0 + Us_ername: + True + txtAuthUser - 1 - 2 + GTK_FILL + @@ -5673,16 +5489,28 @@ for display purposes only. - + True - 0 - Us_ername: - True - txtAuthUser + True + * - GTK_FILL - + 1 + 2 + + + + + True + True + False + * + + + 1 + 2 + 1 + 2 -- cgit v1.2.3