2007-08-04 [colin] 2.10.0cvs89
[claws.git] / src / prefs_summaries.c
index 2323adad1979a3e9a8c6dee3c646821316a84e6f..4c0ab30f998ed69db34df34431905169e488346b 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2005-2007 Colin Leroy <colin@colino.net> & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#ifdef G_OS_WIN32
+#  include <w32lib.h>
+#endif
+
 #include "prefs_common.h"
 #include "prefs_gtk.h"
+#include "prefs_summary_open.h"
 #include "prefs_summary_column.h"
+#include "prefs_folder_column.h"
 
+#include "gtk/menu.h"
 #include "gtk/gtkutils.h"
 #include "gtk/prefswindow.h"
+#include "gtk/combobox.h"
 
 #include "manage_window.h"
 
@@ -46,14 +54,22 @@ typedef struct _SummariesPage
 
        GtkWidget *window;
 
-       GtkWidget *chkbtn_transhdr;
-       GtkWidget *chkbtn_folder_unread;
+       GtkWidget *checkbtn_transhdr;
+       GtkWidget *optmenu_folder_unread;
        GtkWidget *spinbtn_ng_abbrev_len;
-       GtkWidget *chkbtn_swapfrom;
-       GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_threadsubj;
+       GtkWidget *checkbtn_useaddrbook;
+       GtkWidget *checkbtn_threadsubj;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
+
+       GtkWidget *checkbtn_reopen_last_folder;
+       GtkWidget *checkbtn_always_show_msg;
+       GtkWidget *checkbtn_mark_as_read_on_newwin;
+       GtkWidget *spinbtn_mark_as_read_delay;
+       GtkWidget *checkbtn_immedexec;
+       GtkWidget *checkbtn_ask_mark_all_read;
+       GtkWidget *optmenu_nextunreadmsgdialog;
+
 } SummariesPage;
 
 enum {
@@ -121,7 +137,6 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                { "%Z", NULL }
        };
 
-       gchar *titles[2];
        gint i;
        const gint TIME_FORMAT_ELEMS =
                sizeof time_format / sizeof time_format[0];
@@ -167,7 +182,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                                   -1);
        }
 
-       datefmt_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       datefmt_win = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_summaries");
        gtk_container_set_border_width(GTK_CONTAINER(datefmt_win), 8);
        gtk_window_set_title(GTK_WINDOW(datefmt_win), _("Date format"));
        gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
@@ -186,7 +201,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
 
        datefmt_list_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
        g_object_unref(G_OBJECT(store));
-       gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(datefmt_list_view), TRUE);
+       gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(datefmt_list_view),
+                                    prefs_common.use_stripes_everywhere);
        gtk_widget_show(datefmt_list_view);
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), datefmt_list_view);
 
@@ -248,8 +264,8 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5);
 
-       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                               &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL,
+                                     &ok_btn, GTK_STOCK_OK, NULL, NULL);
 
        gtk_box_pack_start(GTK_BOX(vbox1), confirm_area, FALSE, FALSE, 0);
        gtk_widget_show(confirm_area);
@@ -287,49 +303,82 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        return datefmt_win;
 }
 
-void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, 
+static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, 
                                  gpointer data)
 {
        SummariesPage *prefs_summaries = (SummariesPage *) _page;
        
        GtkWidget *vbox1;
-       GtkWidget *chkbtn_transhdr;
-       GtkWidget *chkbtn_folder_unread;
+       GtkWidget *checkbtn_transhdr;
+       GtkWidget *hbox0;
+       GtkWidget *optmenu_folder_unread;
        GtkWidget *hbox1;
        GtkWidget *label_ng_abbrev;
        GtkWidget *spinbtn_ng_abbrev_len;
        GtkObject *spinbtn_ng_abbrev_len_adj;
-       GtkWidget *frame_summary;
        GtkWidget *vbox2;
-       GtkWidget *chkbtn_swapfrom;
-       GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_threadsubj;
-       GtkWidget *vbox3;
+       GtkWidget *checkbtn_useaddrbook;
+       GtkWidget *checkbtn_threadsubj;
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
+       GtkTooltips *tip_datefmt;
+       GtkWidget *hbox_dispitem;
        GtkWidget *button_dispitem;
 
+       GtkWidget *hbox2;
+       GtkWidget *checkbtn_reopen_last_folder;
+       GtkWidget *checkbtn_always_show_msg;
+       GtkWidget *checkbtn_mark_as_read_on_newwin;
+       GtkWidget *spinbtn_mark_as_read_delay;
+       GtkObject *spinbtn_mark_as_read_delay_adj;
+       GtkWidget *checkbtn_immedexec;
+       GtkWidget *checkbtn_ask_mark_all_read;
+       GtkTooltips *immedexec_tooltip;
+       GtkWidget *label, *label_fill;
+       GtkListStore *menu;
+       GtkTreeIter iter;
+       GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *folderview_frame;
+       GtkWidget *summaryview_frame;
+       GtkWidget *button_edit_actions;
+
+       GtkTooltips *tooltips;
+
+       tooltips = gtk_tooltips_new();
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       
+       vbox2 = gtkut_get_options_frame(vbox1, &folderview_frame, _("Folder list"));
 
-       vbox2 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, TRUE, 0);
+       hbox0 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox0);
+       gtk_box_pack_start(GTK_BOX (vbox2), hbox0, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON
-               (vbox2, chkbtn_transhdr,
-                _("Translate header name (such as `From:', `Subject:')"));
+       label = gtk_label_new (_("Display message number next to folder name"));
+       gtk_widget_show (label);
+       gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON (vbox2, chkbtn_folder_unread,
-                          _("Display unread number next to folder name"));
+       optmenu_folder_unread = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_folder_unread)));
+       gtk_widget_show (optmenu_folder_unread);
+       
+       COMBOBOX_ADD (menu, _("No"), 0);
+       COMBOBOX_ADD (menu, _("Unread messages"), 1);
+       COMBOBOX_ADD (menu, _("Unread and Total messages"), 2);
 
