/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
GdkDragContext *context,
gpointer data);
-static EntryAction saved_summary_select_prio[6];
+static EntryAction saved_summary_select_prio[SUMMARY_OPEN_ACTIONS-1];
-static gchar *action_name[7] =
+static gchar *action_name[SUMMARY_OPEN_ACTIONS] =
{ ("UNSET (!)"),
- N_("Go to first marked email"),
- N_("Go to first new email"),
- N_("Go to first unread email"),
- N_("Go to last opened email"),
- N_("Go to last email in the list"),
- N_("Do nothing")
+ N_("oldest marked email"),
+ N_("oldest new email"),
+ N_("oldest unread email"),
+ N_("last opened email"),
+ N_("newest email in the list"),
+ N_("none"),
+ N_("oldest email in the list"),
+ N_("newest marked email"),
+ N_("newest new email"),
+ N_("newest unread email")
};
void prefs_summary_open_open(void)
{
- int i = 0;
+ int i;
if (!summaryopen.window) {
prefs_summary_open_create();
}
prefs_summary_open_set_dialog();
- for (i = 0; i < 6; i++)
+ for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++)
saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
gtk_widget_show(summaryopen.window);
+ gtk_window_set_modal(GTK_WINDOW(summaryopen.window), TRUE);
}
static void prefs_summary_open_create(void)
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_summary_open");
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal (GTK_WINDOW (window), TRUE);
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_widget_set_size_request (GTK_WIDGET (window), 610, 310);
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Action on folder opening"));
+ _("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),
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);
GTK_SHADOW_IN);
possible_actions_list_view = prefs_summary_open_list_view_create
- (_("Possible actions"));
+ (_("Available selections"));
gtk_widget_show (possible_actions_list_view);
gtk_container_add(GTK_CONTAINER(list_view_scrolledwin), possible_actions_list_view);
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, 210);
gtk_widget_show (list_view_scrolledwin);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), list_view_scrolledwin,
TRUE, TRUE, 0);
GTK_SHADOW_IN);
actions_list_view = prefs_summary_open_list_view_create
- (_("Action on folder opening"));
+ (_("Current selections"));
g_signal_connect (G_OBJECT (del_btn), "clicked",
G_CALLBACK (prefs_summary_open_delete_cb),
actions_list_view);
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);
summaryopen.actions_list_view = actions_list_view;
}
+/* do it SUMMARY_OPEN_ACTIONS-1 times */
#define SET_PRIO(p_one,p_two,p_three,p_four) { \
prefs_common.summary_select_prio[0] = p_one; \
prefs_common.summary_select_prio[1] = p_two; \
prefs_common.summary_select_prio[3] = p_four; \
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;
}
GtkTreeView *possible_list_view = GTK_TREE_VIEW(summaryopen.possible_actions_list_view);
GtkTreeView *actions_list_view = GTK_TREE_VIEW(summaryopen.actions_list_view);
GtkTreeModel *model_poss, *model_act;
- int i = 0;
+ int i;
gboolean set = FALSE;
- gboolean used[7] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
+ gboolean used[SUMMARY_OPEN_ACTIONS-1] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE};
model_poss = gtk_tree_view_get_model(possible_list_view);
model_act = gtk_tree_view_get_model(actions_list_view);
gtk_list_store_clear(GTK_LIST_STORE(model_act));
fill:
- for (i = 0; i < 6; i++) {
+ for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++) {
EntryAction act = prefs_common.summary_select_prio[i];
if (act == ACTION_UNSET)
continue;
set = TRUE;
- used[act] = TRUE;
+ used[act-1] = TRUE;
prefs_summary_open_insert_action(GTK_LIST_STORE
(model_act), action_name[act], act);
}
goto fill;
}
- for (i = ACTION_MARKED; i <= ACTION_NOTHING; i++) {
- if (!used[i]) {
+ for (i = 1; i < SUMMARY_OPEN_ACTIONS; i++) {
+ if (!used[i-1]) {
prefs_summary_open_insert_action(GTK_LIST_STORE
(model_poss), action_name[i], i);
}
GtkTreeModel *model;
GtkTreeIter iter;
-
model = gtk_tree_view_get_model(GTK_TREE_VIEW(summaryopen.actions_list_view));
while (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
gtk_tree_model_get(model, &iter, PREFS_SUMMARY_OPEN_DATA, &data, -1);
prefs_common.summary_select_prio[row] = GPOINTER_TO_INT(data);
row++;
}
- for (; row < 6; row++) {
+ for (; row < SUMMARY_OPEN_ACTIONS-1; row++) {
prefs_common.summary_select_prio[row] = ACTION_UNSET;
}
}
GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_KEY_Escape)
prefs_summary_open_cancel();
return FALSE;
}
static void prefs_summary_open_ok(void)
{
- int i = 0;
- for (i = 0; i < 6; i++)
+ int i;
+
+ /* force an empty list to be at least ACTION_NONE */
+ if (prefs_common.summary_select_prio[0] == ACTION_UNSET)
+ prefs_common.summary_select_prio[0] = ACTION_NOTHING;
+
+ for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++)
saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
gtk_widget_hide(summaryopen.window);
+ gtk_window_set_modal(GTK_WINDOW(summaryopen.window), FALSE);
}
static void prefs_summary_open_cancel(void)
{
- int i = 0;
- for (i = 0; i < 6; i++)
+ int i;
+ for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++)
prefs_common.summary_select_prio[i] = saved_summary_select_prio[i];
gtk_widget_hide(summaryopen.window);
projects / claws.git / blobdiff