#include "matcher_parser.h"
#include "hooks.h"
#include "description_window.h"
+#include "folder.h"
#define SUMMARY_COL_MARK_WIDTH 10
-#define SUMMARY_COL_UNREAD_WIDTH 13
+#define SUMMARY_COL_STATUS_WIDTH 13
#define SUMMARY_COL_LOCKED_WIDTH 13
#define SUMMARY_COL_MIME_WIDTH 11
static void summary_mark_clicked (GtkWidget *button,
SummaryView *summaryview);
-static void summary_unread_clicked (GtkWidget *button,
+static void summary_status_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_mime_clicked (GtkWidget *button,
SummaryView *summaryview);
static gint summary_cmp_by_mark (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_unread (GtkCList *clist,
+static gint summary_cmp_by_status (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static gint summary_cmp_by_mime (GtkCList *clist,
static const gchar *const col_label[N_SUMMARY_COLS] = {
N_("M"), /* S_COL_MARK */
- N_("U"), /* S_COL_UNREAD */
+ N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("From"), /* S_COL_FROM */
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
SORT_BY_MARK,
- SORT_BY_UNREAD,
+ SORT_BY_STATUS,
SORT_BY_MIME,
SORT_BY_SUBJECT,
SORT_BY_FROM,
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
+ single_char = (type == S_COL_MIME || type == S_COL_STATUS);
justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
case SORT_BY_MARK:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
break;
- case SORT_BY_UNREAD:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+ case SORT_BY_STATUS:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
break;
case SORT_BY_MIME:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
gint *col_pos = summaryview->col_pos;
text[col_pos[S_COL_MARK]] = NULL;
- text[col_pos[S_COL_UNREAD]] = NULL;
+ text[col_pos[S_COL_STATUS]] = NULL;
text[col_pos[S_COL_MIME]] = NULL;
text[col_pos[S_COL_LOCKED]] = NULL;
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
/* set new/unread column */
if (MSG_IS_IGNORE_THREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
ignorethreadxpm, ignorethreadxpmmask);
} else if (MSG_IS_NEW(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
newxpm, newxpmmask);
} else if (MSG_IS_UNREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
unreadxpm, unreadxpmmask);
} else if (MSG_IS_REPLIED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
repliedxpm, repliedxpmmask);
} else if (MSG_IS_FORWARDED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
forwardedxpm, forwardedxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
NULL);
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
GtkCTreeNode *node;
gtk_clist_freeze(clist);
+ folder_item_update_freeze();
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_read(summaryview, node);
summary_set_row_marks(summaryview, node);
}
gtk_clist_thaw(clist);
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (prefs_common.expand_thread)
+ if (!summaryview->thread_collapsed)
gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *next;
- if (prefs_common.expand_thread) {
+ if (!summaryview->thread_collapsed) {
while (node) {
next = GTK_CTREE_ROW(node)->sibling;
if (GTK_CTREE_ROW(node)->children)
gtk_clist_thaw(GTK_CLIST(ctree));
+ summaryview->thread_collapsed = FALSE;
+
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
}
gtk_clist_thaw(GTK_CLIST(ctree));
+
+ summaryview->thread_collapsed = TRUE;
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
GTK_JUSTIFY_CENTER);
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
SUMMARY_COL_MARK_WIDTH);
- gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
- SUMMARY_COL_UNREAD_WIDTH);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
+ SUMMARY_COL_STATUS_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
SUMMARY_COL_LOCKED_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
summaryview)
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK , summary_mark_clicked);
- CLIST_BUTTON_SIGNAL_CONNECT(S_COL_UNREAD , summary_unread_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME , summary_mime_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE , summary_size_clicked);
} else
summary_mark_row(summaryview, row);
break;
- case S_COL_UNREAD:
+ case S_COL_STATUS:
if (MSG_IS_UNREAD(msginfo->flags)) {
summary_mark_row_as_read(summaryview, row);
summary_status_show(summaryview);
summary_sort_by_column_click(summaryview, SORT_BY_MARK);
}
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_status_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
+ summary_sort_by_column_click(summaryview, SORT_BY_STATUS);
}
static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
CMP_FUNC_DEF(summary_cmp_by_mark,
MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
-CMP_FUNC_DEF(summary_cmp_by_unread,
+CMP_FUNC_DEF(summary_cmp_by_status,
MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_mime,
MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
/* Threading */
summaryview->threaded = item->threaded;
+ summaryview->thread_collapsed = item->thread_collapsed;
/* Scoring */
if (global_scoring || item->prefs->scoring) {
/* Threading */
item->threaded = summaryview->threaded;
+ item->thread_collapsed = summaryview->thread_collapsed;
}
static gboolean summary_update_msg(gpointer source, gpointer data)
projects / claws.git / blobdiff