2005-10-06 [colin] 1.9.15cvs16

[claws.git] / src / prefs_summaries.c

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index d5453a414ebde87281b3b584ec268918afe5cb2c..84b026ee4f1e0e6477af4b468832a4c020bdc3e5 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -14,7 +14,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -60,6 +60,7 @@ typedef struct _SummariesPage
        GtkWidget *checkbtn_mark_as_read_on_newwin;
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
+       GtkWidget *checkbtn_ask_mark_all_read;
        GtkWidget *optmenu_select_on_entry;
        GtkWidget *optmenu_nextunreadmsgdialog;
 
@@ -710,6 +711,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_mark_as_read_on_newwin;
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
+       GtkWidget *checkbtn_ask_mark_all_read;
        GtkTooltips *immedexec_tooltip;
        GtkWidget *label;
        GtkWidget *menu;
@@ -856,6 +858,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
                               " if this is turned off"),
                             NULL);
 
+       PACK_CHECK_BUTTON
+               (vbox3, checkbtn_ask_mark_all_read,
+                _("Confirm before marking all mails in a folder as read"));
+
        hbox1 = gtk_hbox_new (FALSE, 0);
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
@@ -875,9 +881,9 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        
        menu = gtk_menu_new ();
        MENUITEM_ADD (menu, menuitem, _("Do nothing"), 0);
-       MENUITEM_ADD (menu, menuitem, _("Select first unread message"),
+       MENUITEM_ADD (menu, menuitem, _("Select first unread (or new) message"),
                      SELECTONENTRY_UNREAD);
-       MENUITEM_ADD (menu, menuitem, _("Select first new message"),
+       MENUITEM_ADD (menu, menuitem, _("Select first new (or unread) message"),
                      SELECTONENTRY_NEW);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_select_on_entry), menu);
@@ -887,7 +893,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (hbox_nextunreadmsgdialog);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox_nextunreadmsgdialog, FALSE, FALSE, 0);
 
-       label = gtk_label_new (_("Show no-unread-message dialog"));
+       label = gtk_label_new (_("Show \"no unread (or new) message\" dialog"));
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox_nextunreadmsgdialog), label, FALSE, FALSE, 8);
 
@@ -938,6 +944,8 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
                        prefs_common.open_inbox_on_inc);
        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);
 
        gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_select_on_entry),
                        prefs_common.select_on_entry);
@@ -955,6 +963,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_summaries->checkbtn_mark_as_read_on_newwin = checkbtn_mark_as_read_on_newwin;
        prefs_summaries->checkbtn_openinbox = checkbtn_openinbox;
        prefs_summaries->checkbtn_immedexec = checkbtn_immedexec;
+       prefs_summaries->checkbtn_ask_mark_all_read = checkbtn_ask_mark_all_read;
        prefs_summaries->optmenu_select_on_entry = optmenu_select_on_entry;
        prefs_summaries->optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
 
@@ -990,6 +999,8 @@ void prefs_summaries_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->checkbtn_openinbox));
        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));
 
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_select_on_entry));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));