diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 35 | ||||
| -rw-r--r-- | mail/mail-accounts.h | 3 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 | ||||
| -rw-r--r-- | mail/mail-config.glade | 46 | ||||
| -rw-r--r-- | 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 <fejj@ximian.com> + * 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 @@ -675,6 +675,24 @@ prompt_empty_subject_toggled (GtkWidget *toggle, gpointer data) } 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) { int style = GPOINTER_TO_INT (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 <class>GtkCheckButton</class> <name>checkMarkTimeout</name> <can_focus>True</can_focus> - <label>Mark messages as "Read" after</label> + <label>Mark messages as Read after</label> <active>False</active> <draw_indicator>True</draw_indicator> <child> @@ -2612,7 +2612,7 @@ Kerberos <widget> <class>GtkLabel</class> <name>label39</name> - <label>Default "Forward" style is: </label> + <label>Default Forward style is: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -2802,6 +2802,48 @@ Quoted <fill>False</fill> </child> </widget> + + <widget> + <class>GtkCheckButton</class> + <name>chkPromptBccOnly</name> + <can_focus>True</can_focus> + <label>Prompt when sending messages with only Bcc recipients defined</label> + <active>True</active> + <draw_indicator>True</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>chkThreadedList</name> + <can_focus>True</can_focus> + <label>Message list should display in a threaded fasion by default</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkCheckButton</class> + <name>chkShowPreview</name> + <can_focus>True</can_focus> + <label>Message preview should be displayed by default</label> + <active>True</active> + <draw_indicator>True</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> </widget> <widget> 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 |