fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)
[claws.git] / src / prefs_summaries.c
index 58aa9391ebb482c580e76986b5811551ae12ab54..2ffe1dbc589cd21c82bfd62427f60ec08adca44c 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2015 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2005-2018 Colin Leroy and 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
@@ -54,7 +54,6 @@ typedef struct _SummariesPage
 
        GtkWidget *window;
 
-       GtkWidget *checkbtn_transhdr;
        GtkWidget *optmenu_folder_unread;
        GtkWidget *spinbtn_ng_abbrev_len;
        GtkWidget *checkbtn_useaddrbook;
@@ -74,9 +73,16 @@ typedef struct _SummariesPage
        GtkWidget *spinbtn_mark_as_read_delay;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *checkbtn_ask_mark_all_read;
+       GtkWidget *checkbtn_ask_override_colorlabel;
        GtkWidget *optmenu_sort_key;
        GtkWidget *optmenu_sort_type;
        GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *checkbtn_folder_default_thread;
+       GtkWidget *checkbtn_folder_default_thread_collapsed;
+       GtkWidget *checkbtn_folder_default_hide_read_threads;
+       GtkWidget *checkbtn_folder_default_hide_read_msgs;
+       GtkWidget *checkbtn_folder_default_hide_del_msgs;
+       GtkWidget *checkbtn_summary_col_lock;
 
 } SummariesPage;
 
@@ -198,6 +204,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
        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);
+       gtk_window_set_type_hint(GTK_WINDOW(datefmt_win), GDK_WINDOW_TYPE_HINT_DIALOG);
        gtk_widget_set_size_request(datefmt_win, 440, 280);
 
        vbox1 = gtk_vbox_new(FALSE, 10);
@@ -304,8 +311,6 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                         G_CALLBACK(date_format_entry_on_change),
                         label3);
 
-       gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
-
        gtk_widget_show(datefmt_win);
        manage_window_set_transient(GTK_WINDOW(datefmt_win));
        gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
@@ -320,9 +325,10 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 {
        SummariesPage *prefs_summaries = (SummariesPage *) _page;
        
-       GtkWidget *checkbtn_transhdr;
+       GtkWidget *notebook;
        GtkWidget *hbox0, *hbox1, *hbox2;
        GtkWidget *vbox1, *vbox2, *vbox3, *vbox4;
+       GtkWidget *frame_new_folders;
        GtkWidget *optmenu_folder_unread;
        GtkWidget *label_ng_abbrev;
        GtkWidget *spinbtn_ng_abbrev_len;
@@ -333,7 +339,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
-       GtkWidget *hbox_dispitem;
        GtkWidget *button_dispitem;
        GtkWidget *checkbtn_reopen_last_folder;
        GtkWidget *checkbtn_always_show_msg;
@@ -346,27 +351,49 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkAdjustment *spinbtn_mark_as_read_delay_adj;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *checkbtn_ask_mark_all_read;
+       GtkWidget *checkbtn_ask_override_colorlabel;
        GtkWidget *label, *label_fill;
        GtkListStore *menu;
        GtkTreeIter iter;
        GtkWidget *optmenu_nextunreadmsgdialog;
-       GtkWidget *folderview_frame;
-       GtkWidget *summaryview_frame;
        GtkWidget *button_edit_actions;
        GtkWidget *radio_mark_as_read_on_select;
        GtkWidget *radio_mark_as_read_on_new_win;
        GtkWidget *optmenu_sort_key;
        GtkWidget *optmenu_sort_type;
+       GtkWidget *checkbtn_folder_default_thread;
+       GtkWidget *checkbtn_folder_default_thread_collapsed;
+       GtkWidget *checkbtn_folder_default_hide_read_threads;
+       GtkWidget *checkbtn_folder_default_hide_read_msgs;
+       GtkWidget *checkbtn_folder_default_hide_del_msgs;
+       GtkWidget *checkbtn_summary_col_lock;
+
+       notebook = gtk_notebook_new();
+       gtk_widget_show(notebook);
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+                                gtk_label_new(_("Folder list")));
        
-       vbox2 = gtkut_get_options_frame(vbox1, &folderview_frame, _("Folder list"));
+       hbox0 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox0);
+       gtk_box_pack_start(GTK_BOX(vbox1), hbox0, FALSE, TRUE, 0);
+
+       label = gtk_label_new(_("Displayed columns"));
+       gtk_widget_show(label);
+       gtk_box_pack_start(GTK_BOX(hbox0), 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 (hbox0), button_dispitem, FALSE, FALSE, 0);
+       g_signal_connect (G_OBJECT (button_dispitem), "clicked",
+                         G_CALLBACK (prefs_folder_column_open),
+                         NULL);
 
        hbox0 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox0);
