#include "pixmaps/replied.xpm"
#include "pixmaps/forwarded.xpm"
#include "pixmaps/clip.xpm"
+#include "pixmaps/ignorethread.xpm"
#define STATUSBAR_PUSH(mainwin, str) \
{ \
static GdkBitmap *repliedxpmmask;
static GdkPixmap *forwardedxpm;
static GdkBitmap *forwardedxpmmask;
+static GdkPixmap *ignorethreadxpm;
+static GdkBitmap *ignorethreadxpmmask;
static GdkPixmap *clipxpm;
static GdkBitmap *clipxpmmask;
static void summary_execute_delete_func (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data);
+static void summary_ignore_thread(SummaryView *summaryview);
+static void summary_unignore_thread(SummaryView *summaryview);
/* thread functions */
static void summary_thread_func (GtkCTree *ctree,
SummaryView *summaryview);
static void summary_subject_clicked (GtkWidget *button,
SummaryView *summaryview);
+static void summary_mark_clicked (GtkWidget *button,
+ SummaryView *summaryview);
static void summary_start_drag (GtkWidget *widget,
int button,
static gint summary_cmp_by_score (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_label (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
GtkTargetEntry summary_drag_types[1] =
{
{N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
- {N_("/_Mark/Mark as rea_d"),
- NULL, summary_mark_as_read, 0, NULL},
+ {N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
+ {N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
+ {N_("/_Mark/Unignore thread"), NULL, summary_unignore_thread, 0, NULL},
+
+ {N_("/_Label"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Label/None"), NULL, summary_set_label, MSG_LABEL_NONE, NULL},
+ {N_("/_Label/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Label/Orange"), NULL, summary_set_label, MSG_LABEL_ORANGE, NULL},
+ {N_("/_Label/Red"), NULL, summary_set_label, MSG_LABEL_RED, NULL},
+ {N_("/_Label/Pink"), NULL, summary_set_label, MSG_LABEL_PINK, NULL},
+ {N_("/_Label/SkyBlue"), NULL, summary_set_label, MSG_LABEL_SKYBLUE, NULL},
+ {N_("/_Label/Blue"), NULL, summary_set_label, MSG_LABEL_BLUE, NULL},
+ {N_("/_Label/Green"), NULL, summary_set_label, MSG_LABEL_GREEN, NULL},
+ {N_("/_Label/Brown"), NULL, summary_set_label, MSG_LABEL_BROWN, NULL},
+
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Select _all"), NULL, summary_select_all, 0, NULL}
};
+void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
+ guint labelcolor)
+{
+ GdkColor color;
+ GtkStyle *style, *prev_style, *ctree_style;
+ MsgInfo *msginfo;
+
+ ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
+
+ prev_style = gtk_ctree_node_get_row_style(ctree, node);
+
+ if (!prev_style)
+ prev_style = ctree_style;
+
+ style = gtk_style_copy(prev_style);
+
+ switch (labelcolor) {
+ case MSG_LABEL_ORANGE:
+ color.red = 0xffff;
+ color.green = (0x99<<8);
+ color.blue = 0x0;
+ break;
+ case MSG_LABEL_RED:
+ color.red = 0xffff;
+ color.green = color.blue = 0x0;
+ break;
+ case MSG_LABEL_PINK:
+ color.red = 0xffff;
+ color.green = (0x66<<8);
+ color.blue = 0xffff;
+ break;
+ case MSG_LABEL_SKYBLUE:
+ color.red = 0x0;
+ color.green = (0xcc<<8);
+ color.blue = 0xffff;
+ break;
+ case MSG_LABEL_BLUE:
+ color.red = 0x0;
+ color.green = 0x0;
+ color.blue = 0xffff;
+ break;
+ case MSG_LABEL_GREEN:
+ color.red = 0x0;
+ color.green = (0x99<<8);
+ color.blue = 0x0;
+ break;
+ case MSG_LABEL_BROWN:
+ color.red = (0x66<<8);
+ color.green = (0x33<<8);
+ color.blue = (0x33<<8);
+ break;
+ case MSG_LABEL_NONE:
+ default:
+ labelcolor = MSG_LABEL_NONE;
+ color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
+ color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
+ color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
+ style->fg[GTK_STATE_NORMAL] = color;
+
+ color.red = ctree_style->fg[GTK_STATE_SELECTED].red;
+ color.green = ctree_style->fg[GTK_STATE_SELECTED].green;
+ color.blue = ctree_style->fg[GTK_STATE_SELECTED].blue;
+ style->fg[GTK_STATE_SELECTED] = color;
+ gtk_ctree_node_set_row_style(ctree, node, style);
+ break;
+ }
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+
+ MSG_UNSET_FLAGS(msginfo->flags, MSG_LABEL);
+ MSG_SET_FLAGS(msginfo->flags, labelcolor);
+
+ if ( style ) {
+ style->fg[GTK_STATE_NORMAL] = color;
+ style->fg[GTK_STATE_SELECTED] = color;
+ gtk_ctree_node_set_row_style(ctree, node, style);
+ }
+}
+
+void summary_set_label(SummaryView *summaryview, guint labelcolor, GtkWidget *widget)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCList *clist = GTK_CLIST(summaryview->ctree);
+ GList *cur;
+
+ for (cur = clist->selection; cur != NULL; cur = cur->next)
+ summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
+}
+
SummaryView *summary_create(void)
{
SummaryView *summaryview;
"clicked",
GTK_SIGNAL_FUNC(summary_subject_clicked),
summaryview);
+ gtk_signal_connect
+ (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_MARK].button),
+ "clicked",
+ GTK_SIGNAL_FUNC(summary_mark_clicked),
+ summaryview);
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
replied_xpm);
PIXMAP_CREATE(summaryview->ctree, forwardedxpm, forwardedxpmmask,
forwarded_xpm);
+ PIXMAP_CREATE(summaryview->ctree, ignorethreadxpm, ignorethreadxpmmask,
+ ignorethread_xpm);
PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
DIRECTORY_OPEN_XPM);
menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
+
+ menu_set_sensitive(ifactory, "/Label", TRUE);
menu_set_sensitive(ifactory, "/Select all", TRUE);
if (node) {
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0);
+
+ /* BUGFIX: select next unread message
+ * REVERT: causes incorrect folder stats
+ * gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0.0);
+ */
+
if (summaryview->displayed == node)
summaryview->displayed = NULL;
summary_display_msg(summaryview, node, FALSE);
for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_UNREAD(msginfo->flags)) break;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
}
return node;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
case SORT_BY_SCORE:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
break;
+ case SORT_BY_LABEL:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
+ break;
default:
return;
}
parent = g_hash_table_lookup
(msgid_table, msginfo->inreplyto);
}
- if (parent == NULL && msginfo->subject) {
+ if (parent == NULL && msginfo->subject &&
+ g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
parent = subject_table_lookup
(subject_table, msginfo->subject);
}
+ if(parent) {
+ parentinfo = gtk_ctree_node_get_row_data(ctree, parent);
+ if(parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
+/*
+ if (MSG_IS_NEW(msginfo->flags))
+ summaryview->newmsgs--;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ summaryview->unread--;
+*/
+ MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+ }
+ }
node = gtk_ctree_insert_node
(ctree, parent, NULL, text, 2,
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
+
+ if ( MSG_GET_LABEL(msginfo->flags) )
+ summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
/* preserve previous node if the message is
duplicated */
*cur_msginfo->inreplyto) {
cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
}
- if (cur_parent == NULL && cur_msginfo->subject) {
+ if (cur_parent == NULL &&
+ cur_msginfo->subject &&
+ g_strncasecmp(cur_msginfo->subject,
+ "Re: ", 4) == 0) {
cur_parent = subject_table_lookup(subject_table, cur_msginfo->subject);
}
}
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
+ if ( MSG_GET_LABEL(msginfo->flags) )
+ summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
+
if (msginfo->msgid && *msginfo->msgid &&
g_hash_table_lookup(msgid_table, msginfo->msgid)
== NULL)
}
g_free(filename);
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
flags = msginfo->flags;
- gtk_ctree_node_set_foreground(ctree, row, &summaryview->color_normal);
+ gtk_ctree_node_set_foreground(ctree, row, NULL);
/* set new/unread column */
- if (MSG_IS_NEW(flags)) {
+ if (MSG_IS_IGNORE_THREAD(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+ ignorethreadxpm, ignorethreadxpmmask);
+ } else if (MSG_IS_NEW(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
newxpm, newxpmmask);
} else if (MSG_IS_UNREAD(flags)) {
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_NEW(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) ||
MSG_IS_UNREAD(msginfo->flags)) {
if(msginfo->inreplyto) {
parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
}
- if (parent == NULL && msginfo->subject) {
+ if (parent == NULL && msginfo->subject &&
+ g_strncasecmp(msginfo->subject, "Re: ", 4) == 0) {
parent = subject_table_lookup(subject_table, msginfo->subject);
}
summary_sort(summaryview, SORT_BY_SUBJECT);
}
+static void summary_mark_clicked(GtkWidget *button,
+ SummaryView *summaryview)
+{
+ summary_sort(summaryview, SORT_BY_LABEL);
+}
+
void summary_change_display_item(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
return strcasecmp(msginfo1->subject, msginfo2->subject);
}
+static gint summary_cmp_by_label(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+ return MSG_GET_LABEL(msginfo1->flags) - MSG_GET_LABEL(msginfo2->flags);
+}
+
static gint summary_cmp_by_score(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
else
return summary_cmp_by_date(clist, ptr1, ptr2);
}
+
+static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+ SummaryView *summaryview = (SummaryView *) data;
+ MsgInfo *msginfo;
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ if (MSG_IS_NEW(msginfo->flags))
+ summaryview->newmsgs--;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ summaryview->unread--;
+ MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+
+ CHANGE_FLAGS(msginfo);
+
+ summary_set_row_marks(summaryview, row);
+ debug_print(_("Message %d is marked as ignore thread\n"),
+ msginfo->msgnum);
+}
+
+static void summary_ignore_thread(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+ gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
+ }
+
+ summary_status_show(summaryview);
+}
+
+static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
+{
+ SummaryView *summaryview = (SummaryView *) data;
+ MsgInfo *msginfo;
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ if (MSG_IS_NEW(msginfo->flags))
+ summaryview->newmsgs++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ summaryview->unread++;
+ MSG_UNSET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+
+ CHANGE_FLAGS(msginfo);
+
+ summary_set_row_marks(summaryview, row);
+ debug_print(_("Message %d is marked as unignore thread\n"),
+ msginfo->msgnum);
+}
+
+static void summary_unignore_thread(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+ gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
+ }
+
+ summary_status_show(summaryview);
+}
+
projects / claws.git / blobdiff