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);
static void summary_set_header (SummaryView *summaryview,
gchar *text[],
MsgInfo *msginfo,
- gboolean *free_from_to);
+ gboolean *free_from);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_display_msg_full (SummaryView *summaryview,
{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},
&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);
( (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);
+
+ 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
+ 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;
+ }
+
+ if (!showing_from && !showing_to) {
+ debug_print("showing none\n");
+ return;
+ }
+
+ debug_print("showing %s %s, must show %s %s\n",
+ showing_from?"From":"",
+ showing_to?"To":"",
+ show_from?"From":"",
+ show_to?"To":"");
+
+ if (showing_from == show_from && showing_to == show_to)
+ return;
+ /* else we'll switch both */
+
+ debug_print("switching columns\n");
+ col_state[from_pos].type = S_COL_TO;
+ col_state[from_pos].visible = show_to;
+
+ col_state[to_pos].type = S_COL_FROM;
+ col_state[to_pos].visible = show_from;
+
+ summaryview->col_pos[S_COL_TO] = from_pos;
+ summaryview->col_pos[S_COL_FROM] = to_pos;
+
+ 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)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if (!summaryview->mainwin)
return FALSE;
+ summary_switch_from_to(summaryview, item);
+
inc_lock();
summary_lock(summaryview);
if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
-
+
not_killed = NULL;
for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
+ GTK_EVENTS_FLUSH();
+ if (!quicksearch_is_active(summaryview->quicksearch)) {
+ break;
+ }
}
hidden_removed = TRUE;
if (quicksearch_is_running(summaryview->quicksearch)) {
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},
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
- gboolean free_from_to = FALSE;
+ gboolean free_from = FALSE;
- summary_set_header(summaryview, text, msginfo, &free_from_to);
+ 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_to) {
+ if (free_from) {
g_free(text[col_pos[S_COL_FROM]]);
- g_free(text[col_pos[S_COL_TO]]);
text[col_pos[S_COL_FROM]] = NULL;
- text[col_pos[S_COL_TO]] = NULL;
}
#undef SET_TEXT
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
- gboolean free_from_to = FALSE;
+ 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, &free_from_to);
+ 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_to) {
+ if (free_from) {
g_free(text[col_pos[S_COL_FROM]]);
- g_free(text[col_pos[S_COL_TO]]);
text[col_pos[S_COL_FROM]] = NULL;
- text[col_pos[S_COL_TO]] = 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, gboolean *free_from_to)
+ 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_to = FALSE;
+ *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_to = TRUE;
+ *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;
}
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_dim);
+ } else if (MSG_IS_SPAM(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+ spamxpm, spamxpmmask);
} else if (MSG_IS_MARKED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
markxpm, markxpmmask);
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;
+
+ 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);
+ if (is_spam) {
+ summary_msginfo_change_flags(msginfo, MSG_SPAM, 0, MSG_NEW|MSG_UNREAD, 0);
+ summary_move_row_to(summaryview, row, procmsg_spam_get_folder());
+ } else {
+ summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ }
+ msgs = g_slist_prepend(msgs, msginfo);
+ }
+
+ procmsg_spam_learner_learn(NULL, msgs, is_spam);
+ g_slist_free(msgs);
+
+ prefs_common.immediate_exec = immediate_exec;
+
+ END_LONG_OPERATION(summaryview);
+
+ if (prefs_common.immediate_exec) {
+ summary_execute(summaryview);
+ }
+
+ summary_status_show(summaryview);
+}
+
+
static void summary_mark_row_as_unread(SummaryView *summaryview,
GtkCTreeNode *row)
{
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)
!MSG_IS_COPY(msginfo->flags)) {
if (MSG_IS_MARKED(msginfo->flags)) {
summary_unmark_row(summaryview, row);
+ } else if (MSG_IS_SPAM(msginfo->flags)) {
+ summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ procmsg_spam_learner_learn(msginfo, NULL, FALSE);
} else {
summary_mark_row(summaryview, row);
}
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,
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 {
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);
projects / claws.git / blobdiff