-       gtk_box_pack_start(GTK_BOX (vbox2), hbox0, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX (vbox1), hbox0, FALSE, FALSE, 0);
 
        label = gtk_label_new (_("Display message count next to folder name"));
        gtk_widget_show (label);
@@ -383,14 +410,14 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        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, FALSE, 0);
-
        PACK_CHECK_BUTTON
-               (vbox2, checkbtn_reopen_last_folder,
+               (vbox1, checkbtn_reopen_last_folder,
                 _("Open last opened folder at start-up"));
 
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start(GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
        label_ng_abbrev = gtk_label_new
                (_("Abbreviate newsgroup names longer than"));
        gtk_widget_show (label_ng_abbrev);
@@ -409,66 +436,59 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_ng_abbrev);
        gtk_box_pack_start (GTK_BOX (hbox1), label_ng_abbrev, FALSE, FALSE, 0);
 
-       hbox_dispitem = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox_dispitem);
-       gtk_box_pack_start(GTK_BOX(vbox2), hbox_dispitem, FALSE, TRUE, 0);
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+                                gtk_label_new(_("Message list")));
 
+       hbox0 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox0);
+       gtk_box_pack_start(GTK_BOX(vbox1), hbox0, 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);
+       gtk_box_pack_start(GTK_BOX(hbox0), 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);
+       gtk_box_pack_start (GTK_BOX (hbox0), button_dispitem, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_dispitem), "clicked",
-                         G_CALLBACK (prefs_folder_column_open),
+                         G_CALLBACK (prefs_summary_column_open),
                          NULL);
 
-       vbox2 = gtkut_get_options_frame(vbox1, &summaryview_frame, _("Message list"));
-
-       hbox1 = gtk_hbox_new(FALSE, 10);
-       gtk_widget_show(hbox1);
-       gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
+       PACK_SPACER(hbox0, hbox1, 4);
+       PACK_CHECK_BUTTON(hbox0, checkbtn_summary_col_lock, _("Lock column headers"));
 
-       label = gtk_label_new(_("Sort new folders by"));
-       gtk_widget_show(label);
-       gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, TRUE, 0);
 
-       optmenu_sort_key = gtkut_sc_combobox_create(NULL, FALSE);
-       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_key)));
-       gtk_widget_show(optmenu_sort_key);
+       label_datefmt = gtk_label_new (_("Date format"));
+       gtk_widget_show (label_datefmt);
+       gtk_box_pack_start (GTK_BOX (hbox2), label_datefmt, FALSE, FALSE, 0);
 
-       COMBOBOX_ADD(menu, _("Number"), SORT_BY_NUMBER);
-       COMBOBOX_ADD(menu, _("Size"), SORT_BY_SIZE);
-       COMBOBOX_ADD(menu, _("Date"), SORT_BY_DATE);
-       COMBOBOX_ADD(menu, _("Thread date"), SORT_BY_THREAD_DATE);
-       COMBOBOX_ADD(menu, _("From"), SORT_BY_FROM);
-       COMBOBOX_ADD(menu, _("To"), SORT_BY_TO);
-       COMBOBOX_ADD(menu, _("Subject"), SORT_BY_SUBJECT);
-       COMBOBOX_ADD(menu, _("Color label"), SORT_BY_LABEL);
-       COMBOBOX_ADD(menu, _("Tag"), SORT_BY_TAGS);
-       COMBOBOX_ADD(menu, _("Mark"), SORT_BY_MARK);
-       COMBOBOX_ADD(menu, _("Status"), SORT_BY_STATUS);
-       COMBOBOX_ADD(menu, _("Attachment"), SORT_BY_MIME);
-       COMBOBOX_ADD(menu, _("Score"), SORT_BY_SCORE);
-       COMBOBOX_ADD(menu, _("Locked"), SORT_BY_LOCKED);
-       COMBOBOX_ADD(menu, _("Don't sort"), SORT_BY_NONE);
+       entry_datefmt = gtk_entry_new ();
+       gtk_widget_show (entry_datefmt);
+       gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
 
-       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_key, FALSE, FALSE, 0);
+       button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
 
-       optmenu_sort_type = gtkut_sc_combobox_create(NULL, FALSE);
-       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_type)));
-       gtk_widget_show(optmenu_sort_type);
+       gtk_widget_show (button_datefmt);
+       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);
 
