From 2798ae38f43ce9a75f77644046b8f717a3dcf906 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Sep 2010 11:01:13 -0400 Subject: mail-config.ui cleanups. - Fix GtkVBox orientations. - Reduce container widgets. - Remove unused widgets. --- mail/em-account-editor.c | 56 +- mail/mail-config.ui | 4980 ++++++++++++++++---------------------- modules/mail/em-composer-prefs.c | 5 +- modules/mail/em-mailer-prefs.c | 17 +- 4 files changed, 2187 insertions(+), 2871 deletions(-) diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 3a3368c631..aaff1b0ecf 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2222,8 +2222,8 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity"))); } - emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", - "identity_optional_table", "identity_optional_frame", + emae_queue_widgets (emae, builder, "account_vbox", "identity-required-table", + "identity-optional-table", "identity_optional_frame", "identity_address", NULL); g_object_unref (builder); @@ -2261,7 +2261,7 @@ emae_receive_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Receiving Email"))); } - emae_queue_widgets (emae, builder, "source_type_table", "table4", "vbox181", "vbox179", NULL); + emae_queue_widgets (emae, builder, "source-type-table", "table4", "vbox181", "vbox179", NULL); g_object_unref (builder); @@ -2743,7 +2743,7 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Sending Email"))); } - emae_queue_widgets (emae, builder, "transport_type_table", "vbox12", "vbox183", "vbox61", NULL); + emae_queue_widgets (emae, builder, "transport-type-table", "vbox12", "vbox183", "vbox61", NULL); g_object_unref (builder); @@ -3143,14 +3143,14 @@ static EMConfigItem emae_editor_items[] = { { E_CONFIG_BOOK, (gchar *) "" }, { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity-required-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity-optional-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "source-config-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/20.security", (gchar *) "source-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-table", emae_widget_glade }, /* Most sections for this is auto-generated from the camel config */ { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, @@ -3158,14 +3158,14 @@ static EMConfigItem emae_editor_items[] = { { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/10.config", (gchar *) "transport-server-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/20.security", (gchar *) "transport-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/30.auth", (gchar *) "transport-auth-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page }, - { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "50.security", (gchar *) "vboxSecurityBorder", emae_security_page }, /* 1x1 table (!) not vbox: { E_CONFIG_SECTION, "50.security/00.gpg", "table19", emae_widget_glade }, */ @@ -3211,14 +3211,14 @@ static EMConfigItem emae_assistant_items[] = { { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity-required-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity-optional-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "source-config-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/20.security", (gchar *) "source-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-table", emae_widget_glade }, /* Most sections for this is auto-generated fromt the camel config */ { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, @@ -3226,14 +3226,14 @@ static EMConfigItem emae_assistant_items[] = { { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/10.config", (gchar *) "transport-server-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/20.security", (gchar *) "transport-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/30.auth", (gchar *) "transport-auth-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page }, - { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page }, diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 3796decdb2..ee700e260a 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -122,13 +122,15 @@ True 12 + vertical 12 - + True + vertical 6 - + True 0 Account Information @@ -143,27 +145,18 @@ - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True 6 2 True + vertical 6 @@ -200,7 +193,7 @@ For example: "Work" or "Personal" True True - True + ● 1 @@ -215,9 +208,6 @@ For example: "Work" or "Personal" - - 1 - @@ -232,11 +222,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Required Information @@ -251,97 +242,79 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True - 6 - 2 + 2 + 2 + 12 + 6 - + True - 2 - 2 - 12 - 6 - - - True - True - - - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Email _Address: - True - identity_address - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Full Nam_e: - True - identity_full_name - - - GTK_FILL - - - - - - True - True - - - - - - - 1 - 2 - - - + True + ● + + + + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Email _Address: + True + identity_address + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Full Nam_e: + True + identity_full_name + + + GTK_FILL + + + + + + True + True + ● + + + + + + 1 + 2 + + - - 1 - @@ -356,11 +329,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Optional Information @@ -375,21 +349,11 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True 4 2 @@ -429,7 +393,7 @@ For example: "Work" or "Personal" Add Ne_w Signature... True True - False + True True @@ -454,9 +418,10 @@ For example: "Work" or "Personal" True True + ● + - @@ -486,9 +451,10 @@ For example: "Work" or "Personal" True True + ● - + @@ -531,9 +497,6 @@ For example: "Work" or "Personal" - - 1 - @@ -548,271 +511,283 @@ For example: "Work" or "Personal" - - True - Identity - True - center - True 12 + vertical 12 - + True - 12 + 2 + 3 + 12 + 6 - + True - 2 - 3 - 12 - 6 - - - True - 0 - Server _Type: - True - right - source_type_dropdown - - - GTK_FILL - - - - - - True - 0 - 0 - Description: - center - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - 0 - description - True - - - 1 - 3 - 1 - 2 - GTK_FILL - - - - - - True - - - 1 - 3 - GTK_FILL - - - + 0 + Server _Type: + True + right + source_type_dropdown - False - False - 0 + GTK_FILL + + + + + + True + 0 + 0 + Description: + center + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + description + True + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + + + True + + + 1 + 3 + GTK_FILL + + + + False + False + 0 + + + + + True + + + False + False + 1 + + + + + True + vertical + 6 - + True + 0 + Configuration + + + False False - 1 + 0 - + True - 6 - - - True - 0 - Configuration - - - - - - False - False - 0 - - + 12 - + True - 12 + 3 + 2 + 12 + 6 - + True + 1 + _Server: + True + source_host - False - False - 0 + GTK_FILL + - + True - 6 - 2 - - - True - 3 - 2 - 12 - 6 - - - True - 0 - _Server: - True - source_host - - - GTK_FILL - - - - - - True - 0 - User_name: - True - source_user - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - _Path: - True - - - 2 - 3 - GTK_FILL - - - - - - True - Mailbox location - - - 1 - 2 - 2 - 3 - - - - - + 1 + User _Name: + True + source_user - 1 + 1 + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + + + + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + True + 1 + _Path: + True + + + 2 + 3 + GTK_FILL + + + + + + True + Mailbox location + + + 1 + 2 + 2 + 3 + - - 1 - + + 1 + + + + + False + False + 2 + + + + + True + vertical + 6 + + + True + 0 + Security + source_auth_dropdown + + + + False False - 2 + 0 - + True - 6 - - - True - 0 - Security - source_auth_dropdown - - - - - - False - False - 0 - - + 12 - + True - 12 + vertical + 6 - + True + 12 + + + True + _Use Secure Connection: + True + center + source_use_ssl + + + False + False + 0 + + + + + True + use_ssl_model + + + + 0 + + + + + False + False + 1 + + False @@ -821,44 +796,13 @@ For example: "Work" or "Personal" - + True 6 - + True - 12 - - - True - _Use Secure Connection: - True - center - source_use_ssl - - - False - False - 0 - - - - - True - use_ssl_model - - - - 0 - - - - - False - False - 1 - - + gtk-dialog-warning False @@ -867,38 +811,18 @@ For example: "Work" or "Personal" - + True - 6 - - - True - gtk-dialog-warning - - - False - False - 0 - - - - - True - 0 - SSL is not supported in this build of Evolution - center - - - - - - False - False - 1 - - + 0 + SSL is not supported in this build of Evolution + center + + + + False + False 1 @@ -908,98 +832,71 @@ For example: "Work" or "Personal" - - 1 - + + 1 + + + + + False + False + 3 + + + + + True + vertical + 6 + + + True + 0 + _Authentication Type + True + source_auth_dropdown + + + + False False - 3 + 0 - + True - 6 - - - True - 0 - _Authentication Type - True - source_auth_dropdown - - - - - - False - False - 0 - - + 12 - + True - 12 + vertical + 6 - - True - - - False - False - 0 - - - - + True 6 - + True - 6 - - - True - - - False - False - 0 - - - - - Ch_eck for Supported Types - True - True - False - True - - - False - False - 1 - - + False + False 0 - - Re_member password + + Ch_eck for Supported Types True True - False - Note: you will not be prompted for a password until you connect for the first time + True True - True False @@ -1009,149 +906,248 @@ For example: "Work" or "Personal" + 0 + + + + + Re_member password + True + True + False + True + True + + + False + False 1 - - 1 - - False - False - 4 + 1 - 0 + False + False + 4 - - True - Receiving Email - True - center - True 12 + vertical 12 - + True - 12 + 2 + 3 + 12 + 6 - + True - 2 - 3 - 12 - 6 - - - True - 0 - 0 - Server _Type: - True - right - transport_type_dropdown - - - GTK_FILL - - - - - - True - 0 - 0 - Description: - right - - - 1 - 2 - GTK_FILL - - - - - True - - - 1 - 3 - GTK_FILL - - - - - - True - 0 - 0 - description - True - - - 1 - 3 - 1 - 2 - GTK_FILL - - - + 0 + 0 + Server _Type: + True + right + transport_type_dropdown - 0 + GTK_FILL + + + + + + True + 0 + 0 + Description: + right + + + 1 + 2 + GTK_FILL + + + + + True + + + 1 + 3 + GTK_FILL + + + + + + True + 0 + 0 + description + True + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + False + False + 0 + + + + + True + + + False + False + 1 + + + + + True + vertical + 6 - + True + 0 + Server Configuration + + + False - 1 + False + 0 - + True - 12 + 12 - + True - 6 + 2 + 2 + 12 + 6 - + True - 0 - Server Configuration - - - + 1 + _Server: + True + right + transport_host - False - False - 0 + GTK_FILL + - + True - 12 + True + ● + + + 1 + 2 + + + + + + Ser_ver requires authentication + True + True + False + True + True + + + 2 + 1 + 2 + + + + + + + 1 + + + + + False + False + 2 + + + + + True + vertical + 6 + + + True + 0 + Security + + + + + + False + False + 0 + + + + + True + 12 + + + True + 2 + 6 + + + True + 6 - + True + gtk-dialog-warning False @@ -1160,109 +1156,38 @@ For example: "Work" or "Personal" - + True - 6 - 2 - - - True - 6 - - - True - 2 - 12 - 6 - - - True - 1 - _Server: - True - right - transport_host - - - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - False - 0 - - - - - Ser_ver requires authentication - True - True - False - True - True - - - False - False - 1 - - - - + 0 + SSL is not supported in this build of Evolution + center + + + + False + False 1 - 1 - - - - - 0 - - - - - True - 6 - - - True - 0 - Security - - - - - - False - False - 0 + 1 + 2 - + True 12 - + True + _Use Secure Connection: + True + center + transport_use_ssl False @@ -1271,305 +1196,48 @@ For example: "Work" or "Personal" - + True - 6 - - - True - 12 - - - True - _Use Secure Connection: - True - center - transport_use_ssl - - - False - False - 0 - - - - - True - use_ssl_model - - - - 0 - - - - - False - False - 1 - - - - - 0 - - + use_ssl_model - - True - 6 - - - True - gtk-dialog-warning - - - False - False - 0 - - - - - True - 0 - SSL is not supported in this build of Evolution - center - - - - - - False - False - 1 - - - - - 1 - + + + 0 + - - 1 - - - - - 1 - - - - - 1 - - - - - True - 6 - - - True - 0 - Authentication - - - - - - False - False - 0 - - - - - True - 12 - - - True - False False - 0 - - - - - True - 6 - 2 - - - True - 6 - - - True - 2 - 2 - 12 - 6 - - - True - 0 - T_ype: - True - center - transport_auth_dropdown - - - GTK_FILL - - - - - - True - 0 - User_name: - True - right - transport_user - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 6 - - - True - - - False - False - 0 - - - - - Ch_eck for Supported Types - True - True - False - True - - - False - False - 1 - - - - - True - - - 2 - - - - - 1 - 2 - GTK_FILL - - - - - False - 0 - - - - - Remember _password - True - True - False - True - True - - - False - False - 1 - - - - - - 1 - - 1 - - - 2 - - 2 + 1 False False - 0 + 3 - - - True - Sending Mail - True - center - - - True - 12 - 12 - + True + vertical 6 - + True 0 - Sent and Draft Messages + Authentication @@ -1581,250 +1249,121 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True - 6 - 2 + 3 + 2 + 12 + 6 - + True - 6 - - - True - 5 - 3 - 12 - 6 - - - True - 0 - Drafts _Folder: - True - - - GTK_FILL - - - - - - True - 0 - Sent _Messages Folder: - True - - - 1 - 2 - GTK_FILL - - - - - - True - False - False - Select Sent Folder - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - False - Select Drafts Folder - - - 1 - 2 - GTK_FILL - - - - - True - - - 2 - 3 - GTK_FILL - - - - - True - - - 2 - 3 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - - - gtk-revert-to-saved - True - True - False - True - - - False - False - 0 - - - - - True - - - 1 - - - - - 1 - 3 - 4 - 5 - - - - - _Trash Folder: - True - True - False - True - True - - - 2 - 3 - GTK_FILL - - - + 1 + T_ype: + True + center + transport_auth_dropdown + + + GTK_FILL + + + + + + True + 1 + User _Name: + True + right + transport_user + + + 1 + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + Remember _password + True + True + False + True + True + + + 1 + 2 + 2 + 3 + + + + + True + 0 + 0 + + + True + 6 - + True - False - False - Select Trash Folder - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL + False + False + 0 - - _Junk Folder: + + Ch_eck for Supported Types True True - False + True True - True - - - 3 - 4 - GTK_FILL - - - - - - True - False - False - Select Junk Folder - - - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - 2 - 3 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - - - 2 - 3 - 3 - 4 - GTK_FILL - GTK_FILL + False + False + 1 - - - - - 0 - + + 1 + 2 + + + + - - 1 - @@ -1835,18 +1374,25 @@ For example: "Work" or "Personal" False False - 0 + 4 + + + True + 12 + vertical + 12 - + True + vertical 6 - + True 0 - Composing Messages + Special Folders @@ -1858,170 +1404,264 @@ For example: "Work" or "Personal" - + True - 12 + 0 + 0 + 12 - + True + 5 + 2 + 12 + 6 + + + True + 0 + Drafts _Folder: + True + + + GTK_FILL + + + + + + True + 0 + Sent _Messages Folder: + True + + + 1 + 2 + GTK_FILL + + + + + + True + True + True + Select Sent Folder + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + True + Select Drafts Folder + + + 1 + 2 + GTK_FILL + + + + + _Trash Folder: + True + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + True + True + True + Select Trash Folder + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + _Junk Folder: + True + True + False + True + True + + + 3 + 4 + GTK_FILL + + + + + + True + True + True + Select Junk Folder + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + 0 + + + gtk-revert-to-saved + True + True + True + True + + + + + 1 + 2 + 4 + 5 + + + + + - - False - False - 0 - + + + 1 + + + + + False + False + 0 + + + + + True + vertical + 6 + + + True + 0 + Composing Messages + + + + + + False + False + 0 + + + + + True + 12 - + True - 6 - 2 + 4 + 6 - + True - 2 - 12 - 6 + 18 - + True - 6 - - - Alway_s carbon-copy (cc) to: - True - True - False - True - True - - - False - False - 0 - - - - - True - - - True - 12 - - - False - False - 0 - - - - - True - 6 - 2 - - - True - 6 - - - True - True - - - 0 - - - - - - - 1 - - - - - 1 - - + True + ● - - - True - 6 - - - Always _blind carbon-copy (bcc) to: - True - True - False - True - True - - - False - False - 0 - - - - - True - - - True - 12 - - - False - False - 0 - - - - - True - 6 - 2 - - - True - 6 - - - True - True - - - 0 - - - - - - - 1 - - - - - 1 - - + + + 3 + 4 + + + + + Always _blind carbon-copy (bcc) to: + True + True + False + True + True + + + 2 + 3 + + + + + True + 18 + + + True + True + ● - - 1 - 2 - + + 1 + 2 + + + + + Alway_s carbon-copy (cc) to: + True + True + False + True + True + - - 1 - @@ -2036,11 +1676,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Message Receipts @@ -2055,21 +1696,11 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True 12 @@ -2094,38 +1725,32 @@ For example: "Work" or "Personal" - - 1 - - False - False 1 + False + False 2 - - True - Defaults - True - center - True 12 + vertical 12 - + True + vertical + 6 - + True 0 General @@ -2140,19 +1765,9 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 _Do not sign meeting requests (for Outlook compatibility) @@ -2162,16 +1777,9 @@ For example: "Work" or "Personal" True True - - False - False - 1 - - False - False 1 @@ -2183,11 +1791,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Pretty Good Privacy (PGP/GPG) @@ -2202,27 +1811,18 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True 6 2 True + vertical 6 @@ -2246,6 +1846,7 @@ For example: "Work" or "Personal" True True + ● 1 @@ -2347,9 +1948,6 @@ For example: "Work" or "Personal" - - 1 - @@ -2364,11 +1962,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Secure MIME (S/MIME) @@ -2383,19 +1982,9 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 True @@ -2407,6 +1996,7 @@ For example: "Work" or "Personal" True True + ● 1 @@ -2420,6 +2010,7 @@ For example: "Work" or "Personal" True True + ● 1 @@ -2456,201 +2047,91 @@ For example: "Work" or "Personal" True - 3 - 4 - 5 - GTK_FILL - - - - - - Digitally sign o_utgoing messages (by default) - True - True - False - True - True - - - 3 - GTK_FILL - - - - - - True - - - 3 - 3 - 4 - GTK_FILL - GTK_FILL - 6 - - - - - True - 0 - Encry_ption certificate: - True - smime_encrypt_key - - - 6 - 7 - GTK_FILL - - - - - - True - 0 - Sig_ning certificate: - True - smime_sign_key - - - 1 - 2 - GTK_FILL - - - - - - True - 6 - - - True - True - False - - - True - 0 - 0 - - - True - 2 - - - True - gtk-open - - - False - False - 0 - - - - - True - S_elect... - True - - - False - False - 1 - - - - - - - - - False - False - 0 - - - - - True - True - False - - - True - 0 - 0 - - - True - 2 - - - True - gtk-clear - - - False - False - 0 - - - - - True - Clea_r - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - + 3 + 4 + 5 + GTK_FILL + + + + + + Digitally sign o_utgoing messages (by default) + True + True + False + True + True - 2 3 + GTK_FILL + + + + + + True + + + 3 + 3 + 4 + GTK_FILL + GTK_FILL + 6 + + + + + True + 0 + Encry_ption certificate: + True + smime_encrypt_key + + 6 7 GTK_FILL - GTK_FILL + + + + + + True + 0 + Sig_ning certificate: + True + smime_sign_key + + + 1 + 2 + GTK_FILL + - + True 6 - + True True - False + True - + True 0 0 - + True 2 - + True gtk-open @@ -2661,9 +2142,9 @@ For example: "Work" or "Personal" - + True - _Select... + S_elect... True @@ -2684,21 +2165,21 @@ For example: "Work" or "Personal" - + True True - False + True - + True 0 0 - + True 2 - + True gtk-clear @@ -2709,9 +2190,9 @@ For example: "Work" or "Personal" - + True - Cle_ar + Clea_r True @@ -2735,8 +2216,8 @@ For example: "Work" or "Personal" 2 3 - 1 - 2 + 6 + 7 GTK_FILL GTK_FILL @@ -2784,12 +2265,121 @@ For example: "Work" or "Personal" - + + True + 0 + 0 + + + True + 6 + + + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-open + + + False + False + 0 + + + + + True + _Select... + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-clear + + + False + False + 0 + + + + + True + Cle_ar + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + + + 2 + 3 + 1 + 3 + - - 1 - @@ -2804,12 +2394,6 @@ For example: "Work" or "Personal" - - True - Security - True - center - @@ -2840,13 +2424,15 @@ For example: "Work" or "Personal" True 12 + vertical 12 - + True + vertical 6 - + True 0 Message Fonts @@ -2861,27 +2447,18 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True 6 2 True + vertical 6 @@ -2923,7 +2500,7 @@ For example: "Work" or "Personal" True True - False + True Select HTML fixed width font @@ -2940,7 +2517,7 @@ For example: "Work" or "Personal" True True - False + True Select HTML variable width font @@ -2975,9 +2552,6 @@ For example: "Work" or "Personal" - - 1 - @@ -2992,11 +2566,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Message Display @@ -3011,122 +2586,104 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True - 6 - 2 + vertical + 6 - + True 6 - + + Highlight _quotations with True - 6 - - - Highlight _quotations with - True - True - False - True - True - True - - - False - False - 0 - - - - - True - True - False - Pick a color - - - False - False - 1 - - - - - True - color - center - - - False - False - 2 - - + True + False + True + True + True - 4 + False + False + 0 + + + + + True + True + True + Pick a color + #000000000000 + + + False + False + 1 - + True - 6 - - - True - Default character e_ncoding: - True - center - - - False - False - 0 - - - - - + color + center - 5 + False + False + 2 + + + 0 + + + + + True + 6 - - Apply the same _view settings to all folders + True - True - False + Default character e_ncoding: True - True + center - 7 + False + False + 0 + + + + + + 1 + + + + + Apply the same _view settings to all folders + True + True + False + True + True + + 2 + - - 1 - @@ -3141,11 +2698,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Delete Mail @@ -3160,77 +2718,43 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True - 6 - 2 + vertical + 6 - + True - 6 + 4 - + + Empty trash folders on e_xit True - 4 - - - Empty trash folders on e_xit - True - True - False - True - True - - - False - False - 0 - - - - - True - model1 - - - - 0 - - - - - False - False - 1 - - + True + False + True + True + False + False 0 - - Confirm _when expunging a folder + True - True - False - True - True + model1 + + + + 0 + + False @@ -3239,11 +2763,24 @@ For example: "Work" or "Personal" + + 0 + + + + + Confirm _when expunging a folder + True + True + False + True + True + + + 1 + - - 1 - @@ -3258,6 +2795,9 @@ For example: "Work" or "Personal" + + False + @@ -3274,29 +2814,21 @@ For example: "Work" or "Personal" True 12 + vertical 12 - - True - 0 - General - - - - - - False - False - 0 - - - - + True - 12 + vertical + 6 - + True + 0 + General + + + False @@ -3305,43 +2837,48 @@ For example: "Work" or "Personal" - + True - 6 - - - _Show image animations - True - True - False - True - True - - - False - False - 0 - - + 12 - - _Prompt on sending HTML mail to contacts that do not want them + True - True - False - True - True + vertical + 6 + + + _Show image animations + True + True + False + True + True + + + False + False + 0 + + + + + _Prompt on sending HTML mail to contacts that do not want them + True + True + False + True + True + + + False + False + 1 + + - - False - False - 1 - - False - False 1 @@ -3349,15 +2886,16 @@ For example: "Work" or "Personal" False False - 1 + 0 - + True + vertical 6 - + True 0 Loading Images @@ -3372,22 +2910,13 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True + vertical 6 @@ -3396,6 +2925,7 @@ For example: "Work" or "Personal" True False True + True True @@ -3437,16 +2967,9 @@ For example: "Work" or "Personal" - - False - False - 1 - - False - False 1 @@ -3454,12 +2977,13 @@ For example: "Work" or "Personal" False False - 2 + 1 1 + False @@ -3478,9 +3002,10 @@ For example: "Work" or "Personal" True 12 + vertical 6 - + True 0 Labels @@ -3527,28 +3052,21 @@ For example: "Work" or "Personal" True 12 - 6 + vertical + 12 - + True - 3 + vertical + 6 - + True - - - True - Sender Photograph - - - - - - False - False - 0 - - + 0 + Sender Photograph + + + False @@ -3557,11 +3075,14 @@ For example: "Work" or "Personal" - + True + 12 - + True + vertical + 6 _Show the photograph of sender in the message preview @@ -3574,20 +3095,9 @@ For example: "Work" or "Personal" False False - 10 0 - - - False - False - 0 - - - - - True S_earch for sender photograph only in local address books @@ -3600,16 +3110,10 @@ For example: "Work" or "Personal" False False - 10 - 0 + 1 - - False - False - 1 - @@ -3626,29 +3130,20 @@ For example: "Work" or "Personal" - - True - 0 - Displayed Message Headers - True - txtHeaders - - - - - - False - False - 1 - - - - + True - 12 + vertical + 6 - + True + 0 + Displayed Message Headers + True + txtHeaders + + + False @@ -3657,99 +3152,119 @@ For example: "Work" or "Personal" - + True - 12 - - - True - True - - - False - False - 0 - - + 12 - + True - True - automatic - automatic - in + 12 - + True - True - False - - - Mail Headers Table + vertical + 12 + + + True + True + ● + + + False + False + 0 + + + + + True + True + automatic + automatic + in + + + True + True + False + + + Mail Headers Table + + + + + + + 1 + + + + + 0 + + + + + True + vertical + 6 + + + gtk-add + True + False + True + True + True + + + False + False + 0 + + + + + gtk-remove + True + True + True + True + + False + False + 1 + + + False + False + 1 + - - 1 - 1 - - - True - 6 - - - gtk-add - True - False - True - False - True - - - False - False - 0 - - - - - gtk-remove - True - True - False - True - - - False - False - 1 - - - - - False - False - 2 - - - 2 + 1 - + True + vertical + 6 - + True 0 Date/Time Format @@ -3766,21 +3281,11 @@ For example: "Work" or "Personal" - + True + 12 - - True - 6 - - - False - False - 0 - - - - + True 3 @@ -3793,9 +3298,6 @@ For example: "Work" or "Personal" - - 1 - @@ -3805,12 +3307,14 @@ For example: "Work" or "Personal" False - 3 + False + 2 3 + False @@ -3825,15 +3329,18 @@ For example: "Work" or "Personal" - + True 12 - 6 + vertical + 12 - + True + vertical + 6 - + True 0 General @@ -3848,291 +3355,297 @@ For example: "Work" or "Personal" - + True - 12 - 9 - 3 - - - True - 6 - - - True - _Default junk plugin: - True - default_junk_plugin - - - False - False - 6 - 0 - - - - - True - - - False - False - 1 - - - - - 7 - 8 - GTK_FILL - - - - - Check incoming _messages for junk - True - True - False - Checks incoming mail messages to be Junk - True - True - - - GTK_FILL - - 4 - - + 12 - + True - 3 + 9 + 3 - + True - gtk-info + 6 + + + True + _Default junk plugin: + True + default_junk_plugin + + + False + False + 6 + 0 + + + + + True + + + False + False + 1 + + - False - False - 0 + 7 + 8 + GTK_FILL - + + Check incoming _messages for junk True - True + True + False + True + True - False - False - 1 + GTK_FILL + + 4 - - - 8 - 9 - GTK_FILL - 15 - - - - - True - 4 - - Delete junk messages on e_xit + True - True - False - True - True + 3 + + + True + gtk-info + + + False + False + 0 + + + + + True + True + + + False + False + 1 + + - False - False - 0 + 8 + 9 + GTK_FILL + 15 - + True - model2 + 4 - - - 0 - + + Delete junk messages on e_xit + True + True + False + True + True + + + False + False + 0 + + + + + True + model2 + + + + 0 + + + + + False + False + 1 + - False - False - 1 + 1 + 2 + GTK_FILL + 4 - - - 1 - 2 - GTK_FILL - 4 - - - - - Check cu_stom headers for junk - True - True - False - True - True - - - 2 - 3 - GTK_FILL - - 4 - - - - - True - 6 - + + Check cu_stom headers for junk True True - automatic - automatic - in - - - True - True - - + False + True + True - 0 + 2 + 3 + GTK_FILL + + 4 - + True - spread + 6 - - gtk-add + True True - True - False - True + automatic + automatic + in + + + True + True + + - False - False 0 - - gtk-remove + True - True - True - False - True + vertical + 6 + start + + + gtk-add + True + True + True + True + True + + + False + False + 0 + + + + + gtk-remove + True + True + True + True + True + + + False + False + 1 + + False - False 1 - False - 1 + 3 + 4 + 22 - - - 3 - 4 - 22 - - - - - Do not mar_k messages as junk if sender is in my address book - True - True - False - True - True - - - 4 - 5 - GTK_FILL - - 4 - - - - - _Lookup in local address book only - True - True - False - True - True - - - 5 - 6 - GTK_FILL - - 25 - - - - - True - 6 - + + Do not mar_k messages as junk if sender is in my address book True - gtk-info + True + False + True + True - False - 0 + 4 + 5 + GTK_FILL + + 4 - + + _Lookup in local address book only True - Option is ignored if a match for custom junk headers is found. + True + False + True + True - False - False - 1 + 5 + 6 + GTK_FILL + + 25 + + + + + True + 6 + + + True + gtk-info + + + False + 0 + + + + + True + Option is ignored if a match for custom junk headers is found. + + + False + False + 1 + + + + + 6 + 7 + GTK_FILL - - 6 - 7 - GTK_FILL - @@ -4146,23 +3659,13 @@ For example: "Work" or "Personal" 0 - - - True - - - False - False - 1 - - 4 - + True Junk True @@ -4180,13 +3683,15 @@ For example: "Work" or "Personal" True 12 + vertical 18 - + True + vertical 6 - + True 0 Default Behavior @@ -4201,27 +3706,18 @@ For example: "Work" or "Personal" - + True + 12 - - True - 12 - - - False - False - 0 - - - - + True 6 2 True + vertical 8 @@ -4466,6 +3962,7 @@ For example: "Work" or "Personal" True + vertical 8 @@ -4522,9 +4019,6 @@ For example: "Work" or "Personal" 1 - - - 0 @@ -4538,17 +4032,26 @@ For example: "Work" or "Personal" - - 1 - 1 + + + False + False + 0 + + + + + True + vertical + 6 - + True 0 Alerts @@ -4559,31 +4062,21 @@ For example: "Work" or "Personal" False False - 2 + 0 - + True - - True - 12 - - - False - False - 0 - - - - + True 6 2 - + True + vertical 6 @@ -4663,22 +4156,17 @@ For example: "Work" or "Personal" - - False - False - 1 - - 3 + 1 False False - 0 + 1 @@ -4698,13 +4186,15 @@ For example: "Work" or "Personal" True 12 + vertical 12 - + True + vertical 6 - + True 0 Sig_natures @@ -4720,7 +4210,7 @@ For example: "Work" or "Personal" - + True 12 @@ -4737,11 +4227,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Preview @@ -4756,23 +4247,13 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True - False + True automatic automatic in @@ -4780,14 +4261,9 @@ For example: "Work" or "Personal" - - 1 - - False - False 1 @@ -4819,13 +4295,15 @@ For example: "Work" or "Personal" True 12 + vertical 12 - + True + vertical 6 - + True 0 _Languages @@ -4842,109 +4320,69 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True - 6 + 2 + 2 + 6 + 6 - + True - 6 - - - True - - - True - 6 - - - True - False - automatic - automatic - in - - - True - True - False - - - Languages Table - - - - - - - 0 - - - - - 0 - - - - - 0 - - + 0 + gtk-dialog-info + + + 1 + 2 + + + + + + + True + 0 + The list of languages here reflects only the languages for which you have a dictionary installed. + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + automatic + automatic + in - + True - 6 - - - True - 0 - gtk-dialog-info - - - False - 0 - - - - - True - 0 - The list of languages here reflects only the languages for which you have a dictionary installed. - True + True + False + + + Languages Table - - 1 - - - False - 1 - - 0 + 2 - - 1 - @@ -4957,11 +4395,12 @@ For example: "Work" or "Personal" - + True + vertical 6 - + True 0 Options @@ -4976,22 +4415,13 @@ For example: "Work" or "Personal" - + True - 12 - - - True - - - False - False - 0 - - + 12 - + True + vertical 6 @@ -5030,8 +4460,9 @@ For example: "Work" or "Personal" True True - False + True Pick a color + #000000000000 False @@ -5041,159 +4472,11 @@ For example: "Work" or "Personal" - False - 1 - - - - - 1 - - - - - 1 - - - - - False - 1 - - - - - 2 - - - - - True - Spell Checking - True - center - - - 2 - False - - - - - Font Properties - - - True - 12 - - - - - - True - 6 - - - True - 0 - Printed Fonts - - - - - - False - False - 0 - - - - - True - - - True - 12 - - - False - False - 0 - - - - - True - 2 - 2 - 12 - 6 - - - True - 0 - V_ariable-width: - True - center - print_variable - - - GTK_FILL - - - - - - True - 0 - Fi_xed-width: - True - center - print_fixed - - - 1 - 2 - GTK_FILL - - - - - - True - True - False - Select HTML fixed width font for printing - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - True - False - Select HTML variable width font for printing - - - - 1 - 2 - GTK_FILL - + False + 1 - - 1 - @@ -5203,11 +4486,25 @@ For example: "Work" or "Personal" False - False 1 + + 2 + + + + + True + Spell Checking + True + center + + + 2 + False + @@ -5215,14 +4512,17 @@ For example: "Work" or "Personal" True + vertical 12 True + vertical True 12 + vertical 6 @@ -5362,338 +4662,167 @@ for display purposes only. True - gtk-add - - - False - False - 0 - - - - - True - _Add Signature - True - - - False - False - 1 - - - - - - - - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - button_add_script_add - button_add_script_cancel - - - - True - True - - - True - 12 - 18 - - - True - 6 - - - True - 0 - Proxy Settings - - - - - - 0 - - - - - True - 12 - 8 - - - _Use system defaults - True - True - False - True - True - - - 0 - - - - - _Direct connection to the Internet - True - True - False - True - True - rdoSysSettings - - - 1 - - - - - _Manual proxy configuration: - True - True - False - True - True - rdoSysSettings - - - 2 - - - - - True - 24 - - - True - 6 - - - True - 4 - 4 - 6 - 6 - - - True - 0 - H_TTP Proxy: - True - txtHttpHost - - - GTK_FILL - - - - - - True - 0 - _Secure HTTP Proxy: - True - txtHttpsHost - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - No _Proxy for: - True - txtIgnoreHosts - - - 3 - 4 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Port: - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Port: - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - True - adjustment4 - 1 - - - 3 - 4 - - - - - - True - True - adjustment5 - 1 - - - 3 - 4 - 1 - 2 - - - - - - True - True - - - 1 - 4 - 3 - 4 - - - - - - - - - - - - - - - + gtk-add False + False 0 - - Use Authe_ntication + True - True - False + _Add Signature True - True False + False 1 + + + + + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button_add_script_add + button_add_script_cancel + + + + True + True + + + True + 12 + vertical + 12 + + + True + vertical + 6 + + + True + 0 + Proxy Settings + + + + + + 0 + + + + + True + 12 + + + True + vertical + 6 + + + _Use system defaults + True + True + False + True + True + True + + + 0 + + + + + _Direct connection to the Internet + True + True + False + True + True + rdoSysSettings + + + 1 + + + + + _Manual proxy configuration: + True + True + False + True + True + rdoSysSettings + + + 2 + + + + + True + 24 - + True - 24 + vertical + 6 - + True - 2 - 2 + 4 + 4 6 - 3 + 6 - + True 0 - Us_ername: + H_TTP Proxy: True - txtAuthUser + txtHttpHost GTK_FILL @@ -5701,12 +4830,12 @@ for display purposes only. - + True 0 - Pass_word: + _Secure HTTP Proxy: True - txtAuthPwd + txtHttpsHost 1 @@ -5716,47 +4845,234 @@ for display purposes only. - + + True + 0 + No _Proxy for: + True + txtIgnoreHosts + + + 3 + 4 + GTK_FILL + + + + + True True + ● 1 2 + - + True True - False + ● 1 2 1 2 + + + + + + True + 0 + Port: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Port: + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + True + ● + adjustment4 + 1 + + + 3 + 4 + + + + + + True + True + ● + adjustment5 + 1 + + + 3 + 4 + 1 + 2 + + + + + + True + True + ● + + + 1 + 4 + 3 + 4 + + + + + + + + + + + + + + + + False + 0 + + + + + Use Authe_ntication + True + True + False + True + True + + + False + 1 + + + + + True + 24 + + + True + 2 + 2 + 6 + 3 + + + True + 0 + Us_ername: + True + txtAuthUser + + + GTK_FILL + + + + + + True + 0 + Pass_word: + True + txtAuthPwd + + + 1 + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + + + + + True + True + False + ● + + + 1 + 2 + 1 + 2 + + + + + + False + 2 + - - False - 2 - + + False + 3 + - - False - 3 - - False 1 diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 584936cb67..366fa5d6e4 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -542,7 +542,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, /* Signatures */ signature_list = e_get_signature_list (); - container = e_builder_get_widget (prefs->builder, "alignSignatures"); + container = e_builder_get_widget (prefs->builder, "signature-alignment"); widget = e_signature_manager_new (signature_list); gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); @@ -568,7 +568,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, signature_tree_view = e_signature_manager_get_tree_view ( E_SIGNATURE_MANAGER (widget)); - container = e_builder_get_widget (prefs->builder, "scrolled-sig"); + container = e_builder_get_widget ( + prefs->builder, "signature-preview-scrolled-window"); widget = e_signature_preview_new (); gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 944c007007..d5cde4f79f 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -634,20 +634,19 @@ emmp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget static EMConfigItem emmp_items[] = { { E_CONFIG_BOOK, (gchar *) "", (gchar *) "preferences_toplevel", emmp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxMailGeneral", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/00.fonts", (gchar *) "vboxMessageFonts", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "vboxMessageDisplay", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "vboxDeletingMail", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/30.newmail", (gchar *) "vboxNewMailNotify", emmp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.fonts", (gchar *) "message-fonts-table", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "message-display-vbox", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "delete-mail-vbox", emmp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "10.html", (gchar *) "vboxHtmlMail", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "vbox173", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "vbox190", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "mail-general-vbox", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "loading-images-vbox", emmp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "20.labels", (gchar *) "frameColours", emmp_widget_glade }, /* this is a table, so we can't use it { E_CONFIG_SECTION, "20.labels/00.labels", "tableColours", emmp_widget_glade }, */ { E_CONFIG_PAGE, (gchar *) "30.headers", (gchar *) "vboxHeaderTab", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_PAGE, "30.headers/00.headers", "vbox199", emmp_widget_glade }, */ - { E_CONFIG_PAGE, (gchar *) "40.junk", (gchar *) "vbox161", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "40.junk", (gchar *) "vboxJunk", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_SECTION, "40.junk/00.general", xxx, emmp_widget_glade } */ - { E_CONFIG_SECTION, (gchar *) "40.junk/10.options", (gchar *) "vbox204", emmp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.junk/10.options", (gchar *) "junk-general-table", emmp_widget_glade }, }; static void @@ -1053,7 +1052,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, g_slist_free (header_add_list); /* date/time format */ - table = e_builder_get_widget (prefs->builder, "datetime_format_table"); + table = e_builder_get_widget (prefs->builder, "datetime-format-table"); /* To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list */ e_datetime_format_add_setup_widget (table, 0, "mail", "table", DTFormatKindDateTime, _("_Table column:")); /* To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview */ -- cgit