From c7ac2cb4f382d432eeba52777bff2c5c99680d4c Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Thu, 25 Mar 2004 06:56:12 +0000 Subject: Use gtk_window_present instead of doing a show then raise, as this also 2004-03-25 Rodney Dawes * em-composer-prefs.c (sig_edit_cb): (sig_add_script_cb): Use gtk_window_present instead of doing a show then raise, as this also puts the window on the current workspace (em_composer_prefs_construct): Fix the border widths for the dialog vbox and action area to be HIG-compliant, and realize the window Remove the dialog separator Use a box_pack_start, rather than box_pack_start_defaults which causes some weird behaviour when changing the border widths * em-subscribe-editor.c (em_subscribe_editor_new): Realize the dialog and set the border widths for its vbox and action area to be compliant with the HIG * local-config.glade: Removed this file as it is no longer used * mail-account-editor.c (construct): Realize the dialog, remove its separator, and set the border widths for its vbox and action area to be HIG-compliant * mail-account-editor.c (source_type_changed): (transport_type_changed): Fix the showing and hiding of the widgets related to the SSL options (mail_account_gui_new): Get the transport/source frames for the SSL options, and hide them by default Show the default folder buttons by default here (mail_account_gui_setup): Only call _show not _show_all here, so we don't mess up the shown/hidden state of things * mail-account-gui.h: Add ssl_frame widget to the MailAccountGuiService * mail-config.glade: * mail-search.glade: * mail-security.glade: HIG-compliance fixes for the glade dialogs * message-tag-followup.c (construct): Don't set border_width on the dialog itself Remove the separator from the dialog Set the border_widths for the dialog's vbox and action areas to be compliant with the HIG * message-tags.glade: * subscribe-dialog.glade: HIG-compliance fixes for these dialogs Original patch from Martyn Russell svn path=/trunk/; revision=25183 --- mail/ChangeLog | 39 + mail/em-composer-prefs.c | 14 +- mail/em-subscribe-editor.c | 4 + mail/local-config.glade | 325 -- mail/mail-account-editor.c | 5 + mail/mail-account-gui.c | 30 +- mail/mail-account-gui.h | 1 + mail/mail-config.glade | 7950 +++++++++++++++++++++++++++---------------- mail/mail-search.glade | 43 +- mail/mail-security.glade | 185 +- mail/message-tag-followup.c | 7 +- mail/message-tags.glade | 90 +- mail/subscribe-dialog.glade | 445 ++- 13 files changed, 5476 insertions(+), 3662 deletions(-) delete mode 100644 mail/local-config.glade (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index ca6781ea58..4d25a9924a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,42 @@ +2004-03-25 Rodney Dawes + + * em-composer-prefs.c (sig_edit_cb): + (sig_add_script_cb): Use gtk_window_present instead of doing a show + then raise, as this also puts the window on the current workspace + (em_composer_prefs_construct): Fix the border widths for the dialog + vbox and action area to be HIG-compliant, and realize the window + Remove the dialog separator + Use a box_pack_start, rather than box_pack_start_defaults which causes + some weird behaviour when changing the border widths + * em-subscribe-editor.c (em_subscribe_editor_new): Realize the dialog + and set the border widths for its vbox and action area to be compliant + with the HIG + * local-config.glade: Removed this file as it is no longer used + * mail-account-editor.c (construct): Realize the dialog, remove its + separator, and set the border widths for its vbox and action area to + be HIG-compliant + * mail-account-editor.c (source_type_changed): + (transport_type_changed): Fix the showing and hiding of the widgets + related to the SSL options + (mail_account_gui_new): Get the transport/source frames for the SSL + options, and hide them by default + Show the default folder buttons by default here + (mail_account_gui_setup): Only call _show not _show_all here, so we + don't mess up the shown/hidden state of things + * mail-account-gui.h: Add ssl_frame widget to the MailAccountGuiService + * mail-config.glade: + * mail-search.glade: + * mail-security.glade: HIG-compliance fixes for the glade dialogs + * message-tag-followup.c (construct): Don't set border_width on the + dialog itself + Remove the separator from the dialog + Set the border_widths for the dialog's vbox and action areas to be + compliant with the HIG + * message-tags.glade: + * subscribe-dialog.glade: HIG-compliance fixes for these dialogs + + Original patch from Martyn Russell + 2004-03-24 Danilo Šegan * mail-ops.c (get_messages_desc): Use ngettext for handling plural diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index e4b68b9b3d..0276decfc8 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -242,8 +242,7 @@ sig_edit_cb (GtkWidget *widget, EMComposerPrefs *prefs) g_object_set_data ((GObject *) entry, "script", sig); - gtk_widget_show (prefs->sig_script_dialog); - gdk_window_raise (prefs->sig_script_dialog->window); + gtk_window_present ((GtkWindow *) prefs->sig_script_dialog); } } @@ -354,8 +353,7 @@ sig_add_script_cb (GtkWidget *widget, EMComposerPrefs *prefs) g_object_set_data ((GObject *) entry, "script", NULL); - gtk_widget_show (prefs->sig_script_dialog); - gdk_window_raise (prefs->sig_script_dialog->window); + gtk_window_present ((GtkWindow *) prefs->sig_script_dialog); } static void @@ -916,13 +914,19 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) /* Signatures */ dialog = (GtkDialog *) gtk_dialog_new (); + + gtk_widget_realize ((GtkWidget *) dialog); + gtk_container_set_border_width ((GtkContainer *)dialog->action_area, 12); + gtk_container_set_border_width ((GtkContainer *)dialog->vbox, 0); + prefs->sig_script_dialog = (GtkWidget *) dialog; gtk_dialog_add_buttons (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + gtk_dialog_set_has_separator (dialog, FALSE); gtk_window_set_title ((GtkWindow *) dialog, _("Add script signature")); g_signal_connect (dialog, "response", G_CALLBACK (sig_add_script_response), prefs); widget = glade_xml_get_widget (prefs->sig_script_gui, "vbox_add_script_signature"); - gtk_box_pack_start_defaults ((GtkBox *) dialog->vbox, widget); + gtk_box_pack_start ((GtkBox *) dialog->vbox, widget, TRUE, TRUE, 0); prefs->sig_add = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureAdd")); g_signal_connect (prefs->sig_add, "clicked", G_CALLBACK (sig_add_cb), prefs); diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 3107fa7317..6188a0195b 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -816,6 +816,10 @@ GtkDialog *em_subscribe_editor_new(void) se->dialog = (GtkDialog *)glade_xml_get_widget (xml, "subscribe_dialog"); g_signal_connect(se->dialog, "destroy", G_CALLBACK(sub_editor_destroy), se); + gtk_widget_realize ((GtkWidget *)se->dialog); + gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)se->dialog)->action_area, 12); + gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)se->dialog)->vbox, 0); + se->vbox = glade_xml_get_widget(xml, "tree_box"); se->subscribe_button = glade_xml_get_widget (xml, "subscribe_button"); diff --git a/mail/local-config.glade b/mail/local-config.glade deleted file mode 100644 index bc63ea7b47..0000000000 --- a/mail/local-config.glade +++ /dev/null @@ -1,325 +0,0 @@ - - - - - - - 6 - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 3 - True - False - 12 - - - - True - 0.5 - 0 - 1 - 0 - - - - True - mail-config-druid.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - Note: When converting between mailbox formats, a failure -(such as lack of disk space) may not be automatically -recoverable. Please use this feature with care. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - - - 0 - True - True - - - - - - 2 - True - 3 - 2 - False - 6 - 6 - - - - True - New store format: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Current store format: - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - mbox - False - False - GTK_JUSTIFY_CENTER - False - False - 7.45058e-09 - 0.5 - 8 - 0 - - - 1 - 2 - 0 - 1 - - - - - - - True - - False - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - Index body contents - True - GTK_RELIEF_NORMAL - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - 7.45058e-09 - 0.5 - 0 - 1 - - - - True - True - 0 - - - - True - - - - True - mbox - True - - - - - - True - maildir - True - - - - - - True - mh - True - - - - - - - - - 1 - 2 - 1 - 2 - - - - - - 0 - True - True - - - - - - - diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index 8dc2a4f99a..6a599100d6 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -130,6 +130,11 @@ construct (MailAccountEditor *editor, EAccount *account, EMAccountPrefs *dialog) { EAccountService *source = account->source; + gtk_widget_realize (GTK_WIDGET (editor)); + gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0); + editor->gui = mail_account_gui_new (account, dialog); /* get our toplevel widget and reparent it */ diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 5dbebf3d91..920fb18c0c 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -567,11 +567,14 @@ source_type_changed (GtkWidget *widget, gpointer user_data) /* ssl */ #ifdef HAVE_SSL - if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) + gtk_widget_hide (gui->source.no_ssl); + if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) { + gtk_widget_show (gui->source.ssl_frame); gtk_widget_show (gui->source.ssl_hbox); - else + } else { + gtk_widget_hide (gui->source.ssl_frame); gtk_widget_hide (gui->source.ssl_hbox); - gtk_widget_hide (gui->source.no_ssl); + } #else gtk_widget_hide (gui->source.ssl_hbox); gtk_widget_show (gui->source.no_ssl); @@ -660,11 +663,14 @@ transport_type_changed (GtkWidget *widget, gpointer user_data) /* ssl */ #ifdef HAVE_SSL - if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) + gtk_widget_hide (gui->transport.no_ssl); + if (provider && provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) { + gtk_widget_show (gui->transport.ssl_frame); gtk_widget_show (gui->transport.ssl_hbox); - else + } else { + gtk_widget_hide (gui->transport.ssl_frame); gtk_widget_hide (gui->transport.ssl_hbox); - gtk_widget_hide (gui->transport.no_ssl); + } #else gtk_widget_hide (gui->transport.ssl_hbox); gtk_widget_show (gui->transport.no_ssl); @@ -1597,6 +1603,8 @@ mail_account_gui_new (EAccount *account, EMAccountPrefs *dialog) gui->source.path = GTK_ENTRY (glade_xml_get_widget (gui->xml, "source_path")); g_signal_connect (gui->source.path, "changed", G_CALLBACK (service_changed), &gui->source); + gui->source.ssl_frame = glade_xml_get_widget (gui->xml, "source_security_frame"); + gtk_widget_hide (gui->source.ssl_frame); gui->source.ssl_hbox = glade_xml_get_widget (gui->xml, "source_ssl_hbox"); gui->source.use_ssl = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "source_use_ssl")); construct_ssl_menu (&gui->source); @@ -1620,6 +1628,8 @@ mail_account_gui_new (EAccount *account, EMAccountPrefs *dialog) gui->transport.username = GTK_ENTRY (glade_xml_get_widget (gui->xml, "transport_user")); g_signal_connect (gui->transport.username, "changed", G_CALLBACK (service_changed), &gui->transport); + gui->transport.ssl_frame = glade_xml_get_widget (gui->xml, "transport_security_frame"); + gtk_widget_hide (gui->transport.ssl_frame); gui->transport.ssl_hbox = glade_xml_get_widget (gui->xml, "transport_ssl_hbox"); gui->transport.use_ssl = GTK_OPTION_MENU (glade_xml_get_widget (gui->xml, "transport_use_ssl")); construct_ssl_menu (&gui->transport); @@ -1641,7 +1651,8 @@ mail_account_gui_new (EAccount *account, EMAccountPrefs *dialog) else gui->drafts_folder_uri = g_strdup(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS)); em_folder_selection_button_set_selection((EMFolderSelectionButton *)gui->drafts_folder_button, gui->drafts_folder_uri); - + gtk_widget_show (gui->drafts_folder_button); + /* Sent folder */ gui->sent_folder_button = GTK_BUTTON (glade_xml_get_widget (gui->xml, "sent_button")); g_signal_connect (gui->sent_folder_button, "selected", G_CALLBACK (folder_selected), &gui->sent_folder_uri); @@ -1650,7 +1661,8 @@ mail_account_gui_new (EAccount *account, EMAccountPrefs *dialog) else gui->sent_folder_uri = g_strdup(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT)); em_folder_selection_button_set_selection((EMFolderSelectionButton *)gui->sent_folder_button, gui->sent_folder_uri); - + gtk_widget_show (gui->sent_folder_button); + /* Special Folders "Reset Defaults" button */ gui->restore_folders_button = (GtkButton *)glade_xml_get_widget (gui->xml, "default_folders_button"); g_signal_connect (gui->restore_folders_button, "clicked", G_CALLBACK (default_folders_clicked), gui); @@ -1876,7 +1888,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top) } if (top != NULL) { - gtk_widget_show_all (top); + gtk_widget_show (top); } if (fstore) { diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h index 53b6292c66..549cb151e1 100644 --- a/mail/mail-account-gui.h +++ b/mail/mail-account-gui.h @@ -46,6 +46,7 @@ typedef struct { GtkEntry *hostname; GtkEntry *username; GtkEntry *path; + GtkWidget *ssl_frame; GtkOptionMenu *use_ssl; GtkWidget *ssl_selected; GtkWidget *ssl_hbox; diff --git a/mail/mail-config.glade b/mail/mail-config.glade index e3bb60e0dc..fb997e8286 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -161,7 +161,7 @@ Click "Apply" to save your settings. - 6 + 12 True True True @@ -172,132 +172,223 @@ Click "Apply" to save your settings. - 6 + 12 True False - 3 + 12 - + True False - 3 + 6 + + + + True + <span weight="bold">Account Information</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 12 - - 6 + True - False - 3 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - Type the name by which you would like to refer to this account. -For example: "Work" or "Personal" - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 3 - 3 - - - 0 - False - True - - + + + True + 1 + 1 + False + 2 + 6 - - 3 + True False - 4 + 6 - + True - _Name: - True - False - GTK_JUSTIFY_RIGHT + Type the name by which you would like to refer to this account. +For example: "Work" or "Personal" + False + True + GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - management_name 0 False - False + True - + True - True - True - True - 0 - - True - * - False + False + 12 + + + + True + _Name: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0.5 + 0.5 + 0 + 0 + management_name + + + 0 + False + False + + + + + + True + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + 0 - True + False True - 0 - False - True - - - - - - True - True - _Make this my default account - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False + 0 + 1 + 0 + 1 + + 0 + True + True + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Required Information</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - Account Information + False False GTK_JUSTIFY_LEFT @@ -309,132 +400,188 @@ For example: "Work" or "Personal" 0 - label_item + 0 + False + False - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True - 2 - 2 + 1 + 1 False - 6 + 2 6 - + True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - + 2 + 2 + False + 6 + 12 - - - True - Email _address: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - identity_address - - - 0 - 1 - 1 - 2 - fill - - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + - - - True - _Full name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - identity_full_name + + + True + Email _Address: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + identity_address + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + _Full Name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + identity_full_name + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + 0 1 0 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - + + 0 + True + True + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Optional Information</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - Required Information + False False GTK_JUSTIFY_LEFT @@ -446,38 +593,25 @@ For example: "Work" or "Personal" 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - 6 True - 3 + 4 2 False 6 - 6 + 12 - + True - Or_ganization: + Signat_ure: True False GTK_JUSTIFY_LEFT @@ -487,22 +621,103 @@ For example: "Work" or "Personal" 0.5 0 0 - identity_organization + sigOption 0 1 - 1 - 2 + 3 + 4 fill - + + True + False + 6 + + + + True + True + 0 + + + + True + + + + True + Default + True + + + + + + + 0 + False + False + + + + + + True + True + Add Ne_w Signature... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + GTK_PACK_END + + + + + 1 + 2 + 3 + 4 + fill + fill + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + + + True - _Default signature: + Or_ganization: True False GTK_JUSTIFY_LEFT @@ -512,6 +727,7 @@ For example: "Work" or "Personal" 0.5 0 0 + identity_organization 0 @@ -524,7 +740,7 @@ For example: "Work" or "Personal" - + True True True @@ -562,126 +778,52 @@ For example: "Work" or "Personal" 0 1 - 0 - 1 + 1 + 2 fill - + True True - True - True - 0 - - True - * - False + _Make this my default account + True + GTK_RELIEF_NORMAL + False + False + True - 1 + 0 2 0 1 - - - - - - - True - False - 5 - - - - True - True - 0 - - - - True - - - - True - Default - True - - - - - - - 0 - False - False - - - - - - True - True - Add new signature... - True - GTK_RELIEF_NORMAL - - - - 0 - False - False - GTK_PACK_END - - - - - 1 - 2 - 2 - 3 fill fill - - - - - True - Optional Information - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - False + True True 0 - True - True + False + False @@ -694,7 +836,7 @@ For example: "Work" or "Personal" True - _Identity + Identity True False GTK_JUSTIFY_CENTER @@ -712,25 +854,38 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 True False - 3 + 12 - + True - 1 - 2 + 2 + 3 False - 0 - 3 + 6 + 12 + + + + True + + + 2 + 3 + 0 + 1 + fill + + @@ -741,7 +896,7 @@ For example: "Work" or "Personal" GTK_JUSTIFY_RIGHT False False - 1 + 0 0.5 0 0 @@ -757,11 +912,35 @@ For example: "Work" or "Personal" + + + True + Description: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + True True - 0 + 2 @@ -814,246 +993,342 @@ For example: "Work" or "Personal" 2 0 1 - + fill - - - 0 - False - False - - - - - - True - False - 3 - + True - Description: + description False False - GTK_JUSTIFY_CENTER - False + GTK_JUSTIFY_LEFT + True False - 0.5 - 0.5 + 0 + 0 0 0 - 0 - False - True + 1 + 3 + 1 + 2 + fill + + + + 0 + False + False + + + + + + True + + + 0 + False + False + + + + + + True + False + 6 - + True - description + <span weight="bold">Configuration</span> False - False + True GTK_JUSTIFY_LEFT False False 0 - 0 + 0.5 0 0 0 - True - True + False + False - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True - 5 - 2 False - 6 - 6 + 12 - + True - _Host: - True + + False False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - source_host - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - User_name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - source_user - - - 0 - 1 - 1 - 2 - fill - - - + 1 + 1 + False + 2 + 6 - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - + + + True + 3 + 2 + False + 6 + 12 - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - + + + True + _Host: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + source_host + + + 0 + 1 + 0 + 1 + fill + + + - - - True - _Path: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - source_path - - - 0 - 1 - 2 - 3 - fill - - - + + + True + User_name: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + source_user + + + 0 + 1 + 1 + 2 + fill + + + - - - True - 10 - Mailbox location - False - False + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + - - - True - True - True - True - 0 - - True - * - False + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + _Path: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + source_path + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + 10 + Mailbox location + False + False + + + + True + True + True + True + 0 + + True + * + False + + + + + 1 + 2 + 2 + 3 + + + + + 0 + 1 + 0 + 1 + - 1 - 2 - 2 - 3 - + 0 + True + True + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Authentication Type</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - False - (SSL is not supported in this build of Evolution) + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 @@ -1062,79 +1337,93 @@ For example: "Work" or "Personal" 0 - 0 - 2 - 4 - 5 - fill - + 0 + False + False - + True False 6 - + True - _Use secure connection (SSL): - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - source_use_ssl - - - 0 - False - False - - - - - - True - True - 0 + False + 6 - - + + True + True + 0 - - + + True - Always - True - - - - - True - Whenever Possible - True - - + + + True + Password + True + + - - - True - Never - True + + + True + Kerberos + True + + + + 0 + False + False + + + + + + True + True + Ch_eck for Supported Types + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + 0 + True + True + + + + + + True + Note: you will not be prompted for a password until you connect for the first time + True + Re_member password + True + GTK_RELIEF_NORMAL + False + False + True + 0 False @@ -1143,32 +1432,16 @@ For example: "Work" or "Personal" - 0 - 2 - 3 - 4 - fill + 0 + True + True - - - - - True - Configuration - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -1180,105 +1453,191 @@ For example: "Work" or "Personal" - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Security</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 6 + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True False - 3 + 6 - + True - _Authentication type: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - source_auth_omenu - - - 0 - False - False - - + False + 12 - - - True - True - 0 + + + True + _Use Secure Connection (SSL): + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + source_use_ssl + + + 0 + False + False + + - - + + True + True + 0 - - + + True - Password - True - - - - - True - Kerberos - True + + + True + Always + True + + + + + + True + Whenever Possible + True + + + + + + True + Never + True + + + + 0 + False + False + 0 - False - False + True + True - + True - 1 - 0.5 - 1 - 1 + False + 6 - + True - True - _Check for supported types - True - GTK_RELIEF_NORMAL + gtk-dialog-warning + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + <b>SSL is not supported in this build of evolution</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + 0 + False + False + 0 - False - False - GTK_PACK_END + True + True @@ -1288,64 +1647,11 @@ For example: "Work" or "Personal" True - - - - True - True - Re_member this password - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - Note: you will not be prompted for a password until you connect for the first time - False - False - GTK_JUSTIFY_LEFT - False - False - 0.03 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - True - Authentication - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - label_item + 0 + True + True @@ -1372,7 +1678,7 @@ For example: "Work" or "Personal" True - _Receiving Mail + Receiving Mail True False GTK_JUSTIFY_CENTER @@ -1390,10 +1696,10 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 @@ -1401,19 +1707,38 @@ For example: "Work" or "Personal" 1 2 False - 4 - 8 + 18 + 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Checking for New Mail</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - 6 True 1 2 @@ -1427,11 +1752,53 @@ For example: "Work" or "Personal" False 6 + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + True True - _Automatically check for new mail every + Automatically check for _new mail every True GTK_RELIEF_NORMAL False @@ -1467,8 +1834,8 @@ For example: "Work" or "Personal" True - minute(s) - False + _minute(s) + True False GTK_JUSTIFY_CENTER False @@ -1477,6 +1844,7 @@ For example: "Work" or "Personal" 0.5 0 0 + extra_auto_check_min 0 @@ -1493,24 +1861,10 @@ For example: "Work" or "Personal" - - - - - True - Checking for New Mail - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + False + False @@ -1519,7 +1873,6 @@ For example: "Work" or "Personal" 2 0 1 - fill @@ -1539,7 +1892,7 @@ For example: "Work" or "Personal" True - Receiving _Options + Receiving Options True False GTK_JUSTIFY_CENTER @@ -1557,25 +1910,25 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 True False - 3 + 12 True - 1 - 2 + 2 + 3 False - 0 - 3 + 6 + 12 @@ -1586,8 +1939,8 @@ For example: "Work" or "Personal" GTK_JUSTIFY_RIGHT False False - 1 - 0.5 + 0 + 0 0 0 transport_type_omenu @@ -1639,440 +1992,722 @@ For example: "Work" or "Personal" - - - 0 - False - False - - - - - True - False - 3 + + + True + + + 2 + 3 + 0 + 1 + fill + + - + True - Description: + description False False - GTK_JUSTIFY_RIGHT - False + GTK_JUSTIFY_LEFT + True False - 1 + 0 0 0 0 - 0 - False - True + 1 + 3 + 1 + 2 + - + True - description + Description: False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_RIGHT False False - 7.45058e-09 + 0 0 0 0 - 0 - True - True + 0 + 1 + 1 + 2 + fill 0 - False - False + True + True + + + + + + True + + + 0 + True + True - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Server Configuration</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 3 + 12 - + True - 1 - 2 - False - 4 - 4 - - - - True - _Host: - True - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - transport_host - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 - 4 + 0 False - True + False - + True + 1 + 1 False - 6 - - - - True - _Use secure connection (SSL): - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - transport_use_ssl - - - 0 - False - False - - + 2 + 6 - + True - True - 0 + False + 6 - - + + True + 1 + 2 + False + 6 + 12 - + True - Always + _Host: True + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + transport_host + + 0 + 1 + 0 + 1 + fill + + - + True - Whenever Possible - True + True + True + True + 0 + + True + * + False + + 1 + 2 + 0 + 1 + + + + + 0 + False + True + + - - - True - Never - True - - + + + True + True + Ser_ver requires authentication + True + GTK_RELIEF_NORMAL + False + False + True + + 0 + False + False + - 0 - False - False + 0 + 1 + 0 + 1 0 - False - False - - - - - - True - False - (SSL is not supported in this build of evolution) - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - Ser_ver requires authentication - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False + True + True + + 0 + True + True + + + + 0 + True + True + + + + + + True + False + 6 - + True - Server Configuration + <span weight="bold">Authentication</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True False - 3 + 12 - + True - False - 3 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - _Authentication Type: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - transport_auth_omenu - - - 0 - False - False - - + + + True + 1 + 1 + False + 2 + 6 - + True - True - 0 + False + 6 - - + + True + 2 + 2 + False + 6 + 12 - + True - Password + T_ype: True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + transport_auth_omenu + + 0 + 1 + 0 + 1 + fill + + - + True - Kerberos + User_name: True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + transport_user + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + False + 6 + + + + True + True + 0 + + + + True + + + + True + Password + True + + + + + + True + Kerberos + True + + + + + + + 0 + False + False + + + + + + True + True + Ch_eck for Supported Types + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + + + 0 + True + True + + + + 1 + 2 + 0 + 1 + fill + + + 0 + False + True + - - - 0 - False - False - - - - - - True - 1 - 0.5 - 1 - 1 - + True True - _Check for supported types + Remember _password True GTK_RELIEF_NORMAL + False + False + True + + 0 + False + False + - 0 - False - False - GTK_PACK_END + 0 + 1 + 0 + 1 0 - False + True True + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + <span weight="bold">Security</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True False - 3 + 6 - + True - User_name: - True - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - transport_user + False + 12 + + + + True + _Use Secure Connection (SSL): + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + transport_use_ssl + + + 0 + False + False + + + + + + True + True + 0 + + + + True + + + + True + Always + True + + + + + + True + Whenever Possible + True + + + + + + True + Never + True + + + + + + + 0 + False + False + + 0 - False - False + True + True - + True - True - True - True - 0 - - True - * - False + False + 6 + + + + True + gtk-dialog-warning + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + <b>SSL is not supported in this build of evolution</b> + False + True + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + 0 @@ -2083,53 +2718,21 @@ For example: "Work" or "Personal" 0 - False - False - - - - - - True - True - Remember this _password - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False + True + True - - - - - True - Authentication - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - False + True True @@ -2150,7 +2753,7 @@ For example: "Work" or "Personal" True - _Sending Mail + Sending Mail True False GTK_JUSTIFY_CENTER @@ -2168,142 +2771,314 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 - + True False - 3 + 6 + + + + True + <span weight="bold">Sent and Draft Messages</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 12 - - 6 + True - 3 - 2 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 False - 6 + 2 6 - + True - Drafts _folder: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - drafts_button - - - 0 - 1 - 0 - 1 - fill - - - + False + 6 - - - True - Sent _messages folder: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - sent_button + + + True + 3 + 3 + False + 6 + 12 + + + + True + Drafts _Folder: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + drafts_button + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Sent _Messages Folder: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + sent_button + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + mail_account_gui_folder_selector_button_new + 0 + 0 + Wed, 03 Apr 2002 23:03:59 GMT + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + mail_account_gui_folder_selector_button_new + 0 + 0 + Wed, 03 Apr 2002 23:03:41 GMT + + + 1 + 2 + 0 + 1 + fill + + + + + + True + + + 2 + 3 + 0 + 1 + fill + + + + + + True + + + 2 + 3 + 1 + 2 + fill + fill + + + + + + True + False + 0 + + + + True + True + gtk-revert-to-saved + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + + + + + True + + + 0 + True + True + + + + + 1 + 3 + 2 + 3 + + + + + 0 + True + True + + 0 1 - 1 - 2 - fill - - - - - - - True - mail_account_gui_folder_selector_button_new - 0 - 0 - Wed, 03 Apr 2002 23:03:41 GMT - - - 1 - 2 0 1 - fill - - - - - - True - mail_account_gui_folder_selector_button_new - 0 - 0 - Wed, 03 Apr 2002 23:03:59 GMT - - - 1 - 2 - 1 - 2 - fill - - - - - - True - True - Restore Defaults - True - GTK_RELIEF_NORMAL - - - 1 - 2 - 2 - 3 - fill - + + 0 + True + True + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Composing Messages</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - Sent and Draft Messages + False False GTK_JUSTIFY_LEFT @@ -2315,51 +3090,41 @@ For example: "Work" or "Personal" 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - + True + 1 + 1 False - 0 + 2 + 6 - + True + 2 + 1 False - 0 + 6 + 12 - - 6 + True - 2 - 2 False - 6 - 6 + 6 True True - Always _carbon-copy (Cc) to: + Alway_s carbon-copy (cc) to: True GTK_RELIEF_NORMAL False @@ -2367,116 +3132,236 @@ For example: "Work" or "Personal" True - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - True - Always _blind carbon-copy (Bcc) to: - True - GTK_RELIEF_NORMAL - False - False - True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 + False + 2 + 6 + + + + True + False + 6 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + 1 + 0 + 1 + + + + + 0 + True + True + + - 0 - 1 - 1 - 2 - fill - + 0 + True + True + + + 0 + 1 + 0 + 1 + + + + + + True + False + 6 - + True True - True - True - 0 - - True - * - False + Always _blind carbon-copy (bcc) to: + True + GTK_RELIEF_NORMAL + False + False + True - 1 - 2 - 0 - 1 - + 0 + False + False - + True - True - True - True - 0 - - True - * - False + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 + False + 2 + 6 + + + + True + False + 6 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + 1 + 0 + 1 + + + + + 0 + True + True + + - 1 - 2 - 1 - 2 - + 0 + True + True - 0 - True - True + 0 + 1 + 1 + 2 - 0 - True - True + 0 + 1 + 0 + 1 - - - - - True - Composing Messages - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - False + True True @@ -2497,7 +3382,7 @@ For example: "Work" or "Personal" True - _Defaults + Defaults True False GTK_JUSTIFY_CENTER @@ -2515,52 +3400,144 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 - + True False - 3 + 6 + + + + True + <span weight="bold">Pretty Good Privacy (PGP/GPG)</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True + 1 + 1 False - 3 + 2 + 6 - - 3 + True False 6 - + + True + False + 12 + + + + True + PGP/GPG _Key ID: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + pgp_key + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + False + False + + + + + True - PGP/GPG _Key ID: + True + Always _sign outgoing messages when using this account True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - pgp_key + GTK_RELIEF_NORMAL + False + False + True 0 @@ -2570,109 +3547,125 @@ For example: "Work" or "Personal" - + True True - True - True - 0 - - True - * - False + Don't sign _meeting requests (for Outlook compatibility) + True + GTK_RELIEF_NORMAL + False + False + True 0 - True - True + False + False - - - 0 - False - False - - - - - True - True - _Always sign outgoing messages when using this account - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + + + True + True + Al_ways encrypt to myself when sending encrypted mail + True + GTK_RELIEF_NORMAL + True + False + True + + + 0 + False + False + + - - - True - True - Don't sign _meeting requests (for Outlook compatibility) - True - GTK_RELIEF_NORMAL - False - False - True + + + True + True + Always _trust keys in my keyring when encrypting + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - 0 - False - False + 0 + 1 + 0 + 1 + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + - - - True - True - Al_ways encrypt to myself when sending encrypted mail - True - GTK_RELIEF_NORMAL - True - False - True - - - 0 - False - False - - + + + True + False + 6 + + + + True + <span weight="bold">Secure MIME (S/MIME)</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - True - Always _trust keys in my keyring when encrypting - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - + + + True + False + 12 - + True - Pretty Good Privacy (PGP/GPG) + False False GTK_JUSTIFY_LEFT @@ -2684,61 +3677,20 @@ For example: "Work" or "Personal" 0 - label_item + 0 + False + False - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - 6 True 6 - 4 + 3 False - 5 - 9 - - - - True - Si_gning certificate: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - smime_sign_key - - - - - - 0 - 1 - 1 - 2 - fill - - - + 6 + 12 @@ -2761,34 +3713,6 @@ For example: "Work" or "Personal" - - - True - Encry_ption certificate: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - smime_encrypt_key - - - - - - 0 - 1 - 5 - 6 - fill - - - - True @@ -2811,287 +3735,343 @@ For example: "Work" or "Personal" - + True True + A_lso encrypt to self when sending encrypted mail + True GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Select... - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - + False + False + True - 2 + 0 3 - 5 - 6 + 4 + 5 fill - + True True + _Encrypt outgoing messages (by default) + True GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Select... - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - + False + False + True - 2 + 0 3 - 1 - 2 + 3 + 4 fill - + True True - gtk-clear - True + _Digitally sign outgoing messages (by default) + True GTK_RELIEF_NORMAL + False + False + True - 3 - 4 - 1 - 2 + 0 + 3 + 0 + 1 fill - + True - True - gtk-clear - True - GTK_RELIEF_NORMAL - 3 - 4 - 5 - 6 + 0 + 3 + 2 + 3 + 6 fill - + fill - + True - True - A_lso encrypt to self when sending encrypted mail + Encry_ption certificate: True - GTK_RELIEF_NORMAL - False - False - True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + smime_encrypt_key 0 - 4 - 4 - 5 + 1 + 5 + 6 fill - + True - True - _Encrypt outgoing messages (by default) + Si_gning certificate: True - GTK_RELIEF_NORMAL - False - False - True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + smime_sign_key 0 - 4 - 3 - 4 + 1 + 1 + 2 fill - + True + False + 6 + + + + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Select... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + True + gtk-clear + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + - 0 - 4 - 2 - 3 - 3 + 2 + 3 + 5 + 6 fill fill - + True - True - Digitally _sign outgoing messages (by default) - True - GTK_RELIEF_NORMAL - False - False - True + False + 6 + + + + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Select... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + True + True + gtk-clear + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + - 0 - 4 - 0 - 1 + 2 + 3 + 1 + 2 fill - + fill - - - - - True - Secure MIME (S/MIME) - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - False + True True @@ -3112,7 +4092,7 @@ For example: "Work" or "Personal" True - S_ecurity + Security True False GTK_JUSTIFY_CENTER @@ -3162,38 +4142,15 @@ For example: "Work" or "Personal" - 3 True False - 0 - - - - True - - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + 6 True GTK_BUTTONBOX_START - 3 + 6 @@ -3212,9 +4169,63 @@ For example: "Work" or "Personal" False True True - _Edit - True GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-properties + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Edit + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + @@ -3237,33 +4248,11 @@ For example: "Work" or "Personal" - - - True - - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - True GTK_BUTTONBOX_START - 3 + 6 @@ -3326,35 +4315,57 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Message Fonts</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 3 + 12 - + True - True - _Use the same fonts as other applications - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -3364,103 +4375,151 @@ For example: "Work" or "Personal" - + True - 2 - 2 + 1 + 1 False - 3 - 3 + 2 + 6 - + True - _Standard Font: - True - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - radFontVariable - - - 0 - 1 - 0 - 1 - fill - - - + False + 6 - - - True - True - Select HTML fixed width font - GNOME_FONT_PICKER_MODE_FONT_INFO - True - False - 14 - - - - 1 - 2 - 1 - 2 - fill - - - + + + True + True + _Use the same fonts as other applications + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + - - - True - True - Select HTML variable width font - GNOME_FONT_PICKER_MODE_FONT_INFO - True - False - 14 - - - - 1 - 2 - 0 - 1 - fill - - - + + + True + 2 + 2 + False + 6 + 6 - - - True - _Terminal Font: - True - False - GTK_JUSTIFY_RIGHT - False - False - 0 - 0.5 - 0 - 0 - radFontFixed + + + True + S_tandard Font: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + radFontVariable + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + Select HTML fixed width font + GNOME_FONT_PICKER_MODE_FONT_INFO + True + False + 14 + + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + Select HTML variable width font + GNOME_FONT_PICKER_MODE_FONT_INFO + True + False + 14 + + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + T_erminal Font: + True + False + GTK_JUSTIFY_RIGHT + False + False + 0 + 0.5 + 0 + 0 + radFontFixed + + + 0 + 1 + 1 + 2 + fill + + + + + + 0 + True + True + + 0 1 - 1 - 2 - fill - + 0 + 1 @@ -3471,24 +4530,10 @@ For example: "Work" or "Personal" - - - - - True - Message Fonts - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -3500,217 +4545,287 @@ For example: "Work" or "Personal" - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 6 + True - False - 3 - - - - True - False - 3 - - - - True - True - _Mark messages as read after - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - 1 - 1 - True - GTK_UPDATE_IF_VALID - False - False - 1.5 0 10 1 1 1 - - - 0 - False - False - - - - - - True - seconds - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + <span weight="bold">Message Display</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 - True - True + False + False - + True + 1 + 1 False - 3 - - - - True - Default character _encoding: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - omenuCharset - - - 0 - False - False - - + 2 + 6 - + True - True - 0 + False + 6 - - + + True + False + 6 - + True - Baltic (ISO-8859-13) + True + _Mark messages as read after True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_IF_VALID + False + False + 1.5 0 10 1 1 1 + + + 0 + False + False + + + + + + True + seconds + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + 0 + True + True + + + + + + True + False + 6 - + True - Baltic (ISO-8859-4) + True + Highlight _quotations with True + GTK_RELIEF_NORMAL + True + False + True + + + 0 + False + False + + + + + + True + True + True + False + Pick a color + + + 0 + False + False + + + + + + True + color + False + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + 0 + True + True + - - - 0 - False - False - - - - - 0 - True - True - - - - - True - False - 3 + + + True + False + 6 - - - True - True - Highlight _quotations with - True - GTK_RELIEF_NORMAL - True - False - True - - - 0 - False - False - - + + + True + Default character e_ncoding: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + omenuCharset + + + 0 + False + False + + - - - True - True - True - False - Pick a color - - - 0 - False - False - - + + + True + True + 0 - - - True - color - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 + + + True + + + + True + Baltic (ISO-8859-13) + True + + + + + + True + Baltic (ISO-8859-4) + True + + + + + + + 0 + False + False + + + + + 0 + True + True + + - 0 - False - False + 0 + 1 + 0 + 1 @@ -3721,167 +4836,226 @@ For example: "Work" or "Personal" + + 0 + True + True + + + + 0 + False + False + + + + + + True + False + 6 - + True - Message Display + <span weight="bold">Delete Mail</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True False - 3 + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True + 1 + 1 False - 3 + 2 + 6 - + True - True - Empty _trash folders on exit - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - + False + 6 - - - True - True - -1 + + + True + False + 4 + + + + True + True + Empty trash folders on e_xit + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + -1 + + + 0 + False + False + + + + + 0 + True + True + + - + + True + True + Confirm _when expunging a folder + True + GTK_RELIEF_NORMAL + False + False + True + + 0 + False + False + - 0 - False - False + 0 + 1 + 0 + 1 0 - False - False - - - - - - True - True - _Confirm when expunging a folder - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False + True + True + + 0 + True + True + + + + 0 + False + False + + + + + + True + False + 6 - + True - Deleting Mail + <span weight="bold">New Mail Notification</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True False - 3 + 12 - + True - True - _Do not notify me when new mail arrives - True - GTK_RELIEF_NORMAL - True - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -3891,133 +5065,166 @@ For example: "Work" or "Personal" - + True - True - _Beep when new mail arrives - True - GTK_RELIEF_NORMAL - False - False - True - radNotifyNot - - - 0 - False - False - - + 1 + 1 + False + 2 + 6 - - - True - True - _Play sound file when new mail arrives - True - GTK_RELIEF_NORMAL - False - False - True - radNotifyNot - - - 0 - False - False - - + + + True + False + 6 + + + + True + True + _Do not notify me when new mail arrives + True + GTK_RELIEF_NORMAL + True + False + True + + + 0 + False + False + + + + + + True + True + Beep w_hen new mail arrives + True + GTK_RELIEF_NORMAL + False + False + True + radNotifyNot + + + 0 + False + False + + + + + + True + True + Play sound file when new mail arri_ves + True + GTK_RELIEF_NORMAL + False + False + True + radNotifyNot + + + 0 + False + False + + - - - 3 - True - False - 3 + + + True + False + 6 - - - True - Specify _filename: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - txtNotifyPlaySound - - - 0 - False - False - - + + + True + Specify _filename: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + txtNotifyPlaySound + + + 0 + False + False + + - - - True - 10 - Execute Command... - False - False + + + True + 10 + Execute Command... + False + False - - - True - True - True - True - 0 - - True - * - False + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + True + True + + + + 0 + False + False + - 0 - True - True + 0 + 1 + 0 + 1 0 - False - False + True + True - - - - - True - New Mail Notification - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - True - True + False + False @@ -4030,7 +5237,7 @@ For example: "Work" or "Personal" True - _General + General True False GTK_JUSTIFY_CENTER @@ -4048,33 +5255,73 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 12 + + + + True + <span weight="bold">General</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 3 + 6 - + True True - _Never load images off the net + _Show animated images True GTK_RELIEF_NORMAL - True + False False True @@ -4086,16 +5333,15 @@ For example: "Work" or "Personal" - + True True - _Load images if sender is in address book + _Prompt when sending HTML messages to contacts that don't want them True GTK_RELIEF_NORMAL False False True - radImagesNever 0 @@ -4103,18 +5349,136 @@ For example: "Work" or "Personal" False + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Loading Images</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 - + True - True - _Always load images off the net - True - GTK_RELIEF_NORMAL - False - False - True - radImagesNever + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + True + _Never load images from the Internet + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + _Load images if sender is in address book + True + GTK_RELIEF_NORMAL + False + False + True + radImagesNever + + + 0 + False + False + + + + + + True + True + _Always load images from the Internet + True + GTK_RELIEF_NORMAL + False + False + True + radImagesNever + + + 0 + False + False + + 0 @@ -4123,24 +5487,10 @@ For example: "Work" or "Personal" - - - - - True - Loading Images - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + False + False @@ -4150,42 +5500,6 @@ For example: "Work" or "Personal" False - - - - True - True - _Show animated images - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - _Prompt when sending HTML messages to contacts that don't want them - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - False @@ -4196,7 +5510,7 @@ For example: "Work" or "Personal" True - _HTML Mail + HTML Mail True False GTK_JUSTIFY_CENTER @@ -4213,28 +5527,68 @@ For example: "Work" or "Personal" - - 6 + + 12 True False - 3 + 6 + + + + True + <span weight="bold">Labels and Colors</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - 6 True 6 - 3 + 2 False - 3 - 3 + 6 + 6 @@ -4437,48 +5791,47 @@ For example: "Work" or "Personal" - + True - True - _Restore defaults - True - GTK_RELIEF_NORMAL + False + 6 + + + + True + True + gtk-revert-to-saved + True + GTK_RELIEF_NORMAL + + + 0 + False + False + + - 2 - 3 + 0 + 2 5 6 fill - + fill - - - - - True - Labels and Colors - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 - False - False + True + True @@ -4491,7 +5844,7 @@ For example: "Work" or "Personal" True - C_olors + Colors True False GTK_JUSTIFY_CENTER @@ -4509,15 +5862,15 @@ For example: "Work" or "Personal" - 6 + 12 True False - 0 + 6 - + True - <b>_Displayed Mail Headers</b> + <span weight="bold">Displayed Mail _Headers</span> True True GTK_JUSTIFY_LEFT @@ -4537,17 +5890,37 @@ For example: "Work" or "Personal" - - 6 + True False - 0 + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - + True False - 6 + 12 @@ -4574,7 +5947,7 @@ For example: "Work" or "Personal" True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE + GTK_SHADOW_IN GTK_CORNER_TOP_LEFT @@ -4603,10 +5976,10 @@ For example: "Work" or "Personal" - + True False - 0 + 6 @@ -4618,7 +5991,7 @@ For example: "Work" or "Personal" GTK_RELIEF_NORMAL - 6 + 0 False False @@ -4640,9 +6013,9 @@ For example: "Work" or "Personal" - 6 + 0 False - True + False @@ -4662,7 +6035,7 @@ For example: "Work" or "Personal" True - H_eaders + Headers True False GTK_JUSTIFY_LEFT @@ -4680,28 +6053,30 @@ For example: "Work" or "Personal" - 6 + 12 True False - 6 + 12 - + True False - 3 + 6 - + True - Checks incoming mail messages to be Junk - True - Check _Incoming Mail - True - GTK_RELIEF_NORMAL - False - False - True + <span weight="bold">General</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 0 @@ -4709,38 +6084,131 @@ For example: "Work" or "Personal" False + + + + True + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 + False + 2 + 6 + + + + True + Checks incoming mail messages to be Junk + True + Check _Incoming Mail + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + 1 + 0 + 1 + + + + + + 0 + True + True + + + + + 0 + True + True + + 0 False - True + False - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Filter Options</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 3 + 12 - + True - True - _Local Tests Only - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -4750,48 +6218,74 @@ For example: "Work" or "Personal" - + True - True - Use _Daemon - True - GTK_RELIEF_NORMAL - False - False - True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + False + 6 + + + + True + True + _Local Tests Only + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Use _Daemon + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + 0 - False - False + True + True - - - - - True - Filter Options - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 False - True + False @@ -4804,7 +6298,7 @@ For example: "Work" or "Personal" True - _Junk + Junk True False GTK_JUSTIFY_LEFT @@ -4843,126 +6337,299 @@ For example: "Work" or "Personal" - 6 + 12 True False - 3 + 18 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Default Behavior</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 3 + 0 - + True - 3 - 2 + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 False - 3 - 3 + 2 + 6 - + True - _Forward style: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + False + 6 - - - True - _Reply style: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - + + + True + True + Format messages in _HTML + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Automatically _insert smiley images + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + 3 + 2 + False + 6 + 12 + + + + True + _Reply style: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + 7.45058e-09 + 0.5 + 0 + 1 + + + + True + False + 0 + + + + True + True + 0 + + + + True + + + + True + Quote original message + True + + + + + + True + Do not quote original message + True + + + + + + True + Attach original message + True + + + + + + + 0 + True + True + + + + + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + False + 0 - - - True - 7.45058e-09 - 0.5 - 0 - 1 + + + True + True + 0 - - - True - False - 0 + + + True + + + + True + Attachment + True + + + + + + True + Inline + True + + + + + + True + Quoted + True + + + + + + + 0 + False + False + + + + + 1 + 2 + 0 + 1 + fill + fill + + - + True True 0 - + True - - True - Quote original message - True - - - - - + True - Do not quote original message + Baltic (ISO-8859-13) True - + True - Attach original message + Baltic (ISO-8859-4) True @@ -4970,241 +6637,134 @@ For example: "Work" or "Personal" - 0 - False - False + 1 + 2 + 2 + 3 + fill + - - - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - False - 0 - - - - True - True - 0 - - - - True - - - - True - Attachment - True - - - - - - True - Inline - True - - - - - - True - Quoted - True - - - - - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - fill - - - - - - True - C_haracter set: - True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - omenuCharset - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - 0 - - - - True - + True - Baltic (ISO-8859-13) + _Forward style: True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + omenuCharset + + 0 + 1 + 0 + 1 + fill + + - + True - Baltic (ISO-8859-4) + C_haracter set: True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + omenuCharset + + 0 + 1 + 2 + 3 + fill + + + + 0 + True + True + - 1 - 2 - 2 - 3 - fill - + 0 + 1 + 0 + 1 0 - False - False - - - - - - True - True - Format messages in _HTML - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - - True - True - _Automatically insert smiley images - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False + True + True + + 0 + True + True + - + True - Default Behavior + <span weight="bold">Alerts</span> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - label_item + 0 + False + False - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 + True False - 3 + 0 - + True - True - _Prompt when sending messages with an empty subject line - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 0 @@ -5213,16 +6773,64 @@ For example: "Work" or "Personal" - - - True - True - Pr_ompt when sending messages with only Bcc recipients defined - True - GTK_RELIEF_NORMAL - False - False - True + + + True + 1 + 1 + False + 2 + 6 + + + + True + False + 6 + + + + True + True + _Prompt when sending messages with an empty subject line + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + + True + True + Pr_ompt when sending messages with only Bcc recipients defined + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + 1 + 0 + 1 + + 0 @@ -5231,31 +6839,17 @@ For example: "Work" or "Personal" - - - - - True - Alerts - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True 0 False - True + False @@ -5268,7 +6862,7 @@ For example: "Work" or "Personal" True - _General + General True False GTK_JUSTIFY_CENTER @@ -5286,57 +6880,346 @@ For example: "Work" or "Personal" - 3 + 12 True False - 3 + 12 - - 6 + True False 6 - + + True + <b>S_ignatures</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + listSignatures + + + 0 + False + False + + + + + True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 6 - + True - True - True - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + + + + 0 + True + True + + + + + + True + False + 3 + + + + True + GTK_BUTTONBOX_START + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-execute + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Add _Script + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-properties + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Edit + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + + + + + 0 + True + True + + + + 0 + False + False + 0 - True - True + True + True + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + <b>Preview</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False - + True False - 3 + 12 - + True False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 @@ -5352,54 +7235,15 @@ For example: "Work" or "Personal" - + True - GTK_BUTTONBOX_START - 3 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - Add Sc_ript - True - GTK_RELIEF_NORMAL - - - - - - - True - True - True - _Edit - True - GTK_RELIEF_NORMAL - - + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - + @@ -5416,47 +7260,6 @@ For example: "Work" or "Personal" - - 0 - True - True - - - - - - True - False - 3 - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - - - - - - 0 - True - True - - - 0 False @@ -5473,7 +7276,7 @@ For example: "Work" or "Personal" True - _Signatures + Signatures True False GTK_JUSTIFY_CENTER @@ -5491,22 +7294,24 @@ For example: "Work" or "Personal" - 6 + 12 True False - 6 + 12 True False - 12 + 6 True + gtk-dialog-info + 6 0.5 - 0.5 + 0 0 0 @@ -5533,76 +7338,59 @@ For example: "Work" or "Personal" 0 - False - False + True + True 0 False - True - - - - - - True - - - 0 - False - True + False - + True False 6 - + True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - + <b>_Languages</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + listSpellCheckLanguage 0 - True - True + False + False - + True False - 5 + 12 - + True False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 @@ -5618,22 +7406,107 @@ For example: "Work" or "Personal" - + True - GTK_BUTTONBOX_START - 0 + False + 6 - + True - False - True - True - _Enable - True - GTK_RELIEF_NORMAL - + False + 6 + + + + True + False + 0 + + + + True + False + 6 + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + False + True + True + _Enable + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + 0 + False + False + + + + 0 + True + True + @@ -5645,7 +7518,7 @@ For example: "Work" or "Personal" 0 - False + True True @@ -5658,29 +7531,51 @@ For example: "Work" or "Personal" - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 + + + + True + <span weight="bold">Options</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False - 3 + 12 - + True - True - Check spelling while I _type - True - GTK_RELIEF_NORMAL - False - False - True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 0 @@ -5690,25 +7585,21 @@ For example: "Work" or "Personal" - + True False 6 - + True - Color for _misspelled words: + True + Check spelling while I _type True - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - colorpickerSpellCheckColor + GTK_RELIEF_NORMAL + False + False + True 0 @@ -5717,47 +7608,68 @@ For example: "Work" or "Personal" - - - True - True - True - False - Pick a color - + + + True + False + 6 + + + + True + Color for _misspelled words: + True + False + GTK_JUSTIFY_CENTER + False + False + 0.5 + 0.5 + 0 + 0 + colorpickerSpellCheckColor + + + 0 + False + False + + + + + + True + True + True + False + Pick a color + + + + 0 + False + False + + 0 False - False + True 0 - False + True True - - - - - True - Options - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -5777,7 +7689,7 @@ For example: "Work" or "Personal" True - Spell _Checking + Spell Checking True False GTK_JUSTIFY_CENTER @@ -5806,142 +7718,180 @@ For example: "Work" or "Personal" - 4 True False - 4 + 12 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + False + 6 - - 4 + + True + <span weight="bold">Printed Fonts</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + True - 2 - 2 False - 4 - 6 + 0 - + True - V_ariable-width: - True + + False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 - 0 + 12 0 - print_variable - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True - Fi_xed -width: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - print_fixed - - - 0 - 1 - 1 - 2 - fill - - - + 2 + 2 + False + 6 + 12 - - - True - True - Select HTML fixed width font for printing - GNOME_FONT_PICKER_MODE_FONT_INFO - True - False - 14 - - - - 1 - 2 - 1 - 2 - fill - - - + + + True + V_ariable-width: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + print_variable + + + 0 + 1 + 0 + 1 + fill + + + - - - True - True - Select HTML variable width font for printing - GNOME_FONT_PICKER_MODE_FONT_INFO - True - False - 14 - + + + True + Fi_xed -width: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + print_fixed + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + Select HTML fixed width font for printing + GNOME_FONT_PICKER_MODE_FONT_INFO + True + False + 14 + + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + Select HTML variable width font for printing + GNOME_FONT_PICKER_MODE_FONT_INFO + True + False + 14 + + + + 1 + 2 + 0 + 1 + fill + + + - 1 - 2 - 0 - 1 - fill - + 0 + True + True - - - - - True - Printed Fonts - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - label_item + 0 + True + True @@ -5962,13 +7912,13 @@ For example: "Work" or "Personal" False True False - True + False True False - 6 + 12 @@ -5980,10 +7930,64 @@ For example: "Work" or "Personal" True True True - _Add Signature - True GTK_RELIEF_NORMAL 0 + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Add Signature + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + @@ -6015,7 +8019,7 @@ For example: "Work" or "Personal" - 6 + 12 True False 6 @@ -6024,13 +8028,15 @@ For example: "Work" or "Personal" True False - 12 + 6 True + gtk-dialog-info + 6 0.5 - 0.5 + 0 0 0 @@ -6191,8 +8197,8 @@ for display purposes only. 0 - True - True + False + False diff --git a/mail/mail-search.glade b/mail/mail-search.glade index 10b84e99a2..10d36746a6 100644 --- a/mail/mail-search.glade +++ b/mail/mail-search.glade @@ -2,22 +2,24 @@ + + 6 True Find in Message GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False - False + True False - True + False True False - 0 + 12 @@ -57,14 +59,6 @@ - - 6 - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - 6 True @@ -75,7 +69,7 @@ True False - 6 + 12 @@ -133,7 +127,7 @@ GTK_JUSTIFY_CENTER False False - 0.5 + 1 0.5 0 0 @@ -141,7 +135,7 @@ 0 False - False + True @@ -163,27 +157,6 @@ - - - - - True - Search - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - 0 True diff --git a/mail/mail-security.glade b/mail/mail-security.glade index 5dfbed673e..dfe490a7e5 100644 --- a/mail/mail-security.glade +++ b/mail/mail-security.glade @@ -2,8 +2,10 @@ + + 6 True Security Information GTK_WINDOW_TOPLEVEL @@ -11,13 +13,13 @@ False True False - True + False True False - 0 + 6 @@ -46,6 +48,7 @@ + 6 True True True @@ -56,35 +59,48 @@ - 6 + 12 + True + False + 18 + + + True False 6 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + <span weight="bold">Digital Signature</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 6 + True False 0 - - - - - - - + True - Digital Signature + False False GTK_JUSTIFY_LEFT @@ -92,31 +108,27 @@ False 0.5 0.5 - 0 + 12 0 - label_item - - - - 0 - True - True + False + False - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + 1 + 1 + False + 2 + 6 - - 6 + True False 0 @@ -125,12 +137,72 @@ + + 0 + 1 + 0 + 1 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Encryption</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + - + True - Encryption + False + 0 + + + + True + False False GTK_JUSTIFY_LEFT @@ -138,11 +210,40 @@ False 0.5 0.5 - 0 + 12 0 - label_item + 0 + False + False + + + + + + True + 1 + 1 + False + 2 + 6 + + + + True + False + 0 + + + + + + + 0 + 1 + 0 + 1 @@ -153,6 +254,20 @@ + + 0 + True + True + + + + + 0 + False + False + + + False True diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 6a2f62eaf6..404522f1f3 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -280,8 +280,11 @@ construct (MessageTagEditor *editor) gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up")); gnome_window_icon_set_from_file (GTK_WINDOW (editor), EVOLUTION_IMAGES "/flag-for-followup-16.png"); - gtk_container_set_border_width (GTK_CONTAINER (editor), 6); - + + gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12); + gui = glade_xml_new (EVOLUTION_GLADEDIR "/message-tags.glade", "followup_editor", NULL); widget = glade_xml_get_widget (gui, "toplevel"); diff --git a/mail/message-tags.glade b/mail/message-tags.glade index 1b58fe297d..c8601cfbf3 100644 --- a/mail/message-tags.glade +++ b/mail/message-tags.glade @@ -11,13 +11,13 @@ False True False - True + False - + True False - 3 + 12 @@ -58,9 +58,10 @@ + 6 True False - 6 + 12 @@ -142,7 +143,7 @@ Please select a follow up action from the "Flag" menu. True - 2 + 3 3 False 6 @@ -176,7 +177,7 @@ Please select a follow up action from the "Flag" menu. True - _Due by: + _Due By: True False GTK_JUSTIFY_CENTER @@ -215,45 +216,6 @@ Please select a follow up action from the "Flag" menu. - - - True - True - C_ompleted - True - GTK_RELIEF_NORMAL - False - False - True - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - target_date_new - 0 - 0 - Sat, 09 Feb 2002 00:20:24 GMT - - - 1 - 2 - 1 - 2 - fill - fill - - - True @@ -314,6 +276,44 @@ Please select a follow up action from the "Flag" menu. + + + + True + target_date_new + 0 + 0 + Sat, 09 Feb 2002 00:20:24 GMT + + + 1 + 3 + 1 + 2 + fill + + + + + + True + True + C_ompleted + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 3 + 2 + 3 + fill + + + 0 diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade index c38505df4d..95ee676ae0 100644 --- a/mail/subscribe-dialog.glade +++ b/mail/subscribe-dialog.glade @@ -3,9 +3,7 @@ - - 500 - 400 + True Folder Subscriptions GTK_WINDOW_TOPLEVEL @@ -13,305 +11,284 @@ False True False + False - - - 12 + + True False - 6 + 0 - - + + True - False - 6 + GTK_BUTTONBOX_END - + True - S_erver: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - store_menu + True + True + gtk-refresh + True + GTK_RELIEF_NORMAL + 0 - - 0 - False - False - - + True + True True - 0 + gtk-close + True + GTK_RELIEF_NORMAL + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 12 + True + False + 12 + + + + True + False + 12 - + + True + S_erver: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + store_menu + + + 0 + False + False + + + + + + True + True + 0 - - True - None Selected - True - + + + + + True + None Selected + True + + + + + 0 + False + False + - - - 0 - False - False - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.1 - + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.1 + + + + 0 + False + False + GTK_PACK_END + + 0 False False - GTK_PACK_END - - - 0 - False - False - - - - - - True - False - 6 - + True - GTK_BUTTONBOX_START + False 6 - + True - True - True - GTK_RELIEF_NORMAL + GTK_BUTTONBOX_START + 6 - + True - 0.5 - 0.5 - 0 - 0 + True + True + GTK_RELIEF_NORMAL - + True - False - 2 + 0.5 + 0.5 + 0 + 0 - + True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 2 - - - True - _Subscribe - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Subscribe + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 0 - False - False - - - - - - - True - True - True - GTK_RELIEF_NORMAL - + True - 0.5 - 0.5 - 0 - 0 + True + True + GTK_RELIEF_NORMAL - + True - False - 2 + 0.5 + 0.5 + 0 + 0 - + True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 2 - - - True - _Unsubscribe - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Unsubscribe + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 0 - False - False - - - - - 0 - False - False - GTK_PACK_END - - - - - 0 - True - True - - - - - - True - - - 0 - False - True - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-refresh - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - + + 0 + False + False + GTK_PACK_END + @@ -323,8 +300,8 @@ 0 - False - False + True + True -- cgit