-       COMBOBOX_ADD(menu, _("Ascending"), SORT_ASCENDING);
-       COMBOBOX_ADD(menu, _("Descending"), SORT_DESCENDING);
+       label_fill = gtk_label_new(" ");
+       gtk_box_pack_start(GTK_BOX(hbox2), label_fill, TRUE, FALSE, 0);
 
-       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_type, FALSE, FALSE, 0);
+       CLAWS_SET_TIP(button_datefmt,
+                            _("Date format help"));
 
        hbox1 = gtk_hbox_new (FALSE, 10);
        gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, TRUE, 0);
 
-       button_edit_actions = gtk_button_new_with_label(_("Set default selection when entering a folder"));
+       button_edit_actions = gtk_button_new_with_label(_("Set message selection when entering a folder"));
        gtk_widget_show (button_edit_actions);
        gtk_box_pack_start (GTK_BOX (hbox1), button_edit_actions,
                          FALSE, TRUE, 0);
@@ -476,28 +496,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
                          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);
-
        /* Open message on select policy */
-       vbox4 = gtkut_get_options_frame(vbox2, NULL, _("Open message when selected"));
+       vbox4 = gtkut_get_options_frame(vbox1, NULL, _("Open message when selected"));
 
        PACK_CHECK_BUTTON(vbox4, checkbtn_always_show_msg,
                        _("Always"));
@@ -512,18 +512,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON(vbox4, checkbtn_show_on_directional,
                        _("When using directional keys"));
 
-       PACK_CHECK_BUTTON
-               (vbox2, checkbtn_threadsubj,
-                _("Thread using subject in addition to standard headers"));
-
-       PACK_CHECK_BUTTON
-               (vbox2, checkbtn_immedexec,
-                _("Execute immediately when moving or deleting messages"));
-       CLAWS_SET_TIP(checkbtn_immedexec,
-                            _("Defers moving, copying and deleting of messages"
-                              " until you choose 'Tools/Execute'"));
-
-       vbox3 = gtkut_get_options_frame(vbox2, NULL, _("Mark message as read"));
+       vbox3 = gtkut_get_options_frame(vbox1, NULL, _("Mark message as read"));
 
        radio_mark_as_read_on_select = gtk_radio_button_new_with_label(NULL,
                        _("when selected, after"));
@@ -549,70 +538,120 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start (GTK_BOX (vbox3), radio_mark_as_read_on_new_win,
                        FALSE, FALSE, 0);
        gtk_widget_show_all(vbox3);
-                                                                                             
+
+       /* Next Unread Message Dialog */
+       hbox1 = gtk_hbox_new (FALSE, 10);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), 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, checkbtn_useaddrbook,
+               (vbox1, checkbtn_useaddrbook,
                 _("Display sender using address book"));
-                
+
        PACK_CHECK_BUTTON
-               (vbox2, checkbtn_show_tooltips,
+               (vbox1, checkbtn_threadsubj,
+                _("Thread using subject in addition to standard headers"));
+
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_immedexec,
+                _("Execute immediately when moving or deleting messages"));
+       CLAWS_SET_TIP(checkbtn_immedexec,
+                            _("When unchecked moving, copying and deleting of messages"
+                              " is deferred until you use 'Tools/Execute'"));
+
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_ask_mark_all_read,
+                _("Confirm when marking all messages as read or unread"));
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_ask_override_colorlabel,
+                _("Confirm when changing color labels"));
+       
+       PACK_CHECK_BUTTON
+               (vbox1, checkbtn_show_tooltips,
                 _("Show tooltips"));
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
 
-       label_datefmt = gtk_label_new (_("Date format"));
-       gtk_widget_show (label_datefmt);
-       gtk_box_pack_start (GTK_BOX (hbox2), label_datefmt, FALSE, FALSE, 0);
+       vbox1 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox1);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+                                gtk_label_new(_("Defaults")));
 
-       entry_datefmt = gtk_entry_new ();
-       gtk_widget_show (entry_datefmt);
-       gtk_widget_set_size_request(entry_datefmt, 200, -1);
-       gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
+       vbox2 = gtkut_get_options_frame(vbox1, &frame_new_folders, _("New folders"));
 
