#include "filter.h"
#include "folder.h"
#include "colorlabel.h"
+#include "inc.h"
#include "addressbook.h"
#include "addr_compl.h"
#include "scoring.h"
gpointer data);
static void summary_set_menu_sensitive (SummaryView *summaryview);
-static void summary_set_add_sender_menu (SummaryView *summaryview);
-
-static void summary_select_node (SummaryView *summaryview,
- GtkCTreeNode *node,
- gboolean display_msg);
static guint summary_get_msgnum (SummaryView *summaryview,
GtkCTreeNode *node);
-static GtkCTreeNode *summary_find_next_unread_msg
+static GtkCTreeNode *summary_find_prev_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_marked_msg
+static GtkCTreeNode *summary_find_next_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_prev_unread_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_next_unread_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
static GtkCTreeNode *summary_find_prev_marked_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_labeled_msg
+static GtkCTreeNode *summary_find_next_marked_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
static GtkCTreeNode *summary_find_prev_labeled_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_next_labeled_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
static GtkCTreeNode *summary_find_msg_by_msgnum
(SummaryView *summaryview,
guint msgnum);
-#if 0
-static GtkCTreeNode *summary_find_prev_unread_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-#endif
static void summary_update_status (SummaryView *summaryview);
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);
static void summary_reply_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_execute_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
static void summary_show_all_header_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_add_address_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
+
+static void summary_mark_clicked (GtkWidget *button,
+ SummaryView *summaryview);
+static void summary_unread_clicked (GtkWidget *button,
+ SummaryView *summaryview);
+static void summary_mime_clicked (GtkWidget *button,
+ SummaryView *summaryview);
static void summary_num_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_score_clicked (GtkWidget *button,
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,
/* custom compare functions for sorting */
+static gint summary_cmp_by_mark (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
+static gint summary_cmp_by_unread (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
+static gint summary_cmp_by_mime (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static gint summary_cmp_by_num (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static GtkItemFactoryEntry summary_popup_entries[] =
{
+ {N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+ {N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+ {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+ {N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/Forward as a_ttachment"),
+ NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), NULL, summary_move_to, 0, NULL},
{N_("/_Copy..."), NULL, summary_copy_to, 0, NULL},
{N_("/_Delete"), NULL, summary_delete, 0, NULL},
- {N_("/E_xecute"), NULL, summary_execute, 0, NULL},
+ {N_("/E_xecute"), NULL, summary_execute_cb, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
{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},
-#if MARK_ALL_READ
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
-#endif
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unignore thread"), NULL, summary_unignore_thread, 0, NULL},
+ {N_("/Color la_bel"), NULL, NULL, 0, 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_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
- {N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
- {N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
- {N_("/Forward as a_ttachment"),
- NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+ {N_("/Add sender to address boo_k"),
+ NULL, summary_add_address_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Add sender to address _book"),
- NULL, NULL, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Open in new _window"), NULL, summary_open_msg, 0, NULL},
- {N_("/View so_urce"), NULL, summary_view_source, 0, NULL},
- {N_("/Show all _header"), NULL, summary_show_all_header_cb, 0, NULL},
- {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
+ {N_("/_View"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Open in new _window"),
+ NULL, summary_open_msg, 0, NULL},
+ {N_("/_View/_Source"), NULL, summary_view_source, 0, NULL},
+ {N_("/_View/All _header"), NULL, summary_show_all_header_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Save as..."), NULL, summary_save_as, 0, NULL},
{N_("/_Print..."), NULL, summary_print, 0, NULL},
{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),
GTK_CAN_FOCUS);
/* connect signal to the buttons for sorting */
- gtk_signal_connect
- (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_NUMBER].button),
- "clicked",
- GTK_SIGNAL_FUNC(summary_num_clicked),
- summaryview);
- gtk_signal_connect
- (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SCORE].button),
- "clicked",
- GTK_SIGNAL_FUNC(summary_score_clicked),
- summaryview);
- gtk_signal_connect
- (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SIZE].button),
- "clicked",
- GTK_SIGNAL_FUNC(summary_size_clicked),
- summaryview);
- gtk_signal_connect
- (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_DATE].button),
- "clicked",
- GTK_SIGNAL_FUNC(summary_date_clicked),
- summaryview);
- gtk_signal_connect
- (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_FROM].button),
- "clicked",
- GTK_SIGNAL_FUNC(summary_from_clicked),
- summaryview);
- gtk_signal_connect
- (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SUBJECT].button),
- "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);
+#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
+ gtk_signal_connect \
+ (GTK_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
+ "clicked", \
+ GTK_SIGNAL_FUNC(func), \
+ 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_MIME , summary_mime_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE , summary_score_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE , summary_size_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_DATE , summary_date_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM , summary_from_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked);
+
+#undef CLIST_BUTTON_SIGNAL_CONNECT
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
summaryview->msg_is_toggled_on = TRUE;
+ summaryview->lock_count = 0;
summaryview->sort_mode = SORT_BY_NONE;
summaryview->sort_type = GTK_SORT_ASCENDING;
ignorethread_xpm);
PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
- DIRECTORY_OPEN_XPM);
+ dir_open_xpm);
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) {
gint sort_type;
static gboolean locked = FALSE;
- if (locked)
- return FALSE;
- locked = TRUE;
+ if (summary_is_locked(summaryview)) return FALSE;
+
+ inc_lock();
+ summary_lock(summaryview);
STATUSBAR_POP(summaryview->mainwin);
is_refresh = (!prefs_common.open_inbox_on_inc &&
- item == summaryview->folder_item) ? TRUE : FALSE;
+ item == summaryview->folder_item &&
+ update_cache == FALSE) ? TRUE : FALSE;
if (is_refresh) {
selected_msgnum = summary_get_msgnum(summaryview,
summaryview->selected);
else if (G_ALERTALTERNATE == val)
summary_write_cache(summaryview);
else {
- locked = FALSE;
- return FALSE;
+ summary_unlock(summaryview);
+ inc_unlock();
+ return FALSE;
}
folder_update_op_count();
}
summary_clear_all(summaryview);
summaryview->folder_item = item;
gtk_clist_thaw(GTK_CLIST(ctree));
- locked = FALSE;
+ summary_unlock(summaryview);
+ inc_unlock();
return TRUE;
}
g_free(buf);
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);
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
main_window_cursor_normal(summaryview->mainwin);
- locked = FALSE;
+ summary_unlock(summaryview);
+ inc_unlock();
return TRUE;
}
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);
}
summary_status_show(summaryview);
}
+void summary_lock(SummaryView *summaryview)
+{
+ summaryview->lock_count++;
+}
+
+void summary_unlock(SummaryView *summaryview)
+{
+ if (summaryview->lock_count)
+ summaryview->lock_count--;
+}
+
+gboolean summary_is_locked(SummaryView *summaryview)
+{
+ return summaryview->lock_count > 0;
+}
+
SummarySelection summary_get_selection_type(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
}
if (summaryview->folder_item->folder->type != F_NEWS) {
- if (summaryview->folder_item->stype != F_TRASH)
- menu_set_sensitive(ifactory, "/Delete", TRUE);
menu_set_sensitive(ifactory, "/Move...", TRUE);
menu_set_sensitive(ifactory, "/Copy...", TRUE);
+ menu_set_sensitive(ifactory, "/Delete", TRUE);
}
- gtk_widget_set_sensitive(summaryview->colorlabel_menu_item, TRUE);
menu_set_sensitive(ifactory, "/Execute", TRUE);
+ menu_set_sensitive(ifactory, "/Mark", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Mark", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
+
+ menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
+ menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
+
+ menu_set_sensitive(ifactory, "/Color label", TRUE);
+
sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
menu_set_sensitive(ifactory, "/Reply", sens);
menu_set_sensitive(ifactory, "/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
menu_set_sensitive(ifactory, "/Forward", TRUE);
menu_set_sensitive(ifactory, "/Forward as attachment", TRUE);
-
- menu_set_sensitive(ifactory, "/Open in new window", sens);
- menu_set_sensitive(ifactory, "/View source", sens);
- menu_set_sensitive(ifactory, "/Show all header", sens);
+
+ menu_set_sensitive(ifactory, "/Add sender to address book", sens);
+
+ menu_set_sensitive(ifactory, "/View", sens);
+ menu_set_sensitive(ifactory, "/View/Open in new window", sens);
+ menu_set_sensitive(ifactory, "/View/Source", sens);
+ menu_set_sensitive(ifactory, "/View/All header", sens);
if ((summaryview->folder_item->stype == F_DRAFT) ||
(summaryview->folder_item->stype == F_OUTBOX) ||
(summaryview->folder_item->stype == F_QUEUE))
menu_set_sensitive(ifactory, "/Save as...", sens);
menu_set_sensitive(ifactory, "/Print...", TRUE);
- menu_set_sensitive(ifactory, "/Mark", TRUE);
-
- menu_set_sensitive(ifactory, "/Mark/Mark", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
-
- menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
-#if MARK_ALL_READ
- menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
-#endif
- menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
-
menu_set_sensitive(ifactory, "/Select all", TRUE);
if (summaryview->folder_item->folder->account)
menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
}
-static void summary_set_add_sender_menu(SummaryView *summaryview)
+void summary_select_prev_unread(SummaryView *summaryview)
{
- GtkWidget *menu;
- GtkWidget *submenu;
- MsgInfo *msginfo;
- gchar *from;
+ GtkCTreeNode *node;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- menu = gtk_item_factory_get_item(summaryview->popupfactory,
- "/Add sender to address book");
- msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
- summaryview->selected);
- if (!msginfo || !msginfo->from) {
- gtk_widget_set_sensitive(menu, FALSE);
- submenu = gtk_menu_new();
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
- return;
- }
+ node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
- gtk_widget_set_sensitive(menu, TRUE);
- Xstrdup_a(from, msginfo->from, return);
- eliminate_address_comment(from);
- extract_address(from);
- addressbook_add_submenu(menu, msginfo->fromname, from, NULL);
+ if (!node) {
+ AlertValue val;
+
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more unread messages"),
+ _("No unread message found. "
+ "Search from the end?"),
+ _("Yes"), _("No"), NULL);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ val = G_ALERTDEFAULT;
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ val = !G_ALERTDEFAULT;
+ break;
+ default:
+ debug_print(
+ _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+ }
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_prev_unread_msg(summaryview, NULL);
+ }
+ if (!node) {
+ alertpanel_notice(_("No unread messages."));
+ } else {
+ gtkut_ctree_expand_parent_all(ctree, node);
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ if (summaryview->displayed == node)
+ summaryview->displayed = NULL;
+ summary_display_msg(summaryview, node, FALSE);
+ }
}
void summary_select_next_unread(SummaryView *summaryview)
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- node = summary_find_next_unread_msg(summaryview,
- summaryview->selected);
+ node = summary_find_next_unread_msg(summaryview, summaryview->selected);
if (node) {
gtkut_ctree_expand_parent_all(ctree, node);
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
-
- /* 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);
} else {
AlertValue val;
- val = alertpanel(_("No unread message"),
- _("No unread message found. Go to next folder?"),
- _("Yes"), _("No"), NULL);
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more unread messages"),
+ _("No unread message found. "
+ "Go to next folder?"),
+ _("Yes"), _("No"), NULL);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ val = G_ALERTDEFAULT;
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ val = !G_ALERTDEFAULT;
+ break;
+ default:
+ debug_print(
+ _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+ }
+
if (val == G_ALERTDEFAULT) {
if (gtk_signal_n_emissions_by_name
(GTK_OBJECT(ctree), "key_press_event") > 0)
}
}
-void summary_select_next_marked(SummaryView *summaryview)
+void summary_select_prev_marked(SummaryView *summaryview)
{
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- node = summary_find_next_marked_msg(summaryview,
- summaryview->selected);
+ node = summary_find_prev_marked_msg(summaryview, summaryview->selected);
if (!node) {
AlertValue val;
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
- "Search from the beginning?"),
+ "Search from the end?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_next_marked_msg(summaryview,
- NULL);
+ node = summary_find_prev_marked_msg(summaryview, NULL);
}
+
if (!node) {
alertpanel_notice(_("No marked messages."));
} else {
+ gtkut_ctree_expand_parent_all(ctree, node);
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
}
}
-void summary_select_prev_marked(SummaryView *summaryview)
+void summary_select_next_marked(SummaryView *summaryview)
{
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- node = summary_find_prev_marked_msg(summaryview,
- summaryview->selected);
+ node = summary_find_next_marked_msg(summaryview, summaryview->selected);
if (!node) {
AlertValue val;
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
- "Search from the end?"),
+ "Search from the beginning?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_marked_msg(summaryview,
- NULL);
+ node = summary_find_next_marked_msg(summaryview, NULL);
}
+
if (!node) {
alertpanel_notice(_("No marked messages."));
} else {
+ gtkut_ctree_expand_parent_all(ctree, node);
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
}
}
-void summary_select_next_labeled(SummaryView *summaryview)
+void summary_select_prev_labeled(SummaryView *summaryview)
{
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- node = summary_find_next_labeled_msg(summaryview,
- summaryview->selected);
+ node = summary_find_prev_labeled_msg(summaryview, summaryview->selected);
if (!node) {
AlertValue val;
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
- "Search from the beginning?"),
+ "Search from the end?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_next_labeled_msg(summaryview,
- NULL);
+ node = summary_find_prev_labeled_msg(summaryview, NULL);
}
+
if (!node) {
alertpanel_notice(_("No labeled messages."));
} else {
+ gtkut_ctree_expand_parent_all(ctree, node);
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
}
}
-void summary_select_prev_labeled(SummaryView *summaryview)
+void summary_select_next_labeled(SummaryView *summaryview)
{
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- node = summary_find_prev_labeled_msg(summaryview,
- summaryview->selected);
+ node = summary_find_next_labeled_msg(summaryview, summaryview->selected);
if (!node) {
AlertValue val;
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
- "Search from the end?"),
+ "Search from the beginning?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_labeled_msg(summaryview,
- NULL);
+ node = summary_find_next_labeled_msg(summaryview, NULL);
}
+
if (!node) {
alertpanel_notice(_("No labeled messages."));
} else {
+ gtkut_ctree_expand_parent_all(ctree, node);
gtk_sctree_unselect_all(GTK_SCTREE(ctree));
gtk_sctree_select(GTK_SCTREE(ctree), node);
if (summaryview->displayed == node)
* thread, if necessary) and unselect all others. If @display_msg is
* TRUE, display the corresponding message in the message view.
**/
-static void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
- gboolean display_msg)
+void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
+ gboolean display_msg)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
return msginfo->msgnum;
}
-static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+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;
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)
+{
+ 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_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
}
return node;
}
-static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
+static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
GtkCTreeNode *current_node)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
if (current_node)
- node = GTK_CTREE_NODE_NEXT(current_node);
+ node = current_node;
else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+ for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_MARKED(msginfo->flags)) break;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
}
return 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);
return node;
}
-static GtkCTreeNode *summary_find_next_labeled_msg(SummaryView *summaryview,
+static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
GtkCTreeNode *current_node)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
if (current_node)
- node = GTK_CTREE_NODE_NEXT(current_node);
+ node = gtkut_ctree_node_next(ctree, current_node);
else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+ for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+ if (MSG_IS_MARKED(msginfo->flags)) break;
}
return node;
}
static GtkCTreeNode *summary_find_prev_labeled_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+ GtkCTreeNode *current_node)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *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 (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+ if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
}
return node;
}
-static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
- guint msgnum)
+static GtkCTreeNode *summary_find_next_labeled_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
MsgInfo *msginfo;
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ if (current_node)
+ node = gtkut_ctree_node_next(ctree, 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 (msginfo->msgnum == msgnum) break;
+ if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
}
return node;
}
-#if 0
-static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
+ guint msgnum)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
MsgInfo *msginfo;
- if (current_node)
- node = current_node;
- /*node = GTK_CTREE_NODE_PREV(current_node);*/
- else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+ for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_UNREAD(msginfo->flags)) break;
+ if (msginfo->msgnum == msgnum) break;
}
return node;
}
-#endif
static guint attract_hash_func(gconstpointer key)
{
return;
switch (type) {
+ case SORT_BY_MARK:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
+ break;
+ case SORT_BY_UNREAD:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+ break;
+ case SORT_BY_MIME:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
+ break;
case SORT_BY_NUMBER:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
break;
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 (prefs_common.use_addr_book)
start_address_completion();
- /*main_window_set_thread_option(summaryview->mainwin)*/;
-
for (cur = mlist ; cur != NULL; cur = cur->next) {
msginfo = (MsgInfo *)cur->data;
msginfo->threadscore = msginfo->score;
summaryview->folder_item->prefs->important_score;
}
- if (prefs_common.enable_thread) {
- /*if (summaryview->folder_item->prefs->enable_thread) { */
- for (; mlist != NULL; mlist = mlist->next) {
- msginfo = (MsgInfo *)mlist->data;
- parent = NULL;
-
- summary_set_header(text, msginfo);
+ if (summaryview->folder_item->threaded) {
+ GNode *root, *gnode;
- /* 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)");
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
gchar *filename;
- static gboolean lock = FALSE;
if (!new_window && summaryview->displayed == row) return;
g_return_if_fail(row != NULL);
- if (lock) return;
- lock = TRUE;
+ if (summary_is_locked(summaryview)) return;
+ summary_lock(summaryview);
STATUSBAR_POP(summaryview->mainwin);
GTK_EVENTS_FLUSH();
filename = procmsg_get_message_file(msginfo);
if (!filename) {
- lock = FALSE;
+ summary_unlock(summaryview);
return;
}
g_free(filename);
if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
header_window_show(summaryview->headerwin, msginfo);
- lock = FALSE;
+ summary_unlock(summaryview);
}
void summary_redisplay_msg(SummaryView *summaryview)
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);
}
if (node) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo && MSG_IS_UNREAD(msginfo->flags))
+ if (msginfo && MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
return TRUE;
node = GTK_CTREE_ROW(node)->children;
} else
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 &&
- (MSG_IS_UNREAD(flags) ||
+ ((MSG_IS_UNREAD(flags) && !MSG_IS_IGNORE_THREAD(flags)) ||
(!GTK_CTREE_ROW(row)->expanded &&
GTK_CTREE_ROW(row)->children &&
summary_have_unread_children(summaryview, row))))
/* 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;
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- msginfo->to_folder = NULL;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
summary_status_show(summaryview);
}
-#if MARK_ALL_READ
-static void summary_mark_all_read(SummaryView *summaryview)
+void summary_mark_all_read(SummaryView *summaryview)
{
- summary_select_all(summaryview);
- summary_mark_as_read(summaryview);
- summary_unselect_all(summaryview);
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCList *clist = GTK_CLIST(summaryview->ctree);
+ GtkCTreeNode *node;
+
+ gtk_clist_freeze(clist);
+ 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);
+ for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+ node = gtkut_ctree_node_next(ctree, node)) {
+ if (!GTK_CTREE_ROW(node)->expanded)
+ summary_set_row_marks(summaryview, node);
+ }
+ gtk_clist_thaw(clist);
+
+ summary_status_show(summaryview);
}
-#endif
static void summary_mark_row_as_unread(SummaryView *summaryview,
GtkCTreeNode *row)
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
if (!MSG_IS_UNREAD(msginfo->flags)) {
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
- gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
- unreadxpm, unreadxpmmask);
summaryview->unread++;
debug_print(_("Message %d is marked as unread\n"),
msginfo->msgnum);
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 current folder is trash, don't delete */
- if (summaryview->folder_item->stype == F_TRASH) {
- alertpanel_notice(_("Current folder is Trash."));
- return;
+ if (summary_is_locked(summaryview)) 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);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- msginfo->to_folder = NULL;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
if (!to_folder) return;
if (!summaryview->folder_item ||
summaryview->folder_item->folder->type == F_NEWS) return;
+
+ if (summary_is_locked(summaryview)) return;
+
if (summaryview->folder_item == to_folder) {
alertpanel_notice(_("Destination is same as current folder."));
return;
if (!to_folder) return;
if (!summaryview->folder_item ||
summaryview->folder_item->folder->type == F_NEWS) return;
+
+ if (summary_is_locked(summaryview)) return;
+
if (summaryview->folder_item == to_folder) {
alertpanel_notice
(_("Destination to copy is same as current folder."));
summary_copy_selected_to(summaryview, to_folder);
}
+void summary_add_address(SummaryView *summaryview)
+{
+ MsgInfo *msginfo;
+ gchar *from;
+
+ msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ summaryview->selected);
+ if (!msginfo) return;
+
+ Xstrdup_a(from, msginfo->from, return);
+ eliminate_address_comment(from);
+ extract_address(from);
+ addressbook_add_contact(msginfo->fromname, from, NULL);
+}
+
void summary_select_all(SummaryView *summaryview)
{
if (summaryview->messages >= 500) {
g_free(cmdline);
}
-void summary_execute(SummaryView *summaryview)
+gboolean summary_execute(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
if (!summaryview->folder_item ||
- summaryview->folder_item->folder->type == F_NEWS) return;
+ summaryview->folder_item->folder->type == F_NEWS) return FALSE;
+
+ if (summary_is_locked(summaryview)) return FALSE;
+ summary_lock(summaryview);
gtk_clist_freeze(clist);
- /*if (summaryview->folder_item->prefs->enable_thread) */
- if (prefs_common.enable_thread)
+ if (summaryview->folder_item->threaded)
summary_unthread_for_exec(summaryview);
summary_execute_move(summaryview);
node = next;
}
- /*if (summaryview->folder_item->prefs->enable_thread) */
- if (prefs_common.enable_thread)
- summary_thread_build(summaryview, FALSE);
+ if (summaryview->folder_item->threaded)
+ summary_thread_build(summaryview);
summaryview->selected = clist->selection ?
GTK_CTREE_NODE(clist->selection->data) : NULL;
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
gtk_clist_thaw(clist);
+
+ summary_unlock(summaryview);
+ return TRUE;
}
static void summary_execute_move(SummaryView *summaryview)
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;
GtkCTreeNode *parent;
MsgInfo *msginfo;
+ summary_lock(summaryview);
+
debug_print(_("Building threads..."));
STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
main_window_cursor_wait(summaryview->mainwin);
next = GTK_CTREE_ROW(node)->sibling;
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
+
+ /* alfons - claws seems to prefer subject threading before
+ * inreplyto threading. we should look more deeply in this,
+ * because inreplyto should have precedence... */
if (msginfo && msginfo->inreplyto) {
parent = g_hash_table_lookup(summaryview->msgid_table,
msginfo->inreplyto);
gtk_ctree_expand(ctree, node);
}
}
+ else if (msginfo && msginfo->subject) {
+ parent = g_hash_table_lookup
+ (summaryview->subject_table, msginfo->subject);
+ if (parent && parent != node) {
+ gtk_ctree_move(ctree, node, parent, NULL);
+ gtk_ctree_expand(ctree, node);
+ }
+ }
node = next;
}
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));
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+
+ 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)
GtkCTreeNode *sibling;
GtkCTreeNode *next_child;
+ summary_lock(summaryview);
+
debug_print(_("Unthreading..."));
STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
main_window_cursor_wait(summaryview->mainwin);
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+
+ summary_unlock(summaryview);
}
static void summary_unthread_for_exec(SummaryView *summaryview)
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ summary_lock(summaryview);
+
debug_print(_("Unthreading for execution..."));
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_thaw(GTK_CLIST(ctree));
debug_print(_("done.\n"));
+
+ summary_unlock(summaryview);
}
static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
{
if (!prefs_common.fltlist) return;
+ summary_lock(summaryview);
+
debug_print(_("filtering..."));
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
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 {
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+
+ summary_unlock(summaryview);
}
static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
/* color label */
-#define LABEL_COLORS_ELEMS colorlabel_get_color_count()
+#define N_COLOR_LABELS colorlabel_get_color_count()
static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
gpointer data)
MsgInfo *msginfo;
gint color_index;
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_CLABEL_FLAG_MASK);
+ MSG_SET_COLORLABEL_VALUE(msginfo->flags, labelcolor);
+
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
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);
-
- if (color_index < 0 || color_index >= LABEL_COLORS_ELEMS) {
- color_index = 0;
- 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;
+ if (color_index < 0 || color_index >= N_COLOR_LABELS) {
+ if (!prev_style) return;
+ style = gtk_style_copy(prev_style);
+ color = ctree_style->fg[GTK_STATE_NORMAL];
+ style->fg[GTK_STATE_NORMAL] = color;
+ color = ctree_style->fg[GTK_STATE_SELECTED];
style->fg[GTK_STATE_SELECTED] = color;
- gtk_ctree_node_set_row_style(ctree, node, style);
- } else
+ } else {
+ if (prev_style)
+ style = gtk_style_copy(prev_style);
+ else
+ style = gtk_style_copy(ctree_style);
color = colorlabel_get_color(color_index);
-
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
-
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_CLABEL_FLAG_MASK);
- MSG_SET_COLORLABEL_VALUE(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);
+ /* get the average of label color and selected fg color
+ for visibility */
+ style->fg[GTK_STATE_SELECTED].red = (color.red + ctree_style->fg[GTK_STATE_SELECTED].red ) / 2;
+ style->fg[GTK_STATE_SELECTED].green = (color.green + ctree_style->fg[GTK_STATE_SELECTED].green) / 2;
+ style->fg[GTK_STATE_SELECTED].blue = (color.blue + ctree_style->fg[GTK_STATE_SELECTED].blue ) / 2;
}
+
+ gtk_ctree_node_set_row_style(ctree, node, style);
}
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
labelcolor);
}
-static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *label_menu_item,
+static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
gpointer data)
{
SummaryView *summaryview;
- GtkMenuShell *label_menu;
+ GtkMenuShell *menu;
GtkCheckMenuItem **items;
gint n;
GList *cur, *sel;
sel = GTK_CLIST(summaryview->ctree)->selection;
if (!sel) return;
- label_menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
- g_return_if_fail(label_menu != NULL);
+ menu = GTK_MENU_SHELL(summaryview->colorlabel_menu);
+ g_return_if_fail(menu != NULL);
- Xalloca(items, (LABEL_COLORS_ELEMS + 1) * sizeof(GtkWidget *), return);
+ Xalloca(items, (N_COLOR_LABELS + 1) * sizeof(GtkWidget *), return);
/* NOTE: don't return prematurely because we set the "dont_toggle"
* state for check menu items */
- gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle",
+ gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
GINT_TO_POINTER(1));
/* clear items. get item pointers. */
- for (n = 0, cur = label_menu->children; cur != NULL; cur = cur->next) {
+ for (n = 0, cur = menu->children; cur != NULL; cur = cur->next) {
if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
gtk_check_menu_item_set_state
(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
}
}
- if (n == (LABEL_COLORS_ELEMS + 1)) {
+ if (n == (N_COLOR_LABELS + 1)) {
/* iterate all messages and set the state of the appropriate
* items */
for (; sel != NULL; sel = sel->next) {
MsgInfo *msginfo;
- gint menu_item;
+ gint clabel;
msginfo = gtk_ctree_node_get_row_data
(GTK_CTREE(summaryview->ctree),
GTK_CTREE_NODE(sel->data));
if (msginfo) {
- menu_item = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
- if (!items[menu_item]->active)
+ clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
+ if (!items[clabel]->active)
gtk_check_menu_item_set_state
- (items[menu_item], TRUE);
+ (items[clabel], TRUE);
}
}
} else
g_warning("invalid number of color elements (%d)\n", n);
/* reset "dont_toggle" state */
- gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle",
+ gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
GINT_TO_POINTER(0));
}
static void summary_colorlabel_menu_create(SummaryView *summaryview)
{
- const gint LABEL_MENU_POS = 5;
- GtkWidget *label_menu_item;
- GtkWidget *label_menu;
+ GtkWidget *label_menuitem;
+ GtkWidget *menu;
GtkWidget *item;
gint i;
- label_menu_item = gtk_menu_item_new_with_label(_("Color label"));
- gtk_menu_insert(GTK_MENU(summaryview->popupmenu), label_menu_item,
- LABEL_MENU_POS);
- gtk_signal_connect(GTK_OBJECT(label_menu_item), "activate",
+ label_menuitem = gtk_item_factory_get_item(summaryview->popupfactory,
+ "/Color label");
+ gtk_signal_connect(GTK_OBJECT(label_menuitem), "activate",
GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_item_cb),
summaryview);
+ gtk_widget_show(label_menuitem);
- gtk_widget_show(label_menu_item);
- summaryview->colorlabel_menu_item = label_menu_item;
-
- label_menu = gtk_menu_new();
+ menu = gtk_menu_new();
/* create sub items. for the menu item activation callback we pass the
* index of label_colors[] as data parameter. for the None color we
* can always get back the SummaryView pointer. */
item = gtk_check_menu_item_new_with_label(_("None"));
- gtk_menu_append(GTK_MENU(label_menu), item);
+ gtk_menu_append(GTK_MENU(menu), item);
gtk_signal_connect(GTK_OBJECT(item), "activate",
GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
GUINT_TO_POINTER(0));
gtk_widget_show(item);
item = gtk_menu_item_new();
- gtk_menu_append(GTK_MENU(label_menu), item);
+ gtk_menu_append(GTK_MENU(menu), item);
gtk_widget_show(item);
/* create pixmap/label menu items */
- for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
+ for (i = 0; i < N_COLOR_LABELS; i++) {
item = colorlabel_create_check_color_menu_item(i);
- gtk_menu_append(GTK_MENU(label_menu), item);
+ gtk_menu_append(GTK_MENU(menu), item);
gtk_signal_connect(GTK_OBJECT(item), "activate",
GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
GUINT_TO_POINTER(i + 1));
gtk_widget_show(item);
}
- gtk_widget_show(label_menu);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menu_item), label_menu);
- summaryview->colorlabel_menu = label_menu;
+ gtk_widget_show(menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
+ summaryview->colorlabel_menu = menu;
}
/* callback functions */
if (!event) return;
if (event->button == 3) {
- /* right clicked */
- summary_set_add_sender_menu(summaryview);
+ /* Right button clicked */
+ /* summary_set_add_sender_menu(summaryview); */
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
} else if (event->button == 2) {
GtkCTreeNode *node;
FolderItem *to_folder;
+ if (summary_is_locked(summaryview)) return;
if (!event) return;
switch (event->keyval) {
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
- if (summaryview->folder_item->stype == F_DRAFT)
+ if (summaryview->folder_item->stype == F_DRAFT ||
+ summaryview->folder_item->stype == F_OUTBOX ||
+ summaryview->folder_item->stype == F_QUEUE)
summary_reedit(summaryview);
else
summary_open_msg(summaryview);
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;
summaryview->selected);
if (!msginfo) return;
- switch ((ComposeReplyMode)action) {
+ switch ((ComposeMode)action) {
case COMPOSE_REPLY:
compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, FALSE);
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);
summary_set_marks_selected(summaryview);
}
+static void summary_execute_cb(SummaryView *summaryview, guint action,
+ GtkWidget *widget)
+{
+ summary_execute(summaryview);
+}
+
static void summary_show_all_header_cb(SummaryView *summaryview,
guint action, GtkWidget *widget)
{
header_window_show_cb(summaryview->mainwin, action, widget);
}
+static void summary_add_address_cb(SummaryView *summaryview,
+ guint action, GtkWidget *widget)
+{
+ summary_add_address(summaryview);
+}
+
+static void summary_mark_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+ summary_sort(summaryview, SORT_BY_MARK);
+}
+
+static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+ summary_sort(summaryview, SORT_BY_UNREAD);
+}
+
+static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+ summary_sort(summaryview, SORT_BY_MIME);
+}
+
static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
{
summary_sort(summaryview, SORT_BY_NUMBER);
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);
- 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,
/* custom compare functions for sorting */
+static gint summary_cmp_by_mark(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+ return MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags);
+}
+
+static gint summary_cmp_by_unread(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+ return MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags);
+}
+
+static gint summary_cmp_by_mime(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+ return MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags);
+}
+
static gint summary_cmp_by_num(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
- return MSG_GET_COLORLABEL(msginfo1->flags) - MSG_GET_COLORLABEL(msginfo2->flags);
+ return MSG_GET_COLORLABEL(msginfo1->flags) -
+ MSG_GET_COLORLABEL(msginfo2->flags);
}
-
static gint summary_cmp_by_score(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
summary_status_show(summaryview);
}
+/*
+ * End of Source.
+ */
projects / claws.git / blobdiff