projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
move 'msg selection when entering a folder" button to Message List page
[claws.git] / src / prefs_summary_open.c
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index 9f6e5469143b14046e7b2b3bde47fa9ad242bdb8..b9e6b824d92ceda1d272cbd26d7cb5af6a0c32d8 100644 (file)
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -105,13 +106,16 @@ static EntryAction saved_summary_select_prio[SUMMARY_OPEN_ACTIONS-1];
 
 static gchar *action_name[SUMMARY_OPEN_ACTIONS] = 
 {        ("UNSET (!)"),
-        N_("first marked email"),
-        N_("first new email"),
-        N_("first unread email"),
+        N_("oldest marked email"),
+        N_("oldest new email"),
+        N_("oldest unread email"),
         N_("last opened email"),
-        N_("last email in the list"),
+        N_("newest email in the list"),
         N_("none"),
-        N_("first email in the list")
+        N_("oldest email in the list"),
+        N_("newest marked email"),
+        N_("newest new email"),
+        N_("newest unread email")
 };
 
 void prefs_summary_open_open(void)
@@ -163,6 +167,7 @@ static void prefs_summary_open_create(void)
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
        gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
+       gtk_widget_set_size_request (GTK_WIDGET (window), 610, 310);
 
        vbox = gtk_vbox_new (FALSE, 6);
        gtk_widget_show (vbox);
@@ -180,7 +185,7 @@ static void prefs_summary_open_create(void)
        gtk_widget_grab_default (ok_btn);
 
        gtk_window_set_title (GTK_WINDOW(window),
-                             _(" Selection when entering a folder"));
+                             _("Message selection when entering a folder"));
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
        g_signal_connect (G_OBJECT(window), "delete_event",
                          G_CALLBACK(prefs_summary_open_deleted),
@@ -215,7 +220,6 @@ static void prefs_summary_open_create(void)
        gtk_box_pack_start (GTK_BOX (list_view_hbox), list_view_hbox1, TRUE, TRUE, 0);
 
        list_view_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_set_size_request (list_view_scrolledwin, 200, 210);
        gtk_widget_show (list_view_scrolledwin);
        gtk_box_pack_start (GTK_BOX (list_view_hbox1), list_view_scrolledwin,
                            TRUE, TRUE, 0);
@@ -226,7 +230,7 @@ static void prefs_summary_open_create(void)
                                            GTK_SHADOW_IN);
 
        possible_actions_list_view = prefs_summary_open_list_view_create
-                               (_("Possible selections"));
+                               (_("Available selections"));
        gtk_widget_show (possible_actions_list_view);
        gtk_container_add(GTK_CONTAINER(list_view_scrolledwin), possible_actions_list_view);
 
@@ -251,7 +255,6 @@ static void prefs_summary_open_create(void)
        gtk_box_pack_start (GTK_BOX (list_view_hbox), list_view_hbox2, TRUE, TRUE, 0);
 
        list_view_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-       gtk_widget_set_size_request (list_view_scrolledwin, 200, 230);
        gtk_widget_show (list_view_scrolledwin);
        gtk_box_pack_start (GTK_BOX (list_view_hbox2), list_view_scrolledwin,
                            TRUE, TRUE, 0);
@@ -262,7 +265,7 @@ static void prefs_summary_open_create(void)
                                            GTK_SHADOW_IN);
 
        actions_list_view = prefs_summary_open_list_view_create
-                                       (_("Selection on folder opening"));
+                                       (_("Current selections"));
        g_signal_connect (G_OBJECT (del_btn), "clicked",
                          G_CALLBACK (prefs_summary_open_delete_cb),
                          actions_list_view);
@@ -294,7 +297,6 @@ static void prefs_summary_open_create(void)
        gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (down_btn), "clicked",
                          G_CALLBACK (prefs_summary_open_down), NULL);
-       
 
        gtk_widget_show_all(window);
 