-       button_datefmt = gtk_button_new_from_stock(GTK_STOCK_INFO);
+       hbox1 = gtk_hbox_new(FALSE, 10);
+       gtk_widget_show(hbox1);
+       gtk_box_pack_start(GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
-       gtk_widget_show (button_datefmt);
-       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);
-       
-       label_fill = gtk_label_new(" ");
-       gtk_box_pack_start(GTK_BOX(hbox2), label_fill, TRUE, FALSE, 0);
-       
-       CLAWS_SET_TIP(button_datefmt,
-                            _("Date format help"));
-                            
-       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"));
+       label = gtk_label_new(_("Sort by"));
        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_summary_column_open),
-                         NULL);
+       gtk_box_pack_start(GTK_BOX(hbox1), label, FALSE, FALSE, 0);
+
+       optmenu_sort_key = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_key)));
+       gtk_widget_show(optmenu_sort_key);
+
+       COMBOBOX_ADD(menu, _("Number"), SORT_BY_NUMBER);
+       COMBOBOX_ADD(menu, _("Size"), SORT_BY_SIZE);
+       COMBOBOX_ADD(menu, _("Date"), SORT_BY_DATE);
+       COMBOBOX_ADD(menu, _("Thread date"), SORT_BY_THREAD_DATE);
+       COMBOBOX_ADD(menu, _("From"), SORT_BY_FROM);
+       COMBOBOX_ADD(menu, _("To"), SORT_BY_TO);
+       COMBOBOX_ADD(menu, _("Subject"), SORT_BY_SUBJECT);
+       COMBOBOX_ADD(menu, _("Color label"), SORT_BY_LABEL);
+       COMBOBOX_ADD(menu, _("Tag"), SORT_BY_TAGS);
+       COMBOBOX_ADD(menu, _("Mark"), SORT_BY_MARK);
+       COMBOBOX_ADD(menu, _("Status"), SORT_BY_STATUS);
+       COMBOBOX_ADD(menu, _("Attachment"), SORT_BY_MIME);
+       COMBOBOX_ADD(menu, _("Score"), SORT_BY_SCORE);
+       COMBOBOX_ADD(menu, _("Locked"), SORT_BY_LOCKED);
+       COMBOBOX_ADD(menu, _("Don't sort"), SORT_BY_NONE);
+
+       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_key, FALSE, FALSE, 0);
+
+       optmenu_sort_type = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu_sort_type)));
+       gtk_widget_show(optmenu_sort_type);
+
+       COMBOBOX_ADD(menu, _("Ascending"), SORT_ASCENDING);
+       COMBOBOX_ADD(menu, _("Descending"), SORT_DESCENDING);
+
+       gtk_box_pack_start(GTK_BOX(hbox1), optmenu_sort_type, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON
-               (vbox1, checkbtn_ask_mark_all_read,
-                _("Confirm before marking all messages in a folder as read"));
+               (vbox2, checkbtn_folder_default_thread,
+                _("Thread view"));
        PACK_CHECK_BUTTON
-               (vbox1, checkbtn_transhdr,
-                _("Translate header names"));
-       CLAWS_SET_TIP(checkbtn_transhdr,
-                            _("The display of standard headers (such as 'From:', 'Subject:') "
-                            "will be translated into your language."));
-       
-       hbox2 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox2);
-       gtk_box_pack_start (GTK_BOX (vbox1), hbox2, FALSE, FALSE, 0);
+               (vbox2, checkbtn_folder_default_thread_collapsed,
+                _("Collapse all threads"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_hide_read_threads,
+                _("Hide read threads"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_hide_read_msgs,
+                _("Hide read messages"));
+       PACK_CHECK_BUTTON
+               (vbox2, checkbtn_folder_default_hide_del_msgs,
+                _("Hide deleted messages"));
 
-       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->checkbtn_useaddrbook = checkbtn_useaddrbook;
@@ -628,14 +667,22 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_summaries->checkbtn_show_on_deletemove = checkbtn_show_on_deletemove;
        prefs_summaries->checkbtn_show_on_directional = checkbtn_show_on_directional;
 
-               prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
+       prefs_summaries->checkbtn_mark_as_read_on_newwin = radio_mark_as_read_on_new_win;
        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->checkbtn_ask_override_colorlabel = checkbtn_ask_override_colorlabel;
        prefs_summaries->optmenu_sort_key = optmenu_sort_key;
        prefs_summaries->optmenu_sort_type = optmenu_sort_type;
        prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
 
+       prefs_summaries->checkbtn_folder_default_thread = checkbtn_folder_default_thread;
+       prefs_summaries->checkbtn_folder_default_thread_collapsed = checkbtn_folder_default_thread_collapsed;
+       prefs_summaries->checkbtn_folder_default_hide_read_threads = checkbtn_folder_default_hide_read_threads;
+       prefs_summaries->checkbtn_folder_default_hide_read_msgs = checkbtn_folder_default_hide_read_msgs;
+       prefs_summaries->checkbtn_folder_default_hide_del_msgs = checkbtn_folder_default_hide_del_msgs;
+       prefs_summaries->checkbtn_summary_col_lock = checkbtn_summary_col_lock;
+
        prefs_summaries->page.widget = vbox1;
        g_signal_connect(G_OBJECT(checkbtn_always_show_msg), "toggled",
                        G_CALLBACK(always_show_msg_toggled), prefs_summaries);
@@ -646,8 +693,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        prefs_summaries->window                 = GTK_WIDGET(window);
        
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_transhdr),
-                       prefs_common.trans_hdr);
        combobox_select_by_data(GTK_COMBO_BOX(optmenu_folder_unread),
                        prefs_common.display_folder_unread);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_useaddrbook),
