/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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
#include "partial_download.h"
#include "timing.h"
#include "gedit-print.h"
+#include "log.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
static GdkBitmap *ignorethreadxpmmask;
static GdkPixmap *lockedxpm;
static GdkBitmap *lockedxpmmask;
+static GdkPixmap *spamxpm;
+static GdkBitmap *spamxpmmask;
static GdkPixmap *clipxpm;
static GdkBitmap *clipxpmmask;
GtkCTreeNode *node,
gpointer data);
-static void summary_set_menu_sensitive (SummaryView *summaryview);
+void summary_set_menu_sensitive (SummaryView *summaryview);
static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
guint action);
GSList *mlist);
static void summary_set_header (SummaryView *summaryview,
gchar *text[],
- MsgInfo *msginfo);
+ MsgInfo *msginfo,
+ gboolean *free_from);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_display_msg_full (SummaryView *summaryview,
void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
GSList * mlist);
-#if 0
-void summary_processing(SummaryView *summaryview, GSList * mlist);
-#endif
-static void summary_filter_func (GtkCTree *ctree,
- GtkCTreeNode *node,
- gpointer data);
+static void summary_filter_func (MsgInfo *msginfo);
static void summary_colorlabel_menu_item_activate_cb
(GtkWidget *widget,
static void summary_colorlabel_menu_item_activate_item_cb
(GtkMenuItem *label_menu_item,
gpointer data);
-static void summary_colorlabel_menu_create(SummaryView *summaryview);
+static void summary_colorlabel_menu_create(SummaryView *summaryview,
+ gboolean refresh);
static GtkWidget *summary_ctree_create (SummaryView *summaryview);
guint info,
guint time,
SummaryView *summaryview);
+static void summary_drag_data_received(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ SummaryView *summaryview);
+static gboolean summary_drag_motion_cb(GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ SummaryView *summaryview);
/* custom compare functions for sorting */
static gboolean summary_update_msg (gpointer source, gpointer data);
-GtkTargetEntry summary_drag_types[1] =
+GtkTargetEntry summary_drag_types[2] =
{
- {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+ {"text/uri-list", 0, TARGET_MAIL_URI_LIST},
+ {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
};
static GtkItemFactoryEntry summary_popup_entries[] =
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unignore thread"), NULL, summary_unignore_thread, 0, NULL},
+ {N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Mark/Mark as _spam"), NULL, summary_mark_as_spam, 1, NULL},
+ {N_("/_Mark/Mark as _ham"), NULL, summary_mark_as_spam, 0, NULL},
+ {N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark/Lock"), NULL, summary_msgs_lock, 0, NULL},
{N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
toggle_search,
- _("Toggle quick-search bar"), NULL);
+ _("Toggle quick search bar"), NULL);
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
- summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
+ summaryview->target_list = gtk_target_list_new(summary_drag_types, 2);
summaryview->quicksearch = quicksearch;
&gpgsignedxpm, &gpgsignedxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
&clipgpgsignedxpm, &clipgpgsignedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
+ &spamxpm, &spamxpmmask);
summary_set_fonts(summaryview);
summary_clear_list(summaryview);
summary_set_column_titles(summaryview);
- summary_colorlabel_menu_create(summaryview);
+ summary_colorlabel_menu_create(summaryview, FALSE);
summary_set_menu_sensitive(summaryview);
}
-#if 0
-GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+#define CURRENTLY_DISPLAYED(m) \
+( (m->msgnum == displayed_msgnum) \
+ && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
+
+static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
{
+ gboolean show_from = FALSE, show_to = FALSE;
+ gboolean showing_from = FALSE, showing_to = FALSE;
+ gint from_pos = 0, to_pos = 0;
+ SummaryColumnState *col_state = summaryview->col_state;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
- gint best_score = MIN_SCORE;
- GtkCTreeNode *best_node = NULL;
-
- if (current_node)
- /*node = current_node;*/
- node = GTK_CTREE_NODE_NEXT(current_node);
+
+ if (!item)
+ return;
+ if (folder_has_parent_of_type(item, F_OUTBOX)
+ || folder_has_parent_of_type(item, F_DRAFT)
+ || folder_has_parent_of_type(item, F_QUEUE))
+ show_to = TRUE;
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ show_from = TRUE;
+
+ from_pos = summaryview->col_pos[S_COL_FROM];
+ to_pos = summaryview->col_pos[S_COL_TO];
+ showing_from = col_state[from_pos].visible;
+ showing_to = col_state[to_pos].visible;
+
+ if (showing_from && showing_to) {
+ debug_print("showing both\n");
+ return;
+ }
- for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo->score >= summaryview->important_score)
- break;
- if (msginfo->score > best_score) {
- best_score = msginfo->score;
- best_node = node;
- }
+ if (!showing_from && !showing_to) {
+ debug_print("showing none\n");
+ return;
}
- if (node != NULL)
- return node;
- else
- return best_node;
-}
+ debug_print("showing %s %s, must show %s %s\n",
+ showing_from?"From":"",
+ showing_to?"To":"",
+ show_from?"From":"",
+ show_to?"To":"");
-GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
- gint best_score = MIN_SCORE;
- GtkCTreeNode *best_node = NULL;
+ if (showing_from == show_from && showing_to == show_to)
+ return;
+ /* else we'll switch both */
- if (current_node)
- /*node = current_node;*/
- node = GTK_CTREE_NODE_PREV(current_node);
- else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ debug_print("switching columns\n");
+ col_state[from_pos].type = S_COL_TO;
+ col_state[from_pos].visible = show_to;
- for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo->score >= summaryview->important_score)
- break;
- if (msginfo->score > best_score) {
- best_score = msginfo->score;
- best_node = node;
- }
- }
+ col_state[to_pos].type = S_COL_FROM;
+ col_state[to_pos].visible = show_from;
- if (node != NULL)
- return node;
- else
- return best_node;
-}
-#endif
+ summaryview->col_pos[S_COL_TO] = from_pos;
+ summaryview->col_pos[S_COL_FROM] = to_pos;
-#define CURRENTLY_DISPLAYED(m) \
-( (m->msgnum == displayed_msgnum) \
- && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
+ gtk_clist_set_column_visibility
+ (GTK_CLIST(ctree), from_pos, col_state[from_pos].visible);
+ gtk_clist_set_column_visibility
+ (GTK_CLIST(ctree), to_pos, col_state[to_pos].visible);
+
+ summary_set_column_titles(summaryview);
+}
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
if (!summaryview->mainwin)
return FALSE;
+ summary_switch_from_to(summaryview, item);
+
inc_lock();
summary_lock(summaryview);
gboolean changed = FALSE;
val = alertpanel(_("Process mark"),
- _("Some marks are left. Process it?"),
- GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
- if (G_ALERTDEFAULT == val) {
+ _("Some marks are left. Process them?"),
+ GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL);
+ if (G_ALERTALTERNATE == val) {
summary_unlock(summaryview);
summary_execute(summaryview);
summary_lock(summaryview);
changed = TRUE;
- } else if (G_ALERTALTERNATE == val) {
+ } else if (G_ALERTDEFAULT == val) {
/* DO NOTHING */
} else {
summary_unlock(summaryview);
if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
-
+ 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;
for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
+ statusbar_progress_all(num++,total, 50);
+
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 (!quicksearch_is_active(summaryview->quicksearch)) {
+ break;
+ }
}
+ statusbar_progress_all(0,0,0);
+ statusbar_pop_all();
+
hidden_removed = TRUE;
if (quicksearch_is_running(summaryview->quicksearch)) {
/* only scan subfolders when quicksearch changed,
summaryview->folder_item);
main_window_cursor_normal(summaryview->mainwin);
}
-
+
+ if (!quicksearch_is_active(summaryview->quicksearch)) {
+ debug_print("search cancelled!\n");
+ gtk_clist_thaw(GTK_CLIST(ctree));
+ STATUSBAR_POP(summaryview->mainwin);
+ main_window_cursor_normal(summaryview->mainwin);
+ summary_unlock(summaryview);
+ inc_unlock();
+ summary_show(summaryview, summaryview->folder_item);
+ return FALSE;
+ }
g_slist_free(mlist);
mlist = not_killed;
}
toolbar_main_set_sensitive(summaryview->mainwin);
gtk_clist_thaw(GTK_CLIST(ctree));
-
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
STATUSBAR_POP(summaryview->mainwin);
return mlist;
}
-static void summary_set_menu_sensitive(SummaryView *summaryview)
+void summary_set_menu_sensitive(SummaryView *summaryview)
{
GtkItemFactory *ifactory = summaryview->popupfactory;
SensitiveCond state;
{"/Mark/Ignore thread" , M_TARGET_EXIST},
{"/Mark/Lock" , M_TARGET_EXIST},
{"/Mark/Unlock" , M_TARGET_EXIST},
+ {"/Mark/Mark as spam" , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
+ {"/Mark/Mark as ham" , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
{"/Color label" , M_TARGET_EXIST},
{"/Add sender to address book" , M_SINGLE_TARGET_EXIST},
summary_lock(summaryview);
menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem),
- summaryview->messageview->mimeview->textview->show_all_headers);
+ if (summaryview->messageview
+ && summaryview->messageview->mimeview
+ && summaryview->messageview->mimeview->textview)
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem),
+ summaryview->messageview->mimeview->textview->show_all_headers);
summary_unlock(summaryview);
}
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Search from the end?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
- val = G_ALERTDEFAULT;
+ val = G_ALERTALTERNATE;
break;
case NEXTUNREADMSGDIALOG_ASSUME_NO:
- val = !G_ALERTDEFAULT;
+ val = !G_ALERTALTERNATE;
break;
default:
debug_print(
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val != G_ALERTDEFAULT) return;
+ if (val != G_ALERTALTERNATE) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_UNREAD, FALSE);
}
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Go to next folder?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
- val = G_ALERTDEFAULT;
+ val = G_ALERTALTERNATE;
break;
case NEXTUNREADMSGDIALOG_ASSUME_NO:
val = G_ALERTOTHER;
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val == G_ALERTDEFAULT) {
+ if (val == G_ALERTALTERNATE) {
folderview_select_next_unread(summaryview->folderview);
return;
}
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Search from the end?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
- val = G_ALERTDEFAULT;
+ val = G_ALERTALTERNATE;
break;
case NEXTUNREADMSGDIALOG_ASSUME_NO:
- val = !G_ALERTDEFAULT;
+ val = !G_ALERTALTERNATE;
break;
default:
debug_print(
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val != G_ALERTDEFAULT) return;
+ if (val != G_ALERTALTERNATE) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_NEW, FALSE);
}
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Go to next folder?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
- val = G_ALERTDEFAULT;
+ val = G_ALERTALTERNATE;
break;
case NEXTUNREADMSGDIALOG_ASSUME_NO:
val = G_ALERTOTHER;
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val == G_ALERTDEFAULT) {
+ if (val == G_ALERTALTERNATE) {
folderview_select_next_new(summaryview->folderview);
return;
}
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the end?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (val != G_ALERTDEFAULT) return;
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+ if (val != G_ALERTALTERNATE) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
}
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the beginning?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (val != G_ALERTDEFAULT) return;
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+ if (val != G_ALERTALTERNATE) return;
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
}
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the end?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (val != G_ALERTDEFAULT) return;
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+ if (val != G_ALERTALTERNATE) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
}
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the beginning?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (val != G_ALERTDEFAULT) return;
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+ if (val != G_ALERTALTERNATE) return;
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
}
g_warning("crash avoidance hack 2\n");
return;
}
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
summary_unselect_all(summaryview);
if (display_msg && summaryview->displayed == node)
msginfo = gtk_ctree_node_get_row_data(ctree, node);
/* Find msg with matching flags but ignore messages with
ignore flags, if searching for new or unread messages */
- if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) &&
- (msginfo && (msginfo->flags.perm_flags & flags) != 0))
+ if ((msginfo && (msginfo->flags.perm_flags & flags) != 0) &&
+ !(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags))
+ )
break;
}
g_hash_table_destroy(subject_table);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
gtk_clist_thaw(clist);
gchar *spc;
gchar *itstr;
GList *rowlist, *cur;
- guint n_selected = 0;
- off_t sel_size = 0;
+ guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
+ off_t sel_size = 0, n_size = 0;
MsgInfo *msginfo;
gchar *name;
else {
sel_size += msginfo->size;
n_selected++;
+
}
}
+
+ if (summaryview->folder_item->hide_read_msgs
+ || quicksearch_is_active(summaryview->quicksearch)) {
+ rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+ for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ msginfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(cur));
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ n_size += msginfo->size;
+ n_total++;
+ if (MSG_IS_NEW(msginfo->flags))
+ n_new++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ n_unread++;
+ }
+ }
+ } else {
+ n_new = summaryview->folder_item->new_msgs;
+ n_unread = summaryview->folder_item->unread_msgs;
+ n_total = summaryview->folder_item->total_msgs;
+ n_size = summaryview->total_size;
+ }
name = folder_item_get_name(summaryview->folder_item);
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->folder_item->new_msgs,
- summaryview->folder_item->unread_msgs,
- summaryview->folder_item->total_msgs,
- to_human_readable(summaryview->total_size));
+ n_new, n_unread, n_total,
+ to_human_readable(n_size));
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
gtk_sctree_sort_recursive(ctree, NULL);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
gtk_clist_thaw(clist);
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
-
- summary_set_header(summaryview, text, msginfo);
+ gboolean free_from = FALSE;
+
+ summary_set_header(summaryview, text, msginfo, &free_from);
gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE,
SET_TEXT(S_COL_TO);
/* SET_TEXT(S_COL_SUBJECT); already set by node info */
+ if (free_from) {
+ g_free(text[col_pos[S_COL_FROM]]);
+ text[col_pos[S_COL_FROM]] = NULL;
+ }
+
#undef SET_TEXT
GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
+ gboolean free_from = FALSE;
+ gint *col_pos = summaryview->col_pos;
+
cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
- summary_set_header(summaryview, text, msginfo);
+ summary_set_header(summaryview, text, msginfo, &free_from);
node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
NULL, NULL, NULL, NULL,
FALSE, FALSE);
+ if (free_from) {
+ g_free(text[col_pos[S_COL_FROM]]);
+ text[col_pos[S_COL_FROM]] = NULL;
+ }
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
}
static void summary_set_header(SummaryView *summaryview, gchar *text[],
- MsgInfo *msginfo)
+ MsgInfo *msginfo, gboolean *free_from)
{
static gchar date_modified[80];
static gchar col_score[11];
else
text[col_pos[S_COL_DATE]] = _("(No Date)");
- if (prefs_common.swap_from && msginfo->from && msginfo->to) {
+ if (prefs_common.swap_from && msginfo->from && msginfo->to
+ && !summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible) {
gchar *addr = NULL;
addr = g_strdup(msginfo->from);
)
);
+ text[col_pos[S_COL_TO]] = to_text;
if (!should_swap) {
text[col_pos[S_COL_FROM]] = from_text;
- text[col_pos[S_COL_TO]] = to_text;
+ *free_from = FALSE;
} else {
gchar *tmp = NULL;
tmp = g_strconcat("-->", to_text, NULL);
text[col_pos[S_COL_FROM]] = tmp;
- tmp = g_strconcat("<--", from_text, NULL);
- text[col_pos[S_COL_TO]] = tmp;
+ *free_from = TRUE;
}
if (summaryview->simplify_subject_preg != NULL)
GTK_EVENTS_FLUSH();
msginfo = gtk_ctree_node_get_row_data(ctree, row);
-
+
if (new_window) {
MessageView *msgview;
if (MSG_IS_IGNORE_THREAD(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
ignorethreadxpm, ignorethreadxpmmask);
+ } else if (MSG_IS_SPAM(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+ spamxpm, spamxpmmask);
} else if (MSG_IS_NEW(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
newxpm, newxpmmask);
}
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_marked);
-#if 0
- } else if ((global_scoring ||
- summaryview->folder_item->prefs->scoring) &&
- (msginfo->score >= summaryview->important_score) &&
- (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
- gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
- gtk_ctree_node_set_foreground(ctree, row,
- &summaryview->color_important);
-#endif
} else {
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
}
summary_status_show(summaryview);
}
+void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *widget)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+ gboolean is_spam = action;
+ GSList *msgs = NULL;
+ gboolean immediate_exec = prefs_common.immediate_exec;
+ gboolean moved = FALSE;
+ prefs_common.immediate_exec = FALSE;
+
+ START_LONG_OPERATION(summaryview);
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+ GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+ MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ msgs = g_slist_prepend(msgs, msginfo);
+ }
+
+ if (procmsg_spam_learner_learn(NULL, msgs, is_spam) == 0) {
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+ GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+ MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ 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());
+ moved = TRUE;
+ }
+ } else {
+ summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ }
+ }
+ } else {
+ log_error(_("An error happened while learning.\n"));
+ }
+
+ g_slist_free(msgs);
+
+ prefs_common.immediate_exec = immediate_exec;
+
+ END_LONG_OPERATION(summaryview);
+
+ if (prefs_common.immediate_exec && moved) {
+ summary_execute(summaryview);
+ }
+
+ summary_status_show(summaryview);
+}
+
+
static void summary_mark_row_as_unread(SummaryView *summaryview,
GtkCTreeNode *row)
{
aval = alertpanel(_("Delete message(s)"),
_("Do you really want to delete selected message(s)?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT) return;
+ GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
+ if (aval != G_ALERTALTERNATE) return;
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL;
cur = cur->next) {
END_LONG_OPERATION(summaryview);
+ summaryview->display_msg = prefs_common.always_show_msg;
+
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
if (GTK_CLIST(ctree)->selection->next) {
GList *item;
for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
- msginfo = gtk_ctree_node_get_row_data(ctree, (GtkCTreeNode*)item->data);
+ msginfo = gtk_ctree_node_get_row_data(ctree, GTK_CTREE_NODE(item->data));
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
|| !mimeview->textview->text)
alertpanel_warning(_("Cannot print: the message doesn't "
"contain text."));
- else
+ else {
+ gtk_widget_realize(mimeview->textview->text);
gedit_print(GTK_TEXT_VIEW(mimeview->textview->text));
+ }
}
#endif
gtk_clist_freeze(clist);
+ main_window_cursor_wait(summaryview->mainwin);
+
if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
summary_update_status(summaryview);
summary_status_show(summaryview);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
summary_unlock(summaryview);
-
+
+ main_window_cursor_normal(summaryview->mainwin);
+
if (move_val < 0)
summary_show(summaryview, summaryview->folder_item);
return TRUE;
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
+ return val;
}
- return val;
+ return 0;
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
summaryview->thread_collapsed = FALSE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_collapse_threads(SummaryView *summaryview)
summaryview->thread_collapsed = TRUE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_filter(SummaryView *summaryview, gboolean selected_only)
{
+ GSList *mlist = NULL, *cur_list;
summary_lock(summaryview);
folder_item_update_freeze();
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL && cur->data != NULL; cur = cur->next) {
- summary_filter_func(GTK_CTREE(summaryview->ctree),
- GTK_CTREE_NODE(cur->data),
- summaryview);
+ mlist = g_slist_prepend(mlist,
+ procmsg_msginfo_new_ref(
+ GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data)));
}
+ mlist = g_slist_reverse(mlist);
} else {
- gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
- GTK_CTREE_FUNC(summary_filter_func),
- summaryview);
+ mlist = folder_item_get_msg_list(summaryview->folder_item);
+ }
+ for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
+ summary_filter_func((MsgInfo *)cur_list->data);
+ }
+ filtering_move_and_copy_msgs(mlist);
+ for (cur_list = mlist; cur_list; cur_list = cur_list->next) {
+ procmsg_msginfo_free((MsgInfo *)cur_list->data);
}
+ g_slist_free(mlist);
+
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
folder_item_update_thaw();
summary_show(summaryview, summaryview->folder_item);
}
-static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
- gpointer data)
+static void summary_filter_func(MsgInfo *msginfo)
{
MailFilteringData mail_filtering_data;
- MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
mail_filtering_data.msginfo = msginfo;
if (hooks_invoke(MAIL_MANUAL_FILTERING_HOOKLIST, &mail_filtering_data))
if (!sel) return;
menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
+
g_return_if_fail(menu != NULL);
Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
GINT_TO_POINTER(0));
}
-static void summary_colorlabel_menu_create(SummaryView *summaryview)
+static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean refresh)
{
GtkWidget *label_menuitem;
GtkWidget *menu;
g_object_set_data(G_OBJECT(item), "summaryview", summaryview);
gtk_widget_show(item);
+ gtk_widget_add_accelerator(item, "activate",
+ summaryview->popupfactory->accel_group,
+ GDK_0, GDK_CONTROL_MASK,
+ GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
+
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show(item);
/* create pixmap/label menu items */
for (i = 0; i < N_COLOR_LABELS; i++) {
- item = colorlabel_create_check_color_menu_item(i);
+ item = colorlabel_create_check_color_menu_item(
+ i, refresh, SUMMARY_COLORMENU);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(summary_colorlabel_menu_item_activate_cb),
gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_SQUARE);
-#if 0
- gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
- gtk_ctree_set_expander_style(GTK_CTREE(ctree),
- GTK_CTREE_EXPANDER_TRIANGLE);
-#endif
gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
- g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
+ g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
G_CALLBACK(summary_drag_data_get),
summaryview);
+ gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
+ summary_drag_types, 2,
+ GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_DEFAULT);
+
+ g_signal_connect(G_OBJECT(ctree), "drag_data_received",
+ G_CALLBACK(summary_drag_data_received),
+ summaryview);
+
+ g_signal_connect(G_OBJECT(ctree), "drag_motion",
+ G_CALLBACK(summary_drag_motion_cb),
+ summaryview);
+
return ctree;
}
msginfo = gtk_ctree_node_get_row_data(ctree, row);
g_return_if_fail(msginfo != NULL);
+ toolbar_set_learn_button
+ (summaryview->mainwin->toolbar,
+ MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
if (!MSG_IS_DELETED(msginfo->flags) &&
if (MSG_IS_UNREAD(msginfo->flags)) {
summary_mark_row_as_read(summaryview, row);
summary_status_show(summaryview);
+ } else if (MSG_IS_SPAM(msginfo->flags)) {
+ if (procmsg_spam_learner_learn(msginfo, NULL, FALSE) == 0)
+ summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ else
+ log_error(_("An error happened while learning.\n"));
} else if (!MSG_IS_REPLIED(msginfo->flags) &&
!MSG_IS_FORWARDED(msginfo->flags)) {
marked_unread = TRUE;
static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_FROM);
+ if (summaryview->col_state[summaryview->col_pos[S_COL_FROM]].visible)
+ summary_sort_by_column_click(summaryview, SORT_BY_FROM);
+ else
+ summary_sort_by_column_click(summaryview, SORT_BY_TO);
}
static void summary_to_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_TO);
+ if (summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible)
+ summary_sort_by_column_click(summaryview, SORT_BY_TO);
+ else
+ summary_sort_by_column_click(summaryview, SORT_BY_FROM);
}
static void summary_subject_clicked(GtkWidget *button,
(ctree, GTK_CTREE_NODE(cur->data));
tmp2 = procmsg_get_message_file(msginfo);
if (!tmp2) continue;
- tmp1 = g_strconcat("file://", tmp2, NULL);
+ if (msginfo->subject) {
+ gchar *san_subject = g_strdup(msginfo->subject);
+ gchar *dest = NULL;
+ subst_for_filename(san_subject);
+ dest = g_strdup_printf("%s%s%s.%d.txt",
+ get_tmp_dir(),
+ G_DIR_SEPARATOR_S,
+ san_subject, msginfo->msgnum);
+ g_free(san_subject);
+ san_subject = g_filename_from_utf8(dest, -1, NULL, NULL, NULL);
+ g_free(dest);
+ dest = san_subject;
+ if (copy_file(tmp2, dest, TRUE) == 0) {
+ g_free(tmp2);
+ tmp2 = dest;
+ }
+ }
+ tmp1 = g_strconcat("file://", tmp2, "\r\n", NULL);
g_free(tmp2);
if (!mail_list) {
}
}
+static gboolean summary_drag_motion_cb(GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ SummaryView *summaryview)
+{
+ FolderItem *item = summaryview->folder_item;
+ if (!(item && item->folder && folder_item_parent(item) != NULL
+ && FOLDER_CLASS(item->folder)->add_msg != NULL)) {
+ gdk_drag_status(context, 0, time);
+ return FALSE;
+ } else if (gtk_drag_get_source_widget(context) ==
+ mainwindow_get_mainwindow()->folderview->ctree) {
+ /* no folders */
+ gdk_drag_status(context, 0, time);
+ return FALSE;
+ } else if (gtk_drag_get_source_widget(context) ==
+ summaryview->ctree) {
+ /* not from same folder */
+ gdk_drag_status(context, 0, time);
+ return FALSE;
+ } else {
+ gdk_drag_status(context, GDK_ACTION_COPY, time);
+ return TRUE;
+ }
+}
+
+static void summary_drag_data_received(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ SummaryView *summaryview)
+{
+ if (info == TARGET_MAIL_URI_LIST) {
+ FolderItem *item = summaryview->folder_item;
+ if (!item) {
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ return;
+ } else {
+ folderview_finish_dnd(data->data, drag_context, time, item);
+ }
+ }
+}
+
/* custom compare functions for sorting */
summary_ignore_thread(summaryview);
}
-#if 0 /* OLD PROCESSING */
-static gboolean processing_apply_func(GNode *node, gpointer data)
-{
- FolderItem *item;
- GSList * processing;
- SummaryView * summaryview = (SummaryView *) data;
-
- if (node == NULL)
- return FALSE;
-
- item = node->data;
- /* prevent from the warning */
- if (item->path == NULL)
- return FALSE;
- processing = item->prefs->processing;
-
-
- if (processing != NULL) {
- gchar * buf;
- GSList * mlist;
- GSList * cur;
-
- buf = g_strdup_printf(_("Processing (%s)..."), item->path);
- debug_print(buf);
- STATUSBAR_PUSH(summaryview->mainwin, buf);
- g_free(buf);
-
- mlist = folder_item_get_msg_list(item);
- for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = cur->next) {
- MsgInfo * msginfo;
-
- msginfo = (MsgInfo *) cur->data;
- filter_message_by_msginfo(processing, msginfo, NULL);
- procmsg_msginfo_free(msginfo);
- }
-
- g_slist_free(mlist);
-
- STATUSBAR_POP(summaryview->mainwin);
- }
-
-
- return FALSE;
-}
-
-void processing_apply(SummaryView * summaryview)
-{
- GList * cur;
-
- for (cur = folder_get_list() ; cur != NULL && cur->data != NULL ; cur = g_list_next(cur)) {
- Folder *folder;
-
- folder = (Folder *) cur->data;
- g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
- processing_apply_func, summaryview);
- }
-}
-#endif
-
void summary_toggle_show_read_messages(SummaryView *summaryview)
{
FolderItemUpdateData source;
stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm, &clipgpgsignedxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm, &spamxpmmask);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
summary_set_column_titles(summaryview);
}
+void summary_reflect_prefs_custom_colors(SummaryView *summaryview)
+{
+ GtkMenuShell *menu;
+ GList *cur;
+
+ /* re-create colorlabel submenu */
+ menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
+ g_return_if_fail(menu != NULL);
+
+ /* clear items. get item pointers. */
+ for (cur = menu->children; cur != NULL && cur->data != NULL; cur = cur->next) {
+ gtk_menu_item_remove_submenu(GTK_MENU_ITEM(cur->data));
+ }
+ summary_colorlabel_menu_create(summaryview, TRUE);
+}
+
/*
* Harvest addresses for selected messages in summary view.
*/
summaryview->thread_collapsed = item->thread_collapsed;
/* Scoring */
-#if 0
- if (global_scoring || item->prefs->scoring) {
- summaryview->important_score = prefs_common.important_score;
- if (item->prefs->important_score >
- summaryview->important_score)
- summaryview->important_score =
- item->prefs->important_score;
- }
-#endif
}
void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item)