/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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
MsgInfo *msg);
static gboolean summary_update_msg (gpointer source, gpointer data);
+static gboolean summary_update_folder_item_name(gpointer source, gpointer data);
GtkTargetEntry summary_drag_types[2] =
{
{"text/uri-list", 0, TARGET_MAIL_URI_LIST},
- {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+ {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
};
static GtkItemFactoryEntry summary_popup_entries[] =
{N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Repl_y to/mailing _list"),
"<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
{N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
{N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
{N_("/Move to _trash"), "<control>D", summary_delete_trash, 0, NULL},
{N_("/_Delete..."), NULL, summary_delete, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
{N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
{N_("/Create f_ilter rule"), NULL, NULL, 0, "<Branch>"},
NULL, summary_create_processing_cb, FILTER_BY_TO, NULL},
{N_("/Create processing rule/by _Subject"),
NULL, summary_create_processing_cb, FILTER_BY_SUBJECT, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Open in new _window"),
"<control><alt>N", summary_open_msg, 0, NULL},
{N_("/_View/Message _source"), "<control>U", summary_view_source, 0, NULL},
{N_("/_View/All _headers"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
{N_("/_Print..."), "<control>P", summary_print, 0, NULL},
}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
"", /* S_COL_LOCKED */
};
+void summary_freeze(SummaryView *summaryview)
+{
+ if (summaryview)
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+}
+
+void summary_thaw(SummaryView *summaryview)
+{
+ if (summaryview)
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+}
+
+void summary_grab_focus(SummaryView *summaryview)
+{
+ if (summaryview)
+ gtk_widget_grab_focus(summaryview->ctree);
+}
+
+GtkWidget *summary_get_main_widget(SummaryView *summaryview)
+{
+ if (summaryview)
+ return summaryview->ctree;
+ else
+ return NULL;
+}
+
#define START_LONG_OPERATION(summaryview,force_freeze) { \
summary_lock(summaryview); \
main_window_cursor_wait(summaryview->mainwin); \
if (force_freeze || sc_g_list_bigger(GTK_CLIST(summaryview->ctree)->selection, 1)) {\
froze = TRUE; \
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); \
+ summary_freeze(summaryview); \
} \
folder_item_update_freeze(); \
inc_lock(); \
inc_unlock(); \
folder_item_update_thaw(); \
if (froze) \
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree)); \
+ summary_thaw(summaryview); \
main_window_cursor_normal(summaryview->mainwin); \
summary_unlock(summaryview); \
summaryview->msginfo_update_callback_id = \
GtkWidget *ctree;
GtkWidget *hbox;
GtkWidget *hbox_l;
+ GtkWidget *stat_box;
+ GtkWidget *stat_box2;
+ GtkWidget *stat_vbox;
GtkWidget *statlabel_folder;
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
hbox = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox);
+ stat_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(stat_vbox);
+
+ stat_box = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(stat_box);
+
+ stat_box2 = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(stat_box2);
+
search_tip = gtk_tooltips_new();
toggle_search = gtk_toggle_button_new();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), stat_vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box2, TRUE, TRUE, 0);
+
hbox_l = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox_l);
- gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stat_box), hbox_l, TRUE, TRUE, 0);
statlabel_folder = gtk_label_new("");
gtk_widget_show(statlabel_folder);
statlabel_msgs = gtk_label_new("");
gtk_widget_show(statlabel_msgs);
- gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
+ gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, 4);
hbox_spc = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox_spc);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
/* status label */
+ gtk_widget_show_all(stat_vbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* quick search */
summaryview->ctree = ctree;
summaryview->hbox = hbox;
summaryview->hbox_l = hbox_l;
+ summaryview->hbox_spc = hbox_spc;
+ summaryview->stat_box = stat_box;
+ summaryview->stat_box2 = stat_box2;
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->lock_count = 0;
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
+ summaryview->folder_item_update_callback_id =
+ hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST,
+ summary_update_folder_item_name,
+ (gpointer) summaryview);
summaryview->target_list = gtk_target_list_new(summary_drag_types, 2);
else
quicksearch_hide(quicksearch);
+ if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT)
+ gtk_widget_hide(summaryview->toggle_eventbox);
+
return summaryview;
}
+void summary_relayout(SummaryView *summaryview)
+{
+ gtk_widget_realize(summaryview->stat_box);
+
+ gtk_widget_ref(summaryview->hbox_l);
+ gtk_widget_ref(summaryview->statlabel_msgs);
+
+ gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
+ gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
+
+ switch (prefs_common.layout_mode) {
+ case NORMAL_LAYOUT:
+ case WIDE_LAYOUT:
+ case WIDE_MSGLIST_LAYOUT:
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(summaryview->stat_box), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+ gtk_widget_show_all(summaryview->stat_box);
+ gtk_widget_show_all(summaryview->stat_box2);
+ if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT)
+ gtk_widget_hide(summaryview->toggle_eventbox);
+ else
+ gtk_widget_show(summaryview->toggle_eventbox);
+ break;
+ case VERTICAL_LAYOUT:
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+ gtk_widget_show_all(summaryview->stat_box);
+ gtk_widget_show_all(summaryview->stat_box2);
+ gtk_widget_show(summaryview->toggle_eventbox);
+ break;
+ }
+ gtk_widget_unref(summaryview->hbox_l);
+ gtk_widget_unref(summaryview->statlabel_msgs);
+ quicksearch_relayout(summaryview->quicksearch);
+}
+
static void summary_set_fonts(SummaryView *summaryview)
{
PangoFontDescription *font_desc;
if (!item)
return;
- if(FOLDER_SHOWS_TO_HDR(item))
+ if (FOLDER_SHOWS_TO_HDR(item))
show_to = TRUE;
else
show_from = TRUE;
{
int u = 0, n = 0, m = 0, t = 0;
GSList *cur;
- START_TIMING("consistency check");
+ START_TIMING("");
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
t++;
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
+ GtkCTreeNode *node = NULL;
GSList *mlist = NULL;
gchar *buf;
gboolean is_refresh;
if (!summaryview->mainwin)
return FALSE;
-START_TIMING("--------- summary_show");
+ START_TIMING("");
summaryview->last_displayed = NULL;
summary_switch_from_to(summaryview, item);
folder_update_op_count();
}
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
summary_clear_list(summaryview);
summary_set_hide_read_msgs_menu(summaryview, FALSE);
summary_clear_all(summaryview);
summaryview->folder_item = item;
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
summary_unlock(summaryview);
inc_unlock();
if (item && quicksearch_is_running(summaryview->quicksearch)) {
if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
+ gint interval = quicksearch_is_fast(summaryview->quicksearch) ? 5000:100;
START_TIMING("quicksearch");
gint num = 0, total = summaryview->folder_item->total_msgs;
statusbar_print_all(_("Searching in %s... \n"),
summaryview->folder_item->path ?
summaryview->folder_item->path : "(null)");
not_killed = NULL;
+ folder_item_update_freeze();
for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- statusbar_progress_all(num++,total, 50);
+ statusbar_progress_all(num++,total, interval);
if (!msginfo->hidden && quicksearch_match(summaryview->quicksearch, msginfo))
not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
- GTK_EVENTS_FLUSH();
+ if (num % interval == 0)
+ GTK_EVENTS_FLUSH();
if (!quicksearch_is_active(summaryview->quicksearch)) {
break;
}
}
+ folder_item_update_thaw();
statusbar_progress_all(0,0,0);
statusbar_pop_all();
hidden_removed = TRUE;
if (!quicksearch_is_active(summaryview->quicksearch)) {
debug_print("search cancelled!\n");
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
summary_unlock(summaryview);
}
if (is_refresh) {
- summaryview->last_displayed = summaryview->displayed;
- summaryview->displayed =
- summary_find_msg_by_msgnum(summaryview,
- displayed_msgnum);
- if (!summaryview->displayed)
- messageview_clear(summaryview->messageview);
- summary_unlock(summaryview);
- summary_select_by_msgnum(summaryview, selected_msgnum);
- summary_lock(summaryview);
- if (!summaryview->selected) {
- /* no selected message - select first unread
- message, but do not display it */
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+ if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
+ summaryview->last_displayed = summaryview->displayed;
+ summaryview->displayed =
+ summary_find_msg_by_msgnum(summaryview,
+ displayed_msgnum);
+ if (!summaryview->displayed)
+ messageview_clear(summaryview->messageview);
+ summary_unlock(summaryview);
+ summary_select_by_msgnum(summaryview, selected_msgnum);
+ summary_lock(summaryview);
+ if (!summaryview->selected) {
+ /* no selected message - select first unread
+ message, but do not display it */
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+ node = gtk_ctree_node_nth
+ (ctree,
+ item->sort_type == SORT_DESCENDING
+ ? 0 : GTK_CLIST(ctree)->rows - 1);
+ summary_unlock(summaryview);
+ summary_select_node(summaryview, node, FALSE, TRUE);
+ summary_lock(summaryview);
+ }
+ } else {
+ /* just select first/last */
+ if (GTK_CLIST(ctree)->row_list != NULL)
node = gtk_ctree_node_nth
(ctree,
item->sort_type == SORT_DESCENDING
? 0 : GTK_CLIST(ctree)->rows - 1);
- summary_unlock(summaryview);
- summary_select_node(summaryview, node, FALSE, TRUE);
- summary_lock(summaryview);
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
} else {
switch (prefs_common.select_on_entry) {
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
STATUSBAR_POP(summaryview->mainwin);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
gint optimal_width;
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
NULL, summary_free_msginfo_func, NULL);
optimal_width);
}
- gtk_clist_thaw(clist);
+ summary_thaw(summaryview);
}
void summary_clear_all(SummaryView *summaryview)
return mlist;
}
-GSList *summary_get_msg_list(SummaryView *summaryview)
-{
- GSList *mlist = NULL;
- GtkCTree *ctree;
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- ctree = GTK_CTREE(summaryview->ctree);
-
- for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- mlist = g_slist_prepend(mlist, msginfo);
- }
-
- mlist = g_slist_reverse(mlist);
-
- return mlist;
-}
-
void summary_set_menu_sensitive(SummaryView *summaryview)
{
GtkItemFactory *ifactory = summaryview->popupfactory;
_("Attracting messages by subject..."));
main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
subject_table = g_hash_table_new(attract_hash_func,
attract_compare_func);
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
- gtk_clist_thaw(clist);
+ summary_thaw(summaryview);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
case S_COL_DATE:
case S_COL_NUMBER:
if(type == S_COL_FROM && item != NULL &&
- FOLDER_SHOWS_TO_HDR(item))
+ FOLDER_SHOWS_TO_HDR(item) &&
+ !summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible)
type = S_COL_TO;
if (prefs_common.trans_hdr)
title = gettext(col_label[type]);
label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Attachment"));
continue;
} else if (type == S_COL_MARK) {
label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Mark"));
continue;
} else if (type == S_COL_LOCKED) {
label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Locked"));
continue;
} else if (type == S_COL_STATUS) {
gtk_clist_set_column_title(clist, pos, title);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Status"));
continue;
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func = NULL;
- START_TIMING("summary_sort");
+ START_TIMING("");
g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ summary_freeze(summaryview);
switch (sort_key) {
case SORT_BY_MARK:
main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_freeze(clist);
gtk_clist_set_compare_func(clist, cmp_func);
gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
- gtk_clist_thaw(clist);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
}
unlock:
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
END_TIMING();
}
-gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
+static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
GtkCTreeNode *cnode, gpointer data)
{
SummaryView *summaryview = (SummaryView *)data;
MsgInfo *msginfo;
GtkCTreeNode *node = NULL;
GHashTable *msgid_table;
- GHashTable *subject_table;
+ GHashTable *subject_table = NULL;
GSList * cur;
- START_TIMING("summary_set_ctree_from_list");
+ START_TIMING("");
if (!mlist) return;
- debug_print("\tSetting summary from message data...");
+ debug_print("\tSetting summary from message data...\n");
STATUSBAR_PUSH(summaryview->mainwin,
_("Setting summary from message data..."));
gdk_flush();
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
summaryview->msgid_table = msgid_table;
- subject_table = g_hash_table_new(g_str_hash, g_str_equal);
- summaryview->subject_table = subject_table;
+
+ if (prefs_common.thread_by_subject) {
+ subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+ summaryview->subject_table = subject_table;
+ } else {
+ summaryview->subject_table = NULL;
+ }
if (prefs_common.use_addr_book)
start_address_completion(NULL);
if (summaryview->threaded) {
GNode *root, *gnode;
- START_TIMING("summaryview_set_ctree_from_list(1)");
+ START_TIMING("threaded");
root = procmsg_get_thread_tree(mlist);
for (gnode = root->children; gnode != NULL;
END_TIMING();
} else {
gchar *text[N_SUMMARY_COLS];
- START_TIMING("summaryview_set_ctree_from_list(2)");
+ START_TIMING("unthreaded");
cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
- subject_table_insert(subject_table,
+ if (prefs_common.thread_by_subject)
+ subject_table_insert(subject_table,
msginfo->subject,
node);
}
if (debug_get_mode()) {
debug_print("\tmsgid hash table size = %d\n",
g_hash_table_size(msgid_table));
- debug_print("\tsubject hash table size = %d\n",
+ if (prefs_common.thread_by_subject)
+ debug_print("\tsubject hash table size = %d\n",
g_hash_table_size(subject_table));
}
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
if (prefs_common.bold_unread) {
- START_TIMING("summaryview_set_ctree_from_list(3)");
+ START_TIMING("bold_unread");
while (node) {
GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
if (GTK_CTREE_ROW(node)->children)
typedef struct {
MsgInfo *msginfo;
SummaryView *summaryview;
- GtkCTreeNode *row;
} MarkAsReadData;
static int msginfo_mark_as_read_timeout(void *data)
if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
- mdata->row);
+ mdata->summaryview->selected);
g_free(mdata);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
gint val;
- START_TIMING("summary_display_msg_full");
+ START_TIMING("");
if (!new_window) {
if (summaryview->displayed == row)
return;
MarkAsReadData *data = g_new0(MarkAsReadData, 1);
data->summaryview = summaryview;
data->msginfo = msginfo;
- data->row = row;
- gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
+ g_timeout_add(prefs_common.mark_as_read_delay * 1000,
msginfo_mark_as_read_timeout, data);
} else if (new_window || !prefs_common.mark_as_read_on_new_window) {
msginfo_mark_as_read(summaryview, msginfo, row);
/* CLAWS: if separate message view, don't open a new window
* but rather use the current separated message view */
- summary_display_msg_full(summaryview, summaryview->selected,
- prefs_common.sep_msg ? FALSE : TRUE,
- FALSE);
+ summary_display_msg_full(summaryview, summaryview->selected,
+ TRUE, FALSE);
}
void summary_view_source(SummaryView * summaryview)
msginfo->msgnum);
}
-void summary_mark_as_read
-(SummaryView *summaryview)
+void summary_mark_as_read(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
continue;
if (is_spam) {
summary_msginfo_change_flags(msginfo, MSG_SPAM, 0, MSG_NEW|MSG_UNREAD, 0);
- if (procmsg_spam_get_folder() != summaryview->folder_item) {
- summary_move_row_to(summaryview, row, procmsg_spam_get_folder());
+ if (procmsg_spam_get_folder(msginfo) != summaryview->folder_item) {
+ summary_move_row_to(summaryview, row,
+ procmsg_spam_get_folder(msginfo));
moved = TRUE;
}
} else {
summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
}
+ summaryview->display_msg = prefs_common.always_show_msg;
+
summary_set_row_marks(summaryview, row);
}
} else {
void summary_cancel(SummaryView *summaryview)
{
MsgInfo * msginfo;
- GtkCList *clist = GTK_CLIST(summaryview->ctree);
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
summary_lock(summaryview);
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
summary_update_status(summaryview);
summary_status_show(summaryview);
- gtk_clist_thaw(clist);
+ summary_thaw(summaryview);
summary_unlock(summaryview);
}
summary_status_show(summaryview);
}
-void summary_select_thread(SummaryView *summaryview)
+void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node = summaryview->selected;
+ gboolean froze = FALSE;
if (!node) return;
while (GTK_CTREE_ROW(node)->parent != NULL)
node = GTK_CTREE_ROW(node)->parent;
+ START_LONG_OPERATION(summaryview, FALSE);
if (node != summaryview->selected)
summary_select_node
(summaryview, node,
FALSE);
gtk_ctree_select_recursive(ctree, node);
+ END_LONG_OPERATION(summaryview);
+ if (delete_thread) {
+ if (FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS)
+ summary_delete(summaryview);
+ else
+ summary_delete_trash(summaryview);
+ }
summary_status_show(summaryview);
}
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file '%s'."), tmp);
+ alertpanel_error(_("Couldn't save the file '%s'."), tmp);
} else { /* overwrite */
if (copy_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file '%s'."), tmp);
+ alertpanel_error(_("Couldn't save the file '%s'."), tmp);
}
g_free(src);
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file '%s'."), tmp);
+ alertpanel_error(_("Couldn't save the file '%s'."), tmp);
}
g_free(src);
}
MsgInfo *msginfo = gtk_ctree_node_get_row_data(
GTK_CTREE(summaryview->ctree),
node);
- messageview_print(msginfo, summaryview->messageview->all_headers);
+ gint sel_start = -1, sel_end = -1, partnum = 0;
+
+ if (node == summaryview->displayed) {
+ partnum = mimeview_get_selected_part_num(summaryview->messageview->mimeview);
+ textview_get_selection_offsets(summaryview->messageview->mimeview->textview,
+ &sel_start, &sel_end);
+ }
+ messageview_print(msginfo, summaryview->messageview->all_headers,
+ sel_start, sel_end, partnum);
}
#endif
}
if (summary_is_locked(summaryview)) return FALSE;
summary_lock(summaryview);
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
main_window_cursor_wait(summaryview->mainwin);
summary_thread_init(summaryview);
}
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
summaryview->selected = clist->selection ?
GTK_CTREE_NODE(clist->selection->data) : NULL;
msginfo->msgid))
g_hash_table_remove(summaryview->msgid_table,
msginfo->msgid);
- if (msginfo->subject && *msginfo->subject &&
+ if (prefs_common.thread_by_subject &&
+ msginfo->subject && *msginfo->subject &&
node == subject_table_lookup(summaryview->subject_table,
msginfo->subject)) {
subject_table_remove(summaryview->subject_table,
g_hash_table_remove(summaryview->msgid_table,
msginfo->msgid);
}
- if (msginfo->subject && *msginfo->subject &&
+ if (prefs_common.thread_by_subject &&
+ msginfo->subject && *msginfo->subject &&
node == subject_table_lookup(summaryview->subject_table,
msginfo->subject)) {
subject_table_remove(summaryview->subject_table,
g_signal_handlers_block_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
while (node) {
gtkut_ctree_set_focus_row(ctree, summaryview->selected);
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *next;
- START_TIMING("summary_thread_init");
+ START_TIMING("");
if (!summaryview->thread_collapsed) {
g_signal_handlers_block_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
g_signal_handlers_block_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
while (node) {
if (GTK_CTREE_ROW(node)->children) {
node = GTK_CTREE_NODE_NEXT(node);
}
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
while (node) {
if (GTK_CTREE_ROW(node)->children)
node = GTK_CTREE_ROW(node)->sibling;
}
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
summaryview->thread_collapsed = TRUE;
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
-void account_rules_radio_button_toggled_cb(GtkToggleButton *btn, gpointer data)
+static void account_rules_radio_button_toggled_cb(GtkToggleButton *btn, gpointer data)
{
prefs_common.apply_per_account_filtering_rules = GPOINTER_TO_INT(data);
}
-gboolean summary_filter_get_mode(void)
+static gboolean summary_filter_get_mode(void)
/* ask what to do w/ them: skip them, apply them regardless to the account,
use the current account */
{
_("Apply these rules regardless of the account they belong to"));
account_rules_user_current = gtk_radio_button_new_with_label_from_widget
(GTK_RADIO_BUTTON(account_rules_skip),
- _("Use current account for these rules"));
+ _("Apply these rules if they apply to the current account"));
gtk_box_pack_start (GTK_BOX (vbox), account_rules_skip, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), account_rules_force, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), account_rules_user_current, FALSE, FALSE, 0);
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ summary_freeze(summaryview);
if (selected_only) {
GList *cur;
}
g_slist_free(mlist);
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
folder_item_update_thaw();
debug_print("done.\n");
style->fg[GTK_STATE_NORMAL] = color;
/* get the average of label color and selected fg color
for visibility */
- style->fg[GTK_STATE_SELECTED].red = (color.red + ctree_style->fg[GTK_STATE_SELECTED].red ) / 2;
- style->fg[GTK_STATE_SELECTED].green = (color.green + ctree_style->fg[GTK_STATE_SELECTED].green) / 2;
- style->fg[GTK_STATE_SELECTED].blue = (color.blue + ctree_style->fg[GTK_STATE_SELECTED].blue ) / 2;
+ style->fg[GTK_STATE_SELECTED].red = (color.red + 3*ctree_style->fg[GTK_STATE_SELECTED].red ) / 4;
+ style->fg[GTK_STATE_SELECTED].green = (color.green + 3*ctree_style->fg[GTK_STATE_SELECTED].green) / 4;
+ style->fg[GTK_STATE_SELECTED].blue = (color.blue + 3*ctree_style->fg[GTK_STATE_SELECTED].blue ) / 4;
}
gtk_ctree_node_set_row_style(ctree, node, style);
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
handled = TRUE;
+ if (event->state & GDK_CONTROL_MASK)
+ event->state &= ~GDK_CONTROL_MASK;
if (event->state & GDK_SHIFT_MASK)
mimeview_scroll_page(messageview->mimeview, TRUE);
else {
g_list_length(GTK_CLIST(ctree)->row_list)-1);
if (next) {
gtk_sctree_select_with_state
- (GTK_SCTREE(ctree), next, event->state);
+ (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
/* Deprecated - what are the non-deprecated equivalents? */
if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
}
}
-void summaryview_activate_quicksearch(SummaryView *summaryview)
+void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show)
{
+ prefs_common.show_searchbar = show;
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(summaryview->toggle_search),
- TRUE);
- quicksearch_show(summaryview->quicksearch);
+ show);
+ if (show) {
+ quicksearch_show(summaryview->quicksearch);
+ } else {
+ quicksearch_hide(summaryview->quicksearch);
+ summary_grab_focus(summaryview);
+ }
}
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
FolderSortKey sort_key)
{
GtkCTreeNode *node = NULL;
- START_TIMING("summary_sort_by_column_click");
+ START_TIMING("");
if (summaryview->sort_key == sort_key)
summary_sort(summaryview, sort_key,
summaryview->sort_type == SORT_ASCENDING
node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ summary_freeze(summaryview);
if (prefs_common.bold_unread) {
while (node) {
GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
node = next;
}
}
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
END_TIMING();
}
CMP_FUNC_DEF(summary_cmp_by_mark,
MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_status,
- MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
+ (-(MSG_IS_SPAM(msginfo1->flags))+(MSG_IS_UNREAD(msginfo1->flags)<<1)+(MSG_IS_NEW(msginfo1->flags)<<2))
+ - (-(MSG_IS_SPAM(msginfo2->flags))+(MSG_IS_UNREAD(msginfo2->flags)<<1)+(MSG_IS_NEW(msginfo2->flags)<<2)) )
CMP_FUNC_DEF(summary_cmp_by_mime,
MSG_IS_WITH_ATTACHMENT(msginfo1->flags) - MSG_IS_WITH_ATTACHMENT(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_label,
void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *item)
{
+ FolderSortKey sort_key;
+ FolderSortType sort_type;
g_return_if_fail(summaryview != NULL);
g_return_if_fail(item != NULL);
summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
/* Sorting */
- summaryview->sort_key = item->sort_key;
- summaryview->sort_type = item->sort_type;
+ sort_key = item->sort_key;
+ sort_type = item->sort_type;
+
+ folder_get_sort_type(item->folder, &sort_key, &sort_type);
+
+ summaryview->sort_key = sort_key;
+ summaryview->sort_type = sort_type;
/* Threading */
summaryview->threaded = item->threaded;
return FALSE;
}
+static gboolean summary_update_folder_item_name(gpointer source, gpointer data)
+{
+ FolderItemUpdateData *hookdata = (FolderItemUpdateData *)source;
+ SummaryView *summaryview = (SummaryView *)data;
+
+ g_return_val_if_fail(hookdata != NULL, FALSE);
+ g_return_val_if_fail(hookdata->item != NULL, FALSE);
+ g_return_val_if_fail(summaryview != NULL, FALSE);
+
+ if (hookdata->update_flags & F_ITEM_UPDATE_NAME) {
+ gchar *name = folder_item_get_name(hookdata->item);
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
+ g_free(name);
+ }
+
+ return FALSE;
+}
+
/*!
*\brief change summaryview to display your answer(s) to a message
*
projects / claws.git / blobdiff