-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+       gtk_box_pack_start(GTK_BOX(hbox0), optmenu_folder_unread, FALSE, FALSE, 0);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_reopen_last_folder,
+                _("Open last opened folder at startup"));
 
        label_ng_abbrev = gtk_label_new
                (_("Abbreviate newsgroup names longer than"));
@@ -346,113 +395,250 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_ng_abbrev_len),
                                     TRUE);
 
-       label_ng_abbrev = gtk_label_new
-               (_("letters"));
+       label_ng_abbrev = gtk_label_new (_("letters"));
        gtk_widget_show (label_ng_abbrev);
        gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
-       /* ---- Summary ---- */
+       hbox_dispitem = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox_dispitem);
+       gtk_box_pack_start(GTK_BOX(vbox2), hbox_dispitem, FALSE, TRUE, 0);
+
+       label = gtk_label_new(_("Displayed columns"));
+       gtk_widget_show(label);
+       gtk_box_pack_start(GTK_BOX(hbox_dispitem), label, FALSE, FALSE, 0);
+       button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+       gtk_widget_show (button_dispitem);
+       gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
+       g_signal_connect (G_OBJECT (button_dispitem), "clicked",
+                         G_CALLBACK (prefs_folder_column_open),
+                         NULL);
+
+       vbox2 = gtkut_get_options_frame(vbox1, &summaryview_frame, _("Message list"));
 
-       PACK_FRAME(vbox1, frame_summary, _("Summary View"));
+       hbox1 = gtk_hbox_new (FALSE, 10);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
-       vbox2 = gtk_vbox_new (FALSE, 0);
-       gtk_widget_show (vbox2);
-       gtk_container_add (GTK_CONTAINER (frame_summary), vbox2);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+       button_edit_actions = gtk_button_new_with_label(_("Set default selection when entering a folder"));
+       gtk_widget_show (button_edit_actions);
+       gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions,
+                         FALSE, TRUE, 0);
+       g_signal_connect (G_OBJECT (button_edit_actions), "clicked",
+                         G_CALLBACK (prefs_summary_open_open),
+                         NULL);
+
+       /* Next Unread Message Dialog */
+       hbox1 = gtk_hbox_new (FALSE, 10);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);   
+
+       label = gtk_label_new (_("Show \"no unread (or new) message\" dialog"));
+       gtk_widget_show (label);
+       gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
+       
+       optmenu_nextunreadmsgdialog = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(
+                               GTK_COMBO_BOX(optmenu_nextunreadmsgdialog)));
+       gtk_widget_show (optmenu_nextunreadmsgdialog);
+
+       COMBOBOX_ADD (menu, _("Always"), NEXTUNREADMSGDIALOG_ALWAYS);
+       COMBOBOX_ADD (menu, _("Assume 'Yes'"), NEXTUNREADMSGDIALOG_ASSUME_YES);
+       COMBOBOX_ADD (menu, _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
+
+       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_nextunreadmsgdialog, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON
-               (vbox2, chkbtn_swapfrom,
-                _("Display recipient in `From' column if sender is yourself"));
-       PACK_CHECK_BUTTON
-               (vbox2, chkbtn_useaddrbook,
-                _("Display sender using address book"));
+               (vbox2, checkbtn_always_show_msg,
+                _("Always open message when selected"));
        PACK_CHECK_BUTTON
-               (vbox2, chkbtn_threadsubj,
+               (vbox2, checkbtn_threadsubj,
                 _("Thread using subject in addition to standard headers"));
 
-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
+       immedexec_tooltip = gtk_tooltips_new();
 
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_immedexec,
+                _("Execute immediately when moving or deleting messages"));
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(immedexec_tooltip), checkbtn_immedexec,
+                            _("Defers moving, copying and deleting of messages"
+                              " until you choose 'Tools/Execute'"),
+                            NULL);
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_mark_as_read_on_newwin,
+                _("Only mark message as read when opened \n"
+                  "in a new window, or replied to"));
+                
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
 