@@ -315,27 +317,30 @@ static void prefs_summary_open_create(void)
        prefs_common.summary_select_prio[4] = ACTION_UNSET;             \
        prefs_common.summary_select_prio[5] = ACTION_UNSET;             \
        prefs_common.summary_select_prio[6] = ACTION_UNSET;             \
-}                                                      
+       prefs_common.summary_select_prio[7] = ACTION_UNSET;             \
+       prefs_common.summary_select_prio[8] = ACTION_UNSET;             \
+       prefs_common.summary_select_prio[9] = ACTION_UNSET;             \
+}
 
 void prefs_summary_open_set_defaults(void)
 {
        switch (prefs_common.select_on_entry) {
                case SELECTONENTRY_MNU:
-                       SET_PRIO(ACTION_MARKED, ACTION_NEW, ACTION_UNREAD, ACTION_LAST_LIST); break;
+                       SET_PRIO(ACTION_OLDEST_MARKED, ACTION_OLDEST_NEW, ACTION_OLDEST_UNREAD, ACTION_NEWEST_LIST); break;
                case SELECTONENTRY_MUN:
-                       SET_PRIO(ACTION_MARKED, ACTION_UNREAD, ACTION_NEW, ACTION_LAST_LIST); break;
+                       SET_PRIO(ACTION_OLDEST_MARKED, ACTION_OLDEST_UNREAD, ACTION_OLDEST_NEW, ACTION_NEWEST_LIST); break;
                case SELECTONENTRY_NMU:
-                       SET_PRIO(ACTION_NEW, ACTION_MARKED, ACTION_UNREAD, ACTION_LAST_LIST); break;
+                       SET_PRIO(ACTION_OLDEST_NEW, ACTION_OLDEST_MARKED, ACTION_OLDEST_UNREAD, ACTION_NEWEST_LIST); break;
                case SELECTONENTRY_NUM:
-                       SET_PRIO(ACTION_NEW, ACTION_UNREAD, ACTION_MARKED, ACTION_LAST_LIST); break;
+                       SET_PRIO(ACTION_OLDEST_NEW, ACTION_OLDEST_UNREAD, ACTION_OLDEST_MARKED, ACTION_NEWEST_LIST); break;
                case SELECTONENTRY_UNM:
-                       SET_PRIO(ACTION_UNREAD, ACTION_NEW, ACTION_MARKED, ACTION_LAST_LIST); break;
+                       SET_PRIO(ACTION_OLDEST_UNREAD, ACTION_OLDEST_NEW, ACTION_OLDEST_MARKED, ACTION_NEWEST_LIST); break;
                case SELECTONENTRY_UMN:
-                       SET_PRIO(ACTION_UNREAD, ACTION_MARKED, ACTION_NEW, ACTION_LAST_LIST); break;
+                       SET_PRIO(ACTION_OLDEST_UNREAD, ACTION_OLDEST_MARKED, ACTION_OLDEST_NEW, ACTION_NEWEST_LIST); break;
                case SELECTONENTRY_LAST:
-                       SET_PRIO(ACTION_LAST_OPENED, ACTION_LAST_LIST, ACTION_UNSET, ACTION_UNSET); break;
+                       SET_PRIO(ACTION_LAST_OPENED, ACTION_NEWEST_LIST, ACTION_UNSET, ACTION_UNSET); break;
                case SELECTONENTRY_NOTHING:
-                       SET_PRIO(ACTION_LAST_LIST, ACTION_UNSET, ACTION_UNSET, ACTION_UNSET); break;
+                       SET_PRIO(ACTION_NEWEST_LIST, ACTION_UNSET, ACTION_UNSET, ACTION_UNSET); break;
                default:
                        break;
        }
@@ -526,7 +531,7 @@ static gboolean prefs_summary_open_key_pressed(GtkWidget *widget,
                                             GdkEventKey *event,
                                             gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_summary_open_cancel();
        return FALSE;
 }
Claws Mail