From fc59208aa9f8ec8fc95982773064f4030388971a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 24 Jul 2001 00:53:24 +0000 Subject: Fixed the "Read" to be Read in the glade file per menesis' request. 2001-07-23 Jeffrey Stedfast * mail-config.glade: Fixed the "Read" to be Read in the glade file per menesis' request. * mail-accounts.c (construct): Give the dialog a Close button instead of an OK button. (prompt_bcc_only_toggled): New. (threaded_list_toggled): New. (show_preview_toggled): New. (construct): Add code for the bcc-only-prompt, threaded-list, and show-preview checkboxes. * mail-ops.c (transfer_messages_transfer): If the source and destination folders are the same, just mark the uids as undeleted (in case they were marked as deleted before). svn path=/trunk/; revision=11327 --- mail/ChangeLog | 11 +++++++++++ mail/mail-accounts.c | 35 ++++++++++++++++++++++++++++++++++- mail/mail-accounts.h | 3 +++ mail/mail-callbacks.c | 2 +- mail/mail-config.glade | 46 ++++++++++++++++++++++++++++++++++++++++++++-- mail/mail-search.c | 2 +- 6 files changed, 94 insertions(+), 5 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 3a2a834534..b23cb92df2 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,16 @@ 2001-07-23 Jeffrey Stedfast + * mail-config.glade: Fixed the "Read" to be Read in the glade file + per menesis' request. + + * mail-accounts.c (construct): Give the dialog a Close button + instead of an OK button. + (prompt_bcc_only_toggled): New. + (threaded_list_toggled): New. + (show_preview_toggled): New. + (construct): Add code for the bcc-only-prompt, threaded-list, and + show-preview checkboxes. + * mail-ops.c (transfer_messages_transfer): If the source and destination folders are the same, just mark the uids as undeleted (in case they were marked as deleted before). diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index d1abcb136d..5cdb5683a2 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -674,6 +674,24 @@ prompt_empty_subject_toggled (GtkWidget *toggle, gpointer data) mail_config_set_prompt_empty_subject (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); } +static void +prompt_bcc_only_toggled (GtkWidget *toggle, gpointer data) +{ + mail_config_set_prompt_only_bcc (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); +} + +static void +thread_list_toggled (GtkWidget *toggle, gpointer data) +{ + mail_config_set_thread_list (NULL, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); +} + +static void +show_preview_toggled (GtkWidget *toggle, gpointer data) +{ + mail_config_set_show_preview (NULL, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); +} + static void forward_style_activated (GtkWidget *item, gpointer data) { @@ -724,7 +742,7 @@ construct (MailAccountsDialog *dialog) gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Account Manager")); gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300); - gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_OK); + gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE); dialog->mail_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts")); gtk_signal_connect (GTK_OBJECT (dialog->mail_accounts), "select-row", @@ -844,6 +862,21 @@ construct (MailAccountsDialog *dialog) gtk_signal_connect (GTK_OBJECT (dialog->prompt_empty_subject), "toggled", GTK_SIGNAL_FUNC (prompt_empty_subject_toggled), dialog); + dialog->prompt_bcc_only = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptBccOnly")); + gtk_toggle_button_set_active (dialog->prompt_bcc_only, mail_config_get_prompt_only_bcc ()); + gtk_signal_connect (GTK_OBJECT (dialog->prompt_bcc_only), "toggled", + GTK_SIGNAL_FUNC (prompt_bcc_only_toggled), dialog); + + dialog->thread_list = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkThreadList")); + gtk_toggle_button_set_active (dialog->thread_list, mail_config_get_thread_list (NULL)); + gtk_signal_connect (GTK_OBJECT (dialog->thread_list), "toggled", + GTK_SIGNAL_FUNC (thread_list_toggled), dialog); + + dialog->show_preview = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkShowPreview")); + gtk_toggle_button_set_active (dialog->show_preview, mail_config_get_show_preview (NULL)); + gtk_signal_connect (GTK_OBJECT (dialog->show_preview), "toggled", + GTK_SIGNAL_FUNC (show_preview_toggled), dialog); + /* now to fill in the clists */ dialog->accounts_row = -1; dialog->accounts = mail_config_get_accounts (); diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h index 7cc853c0b6..227a887010 100644 --- a/mail/mail-accounts.h +++ b/mail/mail-accounts.h @@ -87,6 +87,9 @@ struct _MailAccountsDialog { /* Other page */ GtkToggleButton *empty_trash; GtkToggleButton *prompt_empty_subject; + GtkToggleButton *prompt_bcc_only; + GtkToggleButton *thread_list; + GtkToggleButton *show_preview; /* PGP page */ GnomeFileEntry *pgp_path; diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 5a4e782671..7f61351f6f 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -224,7 +224,7 @@ ask_confirm_for_empty_subject (EMsgComposer *composer) { /* FIXME: EMessageBox should really handle this stuff automagically. What Miguel thinks would be nice is to pass - in a message-id which could be used as a key in the config + in a unique id which could be used as a key in the config file and the value would be an int. -1 for always show or the button pressed otherwise. This probably means we'd have to write e_messagebox_run () */ diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 47368419f6..d655b9d88b 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2447,7 +2447,7 @@ Kerberos GtkCheckButton checkMarkTimeout True - + False True @@ -2612,7 +2612,7 @@ Kerberos GtkLabel label39 - + GTK_JUSTIFY_CENTER False 0.5 @@ -2802,6 +2802,48 @@ Quoted False + + + GtkCheckButton + chkPromptBccOnly + True + + True + True + + 0 + False + False + + + + + GtkCheckButton + chkThreadedList + True + + False + True + + 0 + False + False + + + + + GtkCheckButton + chkShowPreview + True + + True + True + + 0 + False + False + + diff --git a/mail/mail-search.c b/mail/mail-search.c index 7cc7a13e52..c0f60496ad 100644 --- a/mail/mail-search.c +++ b/mail/mail-search.c @@ -164,7 +164,7 @@ static void toggled_fwd_cb (GtkToggleButton *b, MailSearch *ms) { ms->search_forward = gtk_toggle_button_get_active (b); - gtk_html_engine_search_set_forward (ms->mail->html, ms->search_forward); + /*gtk_html_engine_search_set_forward (ms->mail->html, ms->search_forward);*/ } static void -- cgit