+       gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new
+               (_("Mark messages as read after")), FALSE, FALSE, 0);
+
+       spinbtn_mark_as_read_delay_adj = gtk_adjustment_new (0, 0, 60, 1, 10, 10);
+       spinbtn_mark_as_read_delay = gtk_spin_button_new
+               (GTK_ADJUSTMENT (spinbtn_mark_as_read_delay_adj), 1, 0);
+       gtk_box_pack_start (GTK_BOX (hbox1), spinbtn_mark_as_read_delay,
+                           FALSE, FALSE, 0);
+       gtk_widget_set_size_request (spinbtn_mark_as_read_delay, 56, -1);
+       gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_mark_as_read_delay),
+                                    TRUE);
+       gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new
+               (_("seconds")), FALSE, FALSE, 0);
+       gtk_widget_show_all(hbox1);
+
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_useaddrbook,
+                _("Display sender using address book"));
+                
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 0);
+
        label_datefmt = gtk_label_new (_("Date format"));
        gtk_widget_show (label_datefmt);
-       gtk_box_pack_start (GTK_BOX (hbox1), label_datefmt, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox2), label_datefmt, FALSE, FALSE, 0);
 
        entry_datefmt = gtk_entry_new ();
        gtk_widget_show (entry_datefmt);
-       gtk_box_pack_start (GTK_BOX (hbox1), entry_datefmt, TRUE, TRUE, 0);
+       gtk_widget_set_size_request(entry_datefmt, 200, -1);
+       gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
 
-       button_datefmt = gtk_button_new_with_label (" ... ");
+#if GTK_CHECK_VERSION(2, 8, 0)
+       button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
+#else
+       button_datefmt = gtk_button_new_with_label ("Info...");
+#endif
 
        gtk_widget_show (button_datefmt);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_datefmt), "clicked",
                          G_CALLBACK (date_format_create), NULL);
-
-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
-
-       button_dispitem = gtk_button_new_with_label
-               (_(" Set displayed items in summary... "));
+       
+       label_fill = gtk_label_new(" ");
+       gtk_box_pack_start(GTK_BOX(hbox2), label_fill, TRUE, FALSE, 0);
+       
+       tip_datefmt = gtk_tooltips_new();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tip_datefmt),
+                            button_datefmt,
+                            _("Date format help"), NULL);
+                            
+       hbox_dispitem = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox_dispitem);
+       gtk_box_pack_start(GTK_BOX(vbox2), hbox_dispitem, FALSE, TRUE, 0);
+       
+       label = gtk_label_new(_("Displayed columns"));
+       gtk_widget_show(label);
+       gtk_box_pack_start(GTK_BOX(hbox_dispitem), label, FALSE, FALSE, 0);
+       button_dispitem = gtk_button_new_from_stock(GTK_STOCK_EDIT);
        gtk_widget_show (button_dispitem);
-       gtk_box_pack_start (GTK_BOX (hbox1), button_dispitem, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox_dispitem), button_dispitem, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_dispitem), "clicked",
                          G_CALLBACK (prefs_summary_column_open),
                          NULL);
 
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_ask_mark_all_read,
+                _("Confirm before marking all mails in a folder as read"));
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_transhdr,
+                _("Translate header names"));
+       gtk_tooltips_set_tip(tooltips, checkbtn_transhdr,
+                            _("The display of standard headers (such as 'From:', 'Subject:') "
+                            "will be translated into your language."), NULL);
+       
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
+
+
        prefs_summaries->window                 = GTK_WIDGET(window);
        
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_transhdr),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
                        prefs_common.trans_hdr);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_folder_unread),
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_folder_unread),
                        prefs_common.display_folder_unread);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_swapfrom),
-                       prefs_common.swap_from);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_useaddrbook),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
                        prefs_common.use_addr_book);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_threadsubj),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_threadsubj),
                        prefs_common.thread_by_subject);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_ng_abbrev_len),
                        prefs_common.ng_abbrev_len);
        gtk_entry_set_text(GTK_ENTRY(entry_datefmt), 
                        prefs_common.date_format?prefs_common.date_format:"");  
 