@@ -684,6 +729,8 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
                        prefs_common.immediate_exec);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_mark_all_read),
                        prefs_common.ask_mark_all_read);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_ask_override_colorlabel),
+                       prefs_common.ask_override_colorlabel);
 
        combobox_select_by_data(GTK_COMBO_BOX(optmenu_sort_key),
                        prefs_common.default_sort_key);
@@ -692,16 +739,29 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 
        combobox_select_by_data(GTK_COMBO_BOX(optmenu_nextunreadmsgdialog),
                        prefs_common.next_unread_msg_dialog);
+
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_thread),
+                       prefs_common.folder_default_thread);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_thread_collapsed),
+                       prefs_common.folder_default_thread_collapsed);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_hide_read_threads),
+                       prefs_common.folder_default_hide_read_threads);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_hide_read_msgs),
+                       prefs_common.folder_default_hide_read_msgs);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_default_hide_del_msgs),
+                       prefs_common.folder_default_hide_del_msgs);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_summary_col_lock),
+                       prefs_common.summary_col_lock);
+
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+               
+       prefs_summaries->page.widget = notebook;
 }
 
 static void prefs_summaries_save(PrefsPage *_page)
 {
        SummariesPage *page = (SummariesPage *) _page;
 
-       prefs_common.trans_hdr = gtk_toggle_button_get_active(
-                       GTK_TOGGLE_BUTTON(page->checkbtn_transhdr));
-
-
        prefs_common.display_folder_unread = combobox_get_active_data(
                        GTK_COMBO_BOX(page->optmenu_folder_unread));
 
@@ -740,8 +800,12 @@ static void prefs_summaries_save(PrefsPage *_page)
                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.ask_override_colorlabel = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_ask_override_colorlabel));
        prefs_common.mark_as_read_delay = gtk_spin_button_get_value_as_int(
                        GTK_SPIN_BUTTON(page->spinbtn_mark_as_read_delay));
+       prefs_common.summary_col_lock = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_summary_col_lock));
 
        prefs_common.default_sort_key = combobox_get_active_data(
                        GTK_COMBO_BOX(page->optmenu_sort_key));
@@ -749,6 +813,19 @@ static void prefs_summaries_save(PrefsPage *_page)
                        GTK_COMBO_BOX(page->optmenu_sort_type));
        prefs_common.next_unread_msg_dialog = combobox_get_active_data(
                        GTK_COMBO_BOX(page->optmenu_nextunreadmsgdialog));
+       prefs_common.folder_default_thread =  gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_folder_default_thread));
+       prefs_common.folder_default_thread_collapsed =  gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_folder_default_thread_collapsed));
+       prefs_common.folder_default_hide_read_threads =  gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_folder_default_hide_read_threads));
+       prefs_common.folder_default_hide_read_msgs =  gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_folder_default_hide_read_msgs));
+       prefs_common.folder_default_hide_del_msgs =  gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_folder_default_hide_del_msgs));
+       prefs_common.folder_default_hide_del_msgs =  gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_folder_default_hide_del_msgs));
+
        main_window_reflect_prefs_all();
 }
 
@@ -892,6 +969,7 @@ static void date_format_select_row(GtkTreeView *list_view,
        strncpy(new_format, old_format, cur_pos);
        new_format[cur_pos] = '\0';
        strcat(new_format, format);
+       g_free(format);
        strcat(new_format, &old_format[cur_pos]);
 
        gtk_entry_set_text(GTK_ENTRY(datefmt_sample), new_format);