summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2bcccb2)
* src/prefs_common.c
* src/prefs_common.h
* src/prefs_summary_open.c
* src/prefs_summary_open.h
* src/summaryview.c
Add "select first email in list" to the list of possible selections
when opening a folder.
+2007-11-23 [wwp] 3.1.0cvs25
+
+ * src/prefs_common.c
+ * src/prefs_common.h
+ * src/prefs_summary_open.c
+ * src/prefs_summary_open.h
+ * src/summaryview.c
+ Add "select first email in list" to the list of possible selections
+ when opening a folder.
+
2007-11-23 [paul] 3.1.0cvs24
* po/de.po
2007-11-23 [paul] 3.1.0cvs24
* po/de.po
( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_logging.c; ) > 3.1.0cvs22.patchset
( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_msg_colors.c; ) > 3.1.0cvs23.patchset
( cvs diff -u -r 1.58.2.34 -r 1.58.2.35 po/de.po; ) > 3.1.0cvs24.patchset
( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_logging.c; ) > 3.1.0cvs22.patchset
( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_msg_colors.c; ) > 3.1.0cvs23.patchset
( cvs diff -u -r 1.58.2.34 -r 1.58.2.35 po/de.po; ) > 3.1.0cvs24.patchset
+( cvs diff -u -r 1.204.2.154 -r 1.204.2.155 src/prefs_common.c; cvs diff -u -r 1.103.2.99 -r 1.103.2.100 src/prefs_common.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_summary_open.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_summary_open.h; cvs diff -u -r 1.395.2.338 -r 1.395.2.339 src/summaryview.c; ) > 3.1.0cvs25.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
{"show_tooltips", "TRUE", &prefs_common.show_tooltips,
P_BOOL, NULL, NULL, NULL},
{"show_tooltips", "TRUE", &prefs_common.show_tooltips,
P_BOOL, NULL, NULL, NULL},
+ /* do it SUMMARY_OPEN_ACTIONS-1 times */
{"summary_select_prio1", "0", &prefs_common.summary_select_prio[0], P_ENUM,
NULL, NULL, NULL},
{"summary_select_prio2", "0", &prefs_common.summary_select_prio[1], P_ENUM,
{"summary_select_prio1", "0", &prefs_common.summary_select_prio[0], P_ENUM,
NULL, NULL, NULL},
{"summary_select_prio2", "0", &prefs_common.summary_select_prio[1], P_ENUM,
NULL, NULL, NULL},
{"summary_select_prio6", "0", &prefs_common.summary_select_prio[5], P_ENUM,
NULL, NULL, NULL},
NULL, NULL, NULL},
{"summary_select_prio6", "0", &prefs_common.summary_select_prio[5], P_ENUM,
NULL, NULL, NULL},
+ {"summary_select_prio7", "0", &prefs_common.summary_select_prio[6], P_ENUM,
+ NULL, NULL, NULL},
{"mark_as_read_on_new_window", "FALSE",
&prefs_common.mark_as_read_on_new_window,
{"mark_as_read_on_new_window", "FALSE",
&prefs_common.mark_as_read_on_new_window,
#include "textview.h"
#include "procmime.h"
#include "prefs_msg_colors.h"
#include "textview.h"
#include "procmime.h"
#include "prefs_msg_colors.h"
+#include "prefs_summary_open.h"
typedef struct _PrefsCommon PrefsCommon;
typedef struct _PrefsCommon PrefsCommon;
ACTION_UNREAD,
ACTION_LAST_OPENED,
ACTION_LAST_LIST,
ACTION_UNREAD,
ACTION_LAST_OPENED,
ACTION_LAST_LIST,
+ ACTION_NOTHING,
+ ACTION_FIRST_LIST
} EntryAction;
typedef enum
} EntryAction;
typedef enum
SelectOnEntry select_on_entry;
gboolean show_tooltips;
SelectOnEntry select_on_entry;
gboolean show_tooltips;
- EntryAction summary_select_prio[6];
+ EntryAction summary_select_prio[SUMMARY_OPEN_ACTIONS-1];
NextUnreadMsgDialogShow next_unread_msg_dialog;
gboolean add_address_by_click;
NextUnreadMsgDialogShow next_unread_msg_dialog;
gboolean add_address_by_click;
GdkDragContext *context,
gpointer data);
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_("first marked email"),
N_("first new email"),
N_("first unread email"),
N_("last opened email"),
N_("last email in the list"),
{ ("UNSET (!)"),
N_("first marked email"),
N_("first new email"),
N_("first unread email"),
N_("last opened email"),
N_("last email in the list"),
+ N_("none"),
+ N_("first email in the list")
};
void prefs_summary_open_open(void)
{
};
void prefs_summary_open_open(void)
{
if (!summaryopen.window) {
prefs_summary_open_create();
}
if (!summaryopen.window) {
prefs_summary_open_create();
}
prefs_summary_open_set_dialog();
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);
saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
gtk_widget_show(summaryopen.window);
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_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_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);
gtk_widget_show (list_view_scrolledwin);
gtk_box_pack_start (GTK_BOX (list_view_hbox2), list_view_scrolledwin,
TRUE, TRUE, 0);
summaryopen.actions_list_view = actions_list_view;
}
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; \
#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[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; \
}
void prefs_summary_open_set_defaults(void)
}
void prefs_summary_open_set_defaults(void)
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;
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;
- 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);
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:
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;
EntryAction act = prefs_common.summary_select_prio[i];
if (act == ACTION_UNSET)
continue;
set = TRUE;
prefs_summary_open_insert_action(GTK_LIST_STORE
(model_act), action_name[act], act);
}
prefs_summary_open_insert_action(GTK_LIST_STORE
(model_act), action_name[act], act);
}
- 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);
}
prefs_summary_open_insert_action(GTK_LIST_STORE
(model_poss), action_name[i], i);
}
prefs_common.summary_select_prio[row] = GPOINTER_TO_INT(data);
row++;
}
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;
}
}
prefs_common.summary_select_prio[row] = ACTION_UNSET;
}
}
static void prefs_summary_open_ok(void)
{
static void prefs_summary_open_ok(void)
{
- int i = 0;
- for (i = 0; i < 6; i++)
+ int i;
+ 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);
saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];
gtk_widget_hide(summaryopen.window);
static void prefs_summary_open_cancel(void)
{
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);
prefs_common.summary_select_prio[i] = saved_summary_select_prio[i];
gtk_widget_hide(summaryopen.window);
#ifndef __PREFS_SUMMARY_OPEN_H__
#define __PREFS_SUMMARY_OPEN_H__
#ifndef __PREFS_SUMMARY_OPEN_H__
#define __PREFS_SUMMARY_OPEN_H__
+#define SUMMARY_OPEN_ACTIONS 8
+
void prefs_summary_open_open (void);
void prefs_summary_open_set_defaults (void);
const gchar *summary_open_get_label (int act);
void prefs_summary_open_open (void);
void prefs_summary_open_set_defaults (void);
const gchar *summary_open_get_label (int act);
? 0 : GTK_CLIST(ctree)->rows - 1);
}
break;
? 0 : GTK_CLIST(ctree)->rows - 1);
}
break;
+ case ACTION_FIRST_LIST:
+ if (GTK_CLIST(ctree)->row_list != NULL) {
+ node = gtk_ctree_node_nth
+ (ctree,
+ item->sort_type == SORT_ASCENDING
+ ? 0 : GTK_CLIST(ctree)->rows - 1);
+ }
+ break;
case ACTION_NOTHING:
case ACTION_UNSET:
node = NULL;
case ACTION_NOTHING:
case ACTION_UNSET:
node = NULL;