-       prefs_summaries->chkbtn_transhdr = chkbtn_transhdr;
-       prefs_summaries->chkbtn_folder_unread = chkbtn_folder_unread;
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_reopen_last_folder),
+                       prefs_common.goto_last_folder_on_startup);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_always_show_msg),
+                       prefs_common.always_show_msg);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_mark_as_read_on_newwin),
+                       prefs_common.mark_as_read_on_new_window);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_mark_as_read_delay),
+                       prefs_common.mark_as_read_delay);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_immedexec),
+                       prefs_common.immediate_exec);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
+                       prefs_common.ask_mark_all_read);
+
+       combobox_select_by_data(GTK_COMBO_BOX(optmenu_nextunreadmsgdialog),
+                       prefs_common.next_unread_msg_dialog);
+
+       prefs_summaries->checkbtn_transhdr = checkbtn_transhdr;
+       prefs_summaries->optmenu_folder_unread = optmenu_folder_unread;
        prefs_summaries->spinbtn_ng_abbrev_len = spinbtn_ng_abbrev_len;
-       prefs_summaries->chkbtn_swapfrom = chkbtn_swapfrom;
-       prefs_summaries->chkbtn_useaddrbook = chkbtn_useaddrbook;
-       prefs_summaries->chkbtn_threadsubj = chkbtn_threadsubj;
+       prefs_summaries->checkbtn_useaddrbook = checkbtn_useaddrbook;
+       prefs_summaries->checkbtn_threadsubj = checkbtn_threadsubj;
        prefs_summaries->entry_datefmt = entry_datefmt;
 
+       prefs_summaries->checkbtn_reopen_last_folder = checkbtn_reopen_last_folder;
+       prefs_summaries->checkbtn_always_show_msg = checkbtn_always_show_msg;
+       prefs_summaries->checkbtn_mark_as_read_on_newwin = checkbtn_mark_as_read_on_newwin;
+       prefs_summaries->spinbtn_mark_as_read_delay = spinbtn_mark_as_read_delay;
+       prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
+       prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
+       prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+
        prefs_summaries->page.widget = vbox1;
 }
 
-void prefs_summaries_save(PrefsPage *_page)
+static void prefs_summaries_save(PrefsPage *_page)
 {
        SummariesPage *page = (SummariesPage *) _page;
 
        prefs_common.trans_hdr = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_transhdr));
-       prefs_common.display_folder_unread = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_folder_unread));
-       prefs_common.swap_from = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_swapfrom));
+                       GTK_TOGGLE_BUTTON(page->checkbtn_transhdr));
+
+
+       prefs_common.display_folder_unread = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_folder_unread));
+
        prefs_common.use_addr_book = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_useaddrbook));
+                       GTK_TOGGLE_BUTTON(page->checkbtn_useaddrbook));
        prefs_common.thread_by_subject = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->chkbtn_threadsubj));
+                       GTK_TOGGLE_BUTTON(page->checkbtn_threadsubj));
        prefs_common.ng_abbrev_len = gtk_spin_button_get_value_as_int(
                        GTK_SPIN_BUTTON(page->spinbtn_ng_abbrev_len));
        
        g_free(prefs_common.date_format); 
        prefs_common.date_format = gtk_editable_get_chars(
                        GTK_EDITABLE(page->entry_datefmt), 0, -1);      
+
+       prefs_common.goto_last_folder_on_startup = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_reopen_last_folder));
+       prefs_common.always_show_msg = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_always_show_msg));
+       prefs_common.mark_as_read_on_new_window = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_mark_as_read_on_newwin));
+       prefs_common.immediate_exec = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_immedexec));
+       prefs_common.ask_mark_all_read = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_ask_mark_all_read));
+       prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
+                       GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
+
+       prefs_common.next_unread_msg_dialog = combobox_get_active_data(
+                       GTK_COMBO_BOX(page->optmenu_nextunreadmsgdialog));
+       main_window_reflect_prefs_all();
 }
 
 static void prefs_summaries_destroy_widget(PrefsPage *_page)
@@ -475,7 +661,7 @@ void prefs_summaries_init(void)
        page->page.create_widget = prefs_summaries_create_widget;
        page->page.destroy_widget = prefs_summaries_destroy_widget;
        page->page.save_page = prefs_summaries_save;
-       page->page.weight = 60.0;
+       page->page.weight = 140.0;
        prefs_gtk_register_page((PrefsPage *) page);
        prefs_summaries = page;
 }
@@ -543,13 +729,14 @@ static void date_format_entry_on_change(GtkEditable *editable,
        struct tm *cal_time;
        gchar buffer[100];
        gchar *text;
+       struct tm lt;
 
        cur_time = time(NULL);
-       cal_time = localtime(&cur_time);
+       cal_time = localtime_r(&cur_time, &lt);
        buffer[0] = 0;
        text = gtk_editable_get_chars(editable, 0, -1);
        if (text)
-               strftime(buffer, sizeof buffer, text, cal_time); 
+               fast_strftime(buffer, sizeof buffer, text, cal_time); 
        g_free(text);
 
        text = conv_codeset_strdup(buffer,