static guint summary_get_msgnum (SummaryView *summaryview,
GtkCTreeNode *node);
+static GtkCTreeNode *summary_find_prev_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_next_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
static GtkCTreeNode *summary_find_prev_unread_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
static void summary_status_show (SummaryView *summaryview);
static void summary_set_ctree_from_list (SummaryView *summaryview,
GSList *mlist);
-static void summary_set_header (gchar *text[],
+static void summary_set_header (SummaryView *summaryview,
+ gchar *text[],
MsgInfo *msginfo);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row,
static void summary_execute_delete_func (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data);
+
+static void summary_thread_init (SummaryView *summaryview);
static void summary_ignore_thread(SummaryView *summaryview);
static void summary_unignore_thread(SummaryView *summaryview);
{N_("/Select _all"), NULL, summary_select_all, 0, NULL}
};
+static const gchar *const col_label[N_SUMMARY_COLS] = {
+ N_("M"), /* S_COL_MARK */
+ N_("U"), /* S_COL_UNREAD */
+ "", /* S_COL_MIME */
+ N_("No."), /* S_COL_NUMBER */
+ N_("Score"), /* S_COL_SCORE */
+ N_("Size"), /* S_COL_SIZE */
+ N_("Date"), /* S_COL_DATE */
+ N_("From"), /* S_COL_FROM */
+ N_("Subject") /* S_COL_SUBJECT */
+};
+
SummaryView *summary_create(void)
{
SummaryView *summaryview;
- gchar *titles[N_SUMMARY_COLS] = {_("M"), _("U")};
+ SummaryColumnState *col_state;
+ gint *col_pos;
+ SummaryColumnType col_default[N_SUMMARY_COLS] = {
+ S_COL_MARK,
+ S_COL_UNREAD,
+ S_COL_MIME,
+ S_COL_NUMBER,
+ S_COL_SCORE,
+ S_COL_SIZE,
+ S_COL_DATE,
+ S_COL_FROM,
+ S_COL_SUBJECT
+ };
+ const gchar *titles[N_SUMMARY_COLS];
GtkWidget *vbox;
GtkWidget *scrolledwin;
GtkWidget *ctree;
prefs_common.summaryview_width,
prefs_common.summaryview_height);
- if (prefs_common.trans_hdr) {
- titles[S_COL_NUMBER] = _("No.");
- titles[S_COL_DATE] = _("Date");
- titles[S_COL_FROM] = _("From");
- titles[S_COL_SUBJECT] = _("Subject");
- } else {
- titles[S_COL_NUMBER] = "No.";
- titles[S_COL_DATE] = "Date";
- titles[S_COL_FROM] = "From";
- titles[S_COL_SUBJECT] = "Subject";
+ col_state = summaryview->col_state;
+ col_pos = summaryview->col_pos;
+
+ for (i = 0; i < N_SUMMARY_COLS; i++) {
+ SummaryColumnType type;
+
+ type = col_state[i].type = col_default[i];
+ col_state[i].visible = TRUE;
+ col_pos[i] = i;
+ switch (type) {
+ case S_COL_SCORE:
+ case S_COL_SIZE:
+ case S_COL_NUMBER:
+ case S_COL_DATE:
+ case S_COL_FROM:
+ case S_COL_SUBJECT:
+ if (prefs_common.trans_hdr)
+ titles[i] = gettext(col_label[type]);
+ else
+ titles[i] = col_label[type];
+ break;
+ default:
+ titles[i] = gettext(col_label[type]);
+ }
}
- titles[S_COL_SIZE] = _("Size");
- titles[S_COL_SCORE] = _("Score");
- ctree = gtk_sctree_new_with_titles(N_SUMMARY_COLS, S_COL_SUBJECT, titles);
+ ctree = gtk_sctree_new_with_titles
+ (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], (gchar **)titles);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->hadjustment);
gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->vadjustment);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_MARK,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_UNREAD,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_MIME,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MIME],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_NUMBER,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_NUMBER],
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SCORE,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SIZE,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_MARK,
+ 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), S_COL_UNREAD,
+ 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), S_COL_MIME,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
SUMMARY_COL_MIME_WIDTH);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_NUMBER,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_NUMBER],
prefs_common.summary_col_number);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SCORE,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
prefs_common.summary_col_score);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SIZE,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
prefs_common.summary_col_size);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_DATE,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_DATE],
prefs_common.summary_col_date);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_FROM,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_FROM],
prefs_common.summary_col_from);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SUBJECT,
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SUBJECT],
prefs_common.summary_col_subject);
gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
/* connect signal to the buttons for sorting */
#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
gtk_signal_connect \
- (GTK_OBJECT(GTK_CLIST(ctree)->column[col].button), \
+ (GTK_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
"clicked", \
GTK_SIGNAL_FUNC(func), \
summaryview)
pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
gtk_clist_set_column_widget(GTK_CLIST(summaryview->ctree),
- S_COL_MIME, pixmap);
+ summaryview->col_pos[S_COL_MIME], pixmap);
gtk_widget_show(pixmap);
if (!small_style) {
message, but do not display it */
node = summary_find_next_unread_msg(summaryview, NULL);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
- node = GTK_CTREE_NODE
- (GTK_CLIST(ctree)->row_list_end);
+ node = gtk_ctree_node_nth
+ (ctree, GTK_CLIST(ctree)->rows - 1);
summary_select_node(summaryview, node, FALSE);
}
} else {
else
node = summary_find_next_unread_msg(summaryview, NULL);
- if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
- summary_select_node(summaryview, node,
- prefs_common.open_unread_on_enter);
+ if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
+ /* Get the last visible node on screen */
+ /* FIXME: huh, what happens if node is null? that allowed?? */
+ node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+ }
+ if (prefs_common.open_unread_on_enter) {
+ summary_unlock(summaryview);
+ summary_select_node(summaryview, node, TRUE);
+ summary_lock(summaryview);
+ } else
+ summary_select_node(summaryview, node, FALSE);
}
summary_status_show(summaryview);
summaryview->sort_type = GTK_SORT_ASCENDING;
gtk_clist_clear(clist);
- optimal_width = gtk_clist_optimal_column_width(clist, S_COL_SUBJECT);
- gtk_clist_set_column_width(clist, S_COL_SUBJECT, optimal_width);
+ if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
+ optimal_width = gtk_clist_optimal_column_width
+ (clist, summaryview->col_pos[S_COL_SUBJECT]);
+ gtk_clist_set_column_width
+ (clist, summaryview->col_pos[S_COL_SUBJECT],
+ optimal_width);
+ }
gtk_clist_thaw(clist);
}
if (summaryview->folder_item->folder->type != F_NEWS) {
menu_set_sensitive(ifactory, "/Move...", TRUE);
menu_set_sensitive(ifactory, "/Copy...", TRUE);
- if (summaryview->folder_item->stype != F_TRASH)
- menu_set_sensitive(ifactory, "/Delete", TRUE);
+ menu_set_sensitive(ifactory, "/Delete", TRUE);
}
menu_set_sensitive(ifactory, "/Execute", TRUE);
return msginfo->msgnum;
}
+static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ if (current_node)
+ node = current_node;
+ else
+ node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (!MSG_IS_DELETED(msginfo->flags)) break;
+ }
+
+ return node;
+}
+
+static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ if (current_node)
+ node = current_node;
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (!MSG_IS_DELETED(msginfo->flags)) break;
+ }
+
+ return node;
+}
+
static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
GtkCTreeNode *current_node)
{
if (current_node)
node = current_node;
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
if (current_node)
node = GTK_CTREE_NODE_PREV(current_node);
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
if (current_node)
node = GTK_CTREE_NODE_PREV(current_node);
else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
main_window_cursor_normal(summaryview->mainwin);
}
+gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
+ GtkCTreeNode *cnode, gpointer data)
+{
+ SummaryView *summaryview = (SummaryView *)data;
+ MsgInfo *msginfo = (MsgInfo *)gnode->data;
+ gchar *text[N_SUMMARY_COLS];
+ gint *col_pos = summaryview->col_pos;
+ const gchar *msgid = msginfo->msgid;
+ GHashTable *msgid_table = summaryview->msgid_table;
+
+ summary_set_header(summaryview, text, msginfo);
+
+ gtk_ctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
+ NULL, NULL, NULL, NULL, FALSE,
+ gnode->parent->parent ? TRUE : FALSE);
+#define SET_TEXT(col) \
+ gtk_ctree_node_set_text(ctree, cnode, col_pos[col], \
+ text[col_pos[col]])
+
+ SET_TEXT(S_COL_NUMBER);
+ SET_TEXT(S_COL_SCORE);
+ SET_TEXT(S_COL_SIZE);
+ SET_TEXT(S_COL_DATE);
+ SET_TEXT(S_COL_FROM);
+ SET_TEXT(S_COL_SUBJECT);
+
+#undef SET_TEXT
+
+ GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
+ summary_set_marks_func(ctree, cnode, summaryview);
+
+ if (msgid)
+ g_hash_table_insert(msgid_table, (gchar *)msgid, cnode);
+
+ return TRUE;
+}
+
static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
gchar * subject)
{
MsgInfo *msginfo;
MsgInfo *parentinfo;
MsgInfo *cur_msginfo;
- GtkCTreeNode *node, *parent;
- gchar *text[N_SUMMARY_COLS];
+ GtkCTreeNode *node = NULL;
GHashTable *msgid_table;
GHashTable *subject_table;
GSList * cur;
}
if (summaryview->folder_item->threaded) {
- for (; mlist != NULL; mlist = mlist->next) {
- msginfo = (MsgInfo *)mlist->data;
- parent = NULL;
+ GNode *root, *gnode;
- summary_set_header(text, msginfo);
-
- /* search parent node for threading */
- if (msginfo->inreplyto && *msginfo->inreplyto) {
- parent = g_hash_table_lookup
- (msgid_table, msginfo->inreplyto);
- }
- 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(!MSG_IS_IGNORE_THREAD(msginfo->flags) && parentinfo && MSG_IS_IGNORE_THREAD(parentinfo->flags)) {
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
- }
- }
+ root = procmsg_get_thread_tree(mlist);
- node = gtk_ctree_insert_node
- (ctree, parent, NULL, text, 2,
- NULL, NULL, NULL, NULL, FALSE,
- parent ? TRUE : FALSE);
- GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
- summary_set_marks_func(ctree, node, summaryview);
-
- if (MSG_GET_COLORLABEL(msginfo->flags))
- summary_set_colorlabel_color(ctree, node, MSG_GET_COLORLABEL_VALUE(msginfo->flags));
-
- /* preserve previous node if the message is
- duplicated */
- if (msginfo->msgid && *msginfo->msgid &&
- g_hash_table_lookup(msgid_table, msginfo->msgid)
- == NULL)
- g_hash_table_insert(msgid_table,
- msginfo->msgid, node);
- if (msginfo->subject &&
- subject_table_lookup(subject_table,
- msginfo->subject) == NULL) {
- subject_table_insert(subject_table,
- msginfo->subject, node);
- }
-
- cur_parent = parent;
- cur_msginfo = msginfo;
- while (cur_parent != NULL) {
- parentinfo = gtk_ctree_node_get_row_data(ctree, cur_parent);
-
- if (!parentinfo)
- break;
-
- if (parentinfo->threadscore <
- cur_msginfo->threadscore) {
- gchar * s;
- parentinfo->threadscore =
- cur_msginfo->threadscore;
-#if 0
- s = itos(parentinfo->threadscore);
- gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
-#endif
- }
- else break;
-
- cur_msginfo = parentinfo;
- if (cur_msginfo->inreplyto &&
- *cur_msginfo->inreplyto) {
- cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
- }
- 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);
- }
- }
+ for (gnode = root->children; gnode != NULL;
+ gnode = gnode->next) {
+ node = gtk_ctree_insert_gnode
+ (ctree, NULL, node, gnode,
+ summary_insert_gnode_func, summaryview);
}
- /* complete the thread */
- summary_thread_build(summaryview, TRUE);
+ g_node_destroy(root);
+
+ summary_thread_init(summaryview);
} else {
+ gchar *text[N_SUMMARY_COLS];
+
+ mlist = g_slist_reverse(mlist);
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
- summary_set_header(text, msginfo);
+ summary_set_header(summaryview, text, msginfo);
node = gtk_ctree_insert_node
- (ctree, NULL, NULL, text, 2,
+ (ctree, NULL, node, text, 2,
NULL, NULL, NULL, NULL, FALSE, FALSE);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
- if ( MSG_GET_COLORLABEL(msginfo->flags) )
- summary_set_colorlabel_color(ctree, node, MSG_GET_COLORLABEL_VALUE(msginfo->flags));
-
- if (msginfo->msgid && *msginfo->msgid &&
- g_hash_table_lookup(msgid_table, msginfo->msgid)
- == NULL)
+ if (msginfo->msgid)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
-
- if (msginfo->subject &&
- subject_table_lookup(subject_table,
- msginfo->subject) == NULL)
- subject_table_insert(subject_table,
- msginfo->subject, node);
}
+ mlist = g_slist_reverse(mlist);
}
- if (prefs_common.enable_hscrollbar) {
+ if (prefs_common.enable_hscrollbar &&
+ summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
gint optimal_width;
optimal_width = gtk_clist_optimal_column_width
- (GTK_CLIST(ctree), S_COL_SUBJECT);
- gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SUBJECT,
+ (GTK_CLIST(ctree), summaryview->col_pos[S_COL_SUBJECT]);
+ gtk_clist_set_column_width(GTK_CLIST(ctree),
+ summaryview->col_pos[S_COL_SUBJECT],
optimal_width);
}
procmsg_write_flags(msginfo, fps->mark_fp);
}
-static void summary_set_header(gchar *text[], MsgInfo *msginfo)
+static void summary_set_header(SummaryView *summaryview, gchar *text[],
+ MsgInfo *msginfo)
{
static gchar date_modified[80];
static gchar *to = NULL;
static gchar *from_name = NULL;
static gchar col_number[11];
static gchar col_score[11];
+ 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_MIME]] = NULL;
+ text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
+ text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
- text[S_COL_MARK] = NULL;
- text[S_COL_UNREAD] = NULL;
- text[S_COL_MIME] = NULL;
- text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
- text[S_COL_SIZE] = to_human_readable(msginfo->size);
#if 0
- text[S_COL_SCORE] = itos_buf(col_score, msginfo->threadscore);
+ text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->threadscore);
#else
- text[S_COL_SCORE] = itos_buf(col_score, msginfo->score);
+ text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
#endif
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
sizeof(date_modified),
msginfo->date_t);
- text[S_COL_DATE] = date_modified;
+ text[col_pos[S_COL_DATE]] = date_modified;
} else if (msginfo->date)
- text[S_COL_DATE] = msginfo->date;
+ text[col_pos[S_COL_DATE]] = msginfo->date;
else
- text[S_COL_DATE] = _("(No Date)");
+ text[col_pos[S_COL_DATE]] = _("(No Date)");
text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
_("(No From)");
if (account_find_from_address(from)) {
g_free(to);
to = g_strconcat("-->", msginfo->to, NULL);
- text[S_COL_FROM] = to;
+ text[col_pos[S_COL_FROM]] = to;
}
}
}
}
- text[S_COL_SUBJECT] = msginfo->subject ? msginfo->subject :
+ text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
_("(No Subject)");
}
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
type, 0.0);
-
+
if (summaryview->msg_is_toggled_on)
summary_display_msg(summaryview, summaryview->selected, FALSE);
}
GtkStyle *style = NULL;
MsgInfo *msginfo;
MsgFlags flags;
+ gint *col_pos = summaryview->col_pos;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (!msginfo) return;
/* set new/unread column */
if (MSG_IS_IGNORE_THREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
ignorethreadxpm, ignorethreadxpmmask);
} else if (MSG_IS_NEW(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
newxpm, newxpmmask);
} else if (MSG_IS_UNREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
unreadxpm, unreadxpmmask);
} else if (MSG_IS_REPLIED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
repliedxpm, repliedxpmmask);
} else if (MSG_IS_FORWARDED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
forwardedxpm, forwardedxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, S_COL_UNREAD, NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+ NULL);
}
if (prefs_common.bold_unread &&
/* set mark column */
if (MSG_IS_DELETED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_MARK,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
deletedxpm, deletedxpmmask);
if (style)
style = bold_deleted_style;
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_dim);
} else if (MSG_IS_MARKED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_MARK,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
markxpm, markxpmmask);
} else if (MSG_IS_MOVE(flags)) {
- gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "o");
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "o");
if (style)
style = bold_marked_style;
else {
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_marked);
} else if (MSG_IS_COPY(flags)) {
- gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "O");
- if (style)
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "O");
+ if (style)
style = bold_marked_style;
else {
style = small_marked_style;
gtk_ctree_node_set_foreground(ctree, row,
&summaryview->color_important);
} else {
- gtk_ctree_node_set_text(ctree, row, S_COL_MARK, NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
}
if (MSG_IS_MIME(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_MIME,
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, S_COL_MIME, NULL);
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
}
if (!style)
style = small_style;
CHANGE_FLAGS(msginfo);
summaryview->deleted++;
- if (!prefs_common.immediate_exec)
+ if (!prefs_common.immediate_exec &&
+ summaryview->folder_item->stype != F_TRASH)
summary_set_row_marks(summaryview, row);
debug_print(_("Message %s/%d is set to delete\n"),
void summary_delete(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ FolderItem *item = summaryview->folder_item;
GList *cur;
+ GtkCTreeNode *sel_last = NULL;
+ GtkCTreeNode *node;
- if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ if (!item || item->folder->type == F_NEWS) return;
if (summary_is_locked(summaryview)) return;
- /* if current folder is trash, don't delete */
- if (summaryview->folder_item->stype == F_TRASH) {
- alertpanel_notice(_("Current folder is Trash."));
- return;
+ /* if current folder is trash, ask for confirmation */
+ if (item->stype == F_TRASH) {
+ AlertValue aval;
+
+ aval = alertpanel(_("Delete message(s)"),
+ _("Do you really want to delete message(s) from the trash?"),
+ _("Yes"), _("No"), NULL);
+ if (aval != G_ALERTDEFAULT) return;
}
- for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
- summary_delete_row(summaryview, GTK_CTREE_NODE(cur->data));
+ /* next code sets current row focus right. We need to find a row
+ * that is not deleted. */
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+ sel_last = GTK_CTREE_NODE(cur->data);
+ summary_delete_row(summaryview, sel_last);
+ }
- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+ node = summary_find_next_msg(summaryview, sel_last);
+ if (!node)
+ node = summary_find_prev_msg(summaryview, sel_last);
+ if (node == gtkut_ctree_node_next(ctree, sel_last))
+ summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
+ else if (node == GTK_CTREE_NODE_PREV(sel_last))
+ summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
+ else
+ summary_select_node
+ (summaryview, node,
+ summaryview->msg_is_toggled_on);
- if (prefs_common.immediate_exec)
+ if (prefs_common.immediate_exec || item->stype == F_TRASH)
summary_execute(summaryview);
else
summary_status_show(summaryview);
}
if (summaryview->folder_item->threaded)
- summary_thread_build(summaryview, FALSE);
+ summary_thread_build(summaryview);
summaryview->selected = clist->selection ?
GTK_CTREE_NODE(clist->selection->data) : NULL;
if (summaryview->folder_item->folder->type == F_MH) {
g_return_if_fail(trash != NULL);
}
- if (summaryview->folder_item == trash) return;
/* search deleting messages and execute */
gtk_ctree_pre_recursive
if (!summaryview->mlist) return;
- for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo = cur->data;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- }
-
- folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+ if (summaryview->folder_item != trash)
+ folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+ else
+ folder_item_remove_msgs(trash, summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
- folder_item_scan(trash);
- folderview_update_item(trash, FALSE);
+ if (summaryview->folder_item != trash) {
+ folder_item_scan(trash);
+ folderview_update_item(trash, FALSE);
+ }
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
/* thread functions */
-void summary_thread_build(SummaryView *summaryview, gboolean init)
+void summary_thread_build(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- /* for optimization */
- if (init) {
- if (prefs_common.expand_thread) {
- while (node) {
- next = GTK_CTREE_ROW(node)->sibling;
- if (GTK_CTREE_ROW(node)->children)
- gtk_ctree_expand(ctree, node);
- node = next;
- }
- } else if (prefs_common.bold_unread) {
- while (node) {
- next = GTK_CTREE_ROW(node)->sibling;
- if (GTK_CTREE_ROW(node)->children)
- summary_set_row_marks
- (summaryview, node);
- node = next;
- }
- }
- } else {
- while (node) {
- next = GTK_CTREE_NODE_NEXT(node);
- if (prefs_common.expand_thread)
- gtk_ctree_expand(ctree, node);
- if (prefs_common.bold_unread &&
- GTK_CTREE_ROW(node)->children)
- summary_set_row_marks(summaryview, node);
- node = next;
- }
+ while (node) {
+ next = GTK_CTREE_NODE_NEXT(node);
+ if (prefs_common.expand_thread)
+ gtk_ctree_expand(ctree, node);
+ if (prefs_common.bold_unread &&
+ GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
}
gtk_clist_thaw(GTK_CLIST(ctree));
summary_unlock(summaryview);
}
+static void summary_thread_init(SummaryView *summaryview)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ GtkCTreeNode *next;
+
+ if (prefs_common.expand_thread) {
+ while (node) {
+ next = GTK_CTREE_ROW(node)->sibling;
+ if (GTK_CTREE_ROW(node)->children)
+ gtk_ctree_expand(ctree, node);
+ node = next;
+ }
+ } else if (prefs_common.bold_unread) {
+ while (node) {
+ next = GTK_CTREE_ROW(node)->sibling;
+ if (GTK_CTREE_ROW(node)->children)
+ summary_set_row_marks(summaryview, node);
+ node = next;
+ }
+ }
+}
+
void summary_unthread(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
summaryview);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
- if (prefs_common.immediate_exec)
+
+ if (prefs_common.immediate_exec) {
+ summary_unlock(summaryview);
summary_execute(summaryview);
- else
+ summary_lock(summaryview);
+ } else
summary_status_show(summaryview);
}
else {
GtkCTreeNode *node;
FolderItem *to_folder;
+ if (summary_is_locked(summaryview)) return;
if (!event) return;
switch (event->keyval) {
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- switch (column) {
+ switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
static void summary_col_resized(GtkCList *clist, gint column, gint width,
SummaryView *summaryview)
{
- switch (column) {
+ switch (summaryview->col_state[column].type) {
case S_COL_MARK:
prefs_common.summary_col_mark = width;
break;
break;
case COMPOSE_REPLY_TO_ALL:
compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE);
+ TRUE, TRUE);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
compose_reply(msginfo, TRUE, TRUE, FALSE);
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
- gtk_clist_set_column_visibility(clist, S_COL_MARK, prefs_common.show_mark);
- gtk_clist_set_column_visibility(clist, S_COL_UNREAD, prefs_common.show_unread);
- gtk_clist_set_column_visibility(clist, S_COL_MIME, prefs_common.show_mime);
- gtk_clist_set_column_visibility(clist, S_COL_NUMBER, prefs_common.show_number);
- gtk_clist_set_column_visibility(clist, S_COL_SCORE, prefs_common.show_score);
- gtk_clist_set_column_visibility(clist, S_COL_SIZE, prefs_common.show_size);
- gtk_clist_set_column_visibility(clist, S_COL_DATE, prefs_common.show_date);
- gtk_clist_set_column_visibility(clist, S_COL_FROM, prefs_common.show_from);
- gtk_clist_set_column_visibility(clist, S_COL_SUBJECT, prefs_common.show_subject);
+#define SET_VISIBLE(col, visible) \
+ gtk_clist_set_column_visibility(clist, summaryview->col_pos[col], \
+ prefs_common.visible)
+
+ SET_VISIBLE(S_COL_MARK , show_mark);
+ SET_VISIBLE(S_COL_UNREAD , show_unread);
+ SET_VISIBLE(S_COL_MIME , show_mime);
+ SET_VISIBLE(S_COL_NUMBER , show_number);
+ SET_VISIBLE(S_COL_SCORE , show_score);
+ SET_VISIBLE(S_COL_SIZE , show_size);
+ SET_VISIBLE(S_COL_DATE , show_date);
+ SET_VISIBLE(S_COL_FROM , show_from);
+ SET_VISIBLE(S_COL_SUBJECT, show_subject);
+
+#undef SET_VISIBLE
}
static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
projects / claws.git / blobdiff