#include "string_match.h"
#include "toolbar.h"
#include "news.h"
+#include "matcher.h"
+#include "matcher_parser.h"
+#include "hooks.h"
+#include "description_window.h"
+#include "folder.h"
#define SUMMARY_COL_MARK_WIDTH 10
-#define SUMMARY_COL_UNREAD_WIDTH 13
+#define SUMMARY_COL_STATUS_WIDTH 13
#define SUMMARY_COL_LOCKED_WIDTH 13
#define SUMMARY_COL_MIME_WIDTH 11
static GdkBitmap *keyxpmmask;
static GdkPixmap *clipkeyxpm;
static GdkBitmap *clipkeyxpmmask;
+static GdkPixmap *gpgsignedxpm;
+static GdkBitmap *gpgsignedxpmmask;
static void summary_free_msginfo_func (GtkCTree *ctree,
GtkCTreeNode *node,
static void summary_searchbar_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
+static void summary_searchbar_focus_evt (GtkWidget *ctree,
+ GdkEventFocus *event,
+ SummaryView *summaryview);
static void summary_searchtype_changed (GtkMenuItem *widget,
gpointer data);
static void summary_open_row (GtkSCTree *sctree,
static void summary_mark_clicked (GtkWidget *button,
SummaryView *summaryview);
-static void summary_unread_clicked (GtkWidget *button,
+static void summary_status_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_mime_clicked (GtkWidget *button,
SummaryView *summaryview);
static gint summary_cmp_by_mark (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_unread (GtkCList *clist,
+static gint summary_cmp_by_status (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static gint summary_cmp_by_mime (GtkCList *clist,
static gint summary_cmp_by_from (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_to (GtkCList *clist,
- gconstpointer ptr1,
- gconstpointer ptr2);
static gint summary_cmp_by_subject (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static gint summary_cmp_by_simplified_subject
- (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2);
+ (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static gint summary_cmp_by_score (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static gint summary_cmp_by_locked (GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2);
static gint summary_cmp_by_label (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_to (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
+static gint summary_cmp_by_locked (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static void news_flag_crosspost (MsgInfo *msginfo);
static void tog_searchbar_cb (GtkWidget *w,
gpointer data);
-static void summary_update_msg (MsgInfo *info, gpointer data);
+static void summary_find_answers (SummaryView *summaryview,
+ MsgInfo *msg);
+
+static gboolean summary_update_msg (gpointer source, gpointer data);
GtkTargetEntry summary_drag_types[1] =
{
static GtkItemFactoryEntry summary_popup_entries[] =
{
- {N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
+ {N_("/_Reply"), "<control>R", summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Repl_y to"), NULL, NULL, 0, "<Branch>"},
- {N_("/Repl_y to/_all"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/Repl_y to/_all"), "<shift><control>R", summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Repl_y to/mailing _list"),
- NULL, summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
+ "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
{N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
+ {N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, 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_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
+ {N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
+ {N_("/_Delete"), "<control>D", summary_delete, 0, NULL},
{N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
- {N_("/E_xecute"), NULL, summary_execute_cb, 0, NULL},
+ {N_("/E_xecute"), "X", 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/_Mark"), "<shift>asterisk", summary_mark, 0, NULL},
+ {N_("/_Mark/_Unmark"), "U", 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 unr_ead"), "<shift>exclam", summary_mark_as_unread, 0, NULL},
{N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{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, "<ToggleItem>"},
+ "<control><alt>N", summary_open_msg, 0, NULL},
+ {N_("/_View/_Source"), "<control>U", summary_view_source, 0, NULL},
+ {N_("/_View/All _header"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Save as..."), NULL, summary_save_as, 0, NULL},
+ {N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
{N_("/_Print..."), NULL, summary_print, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Select _all"), NULL, summary_select_all, 0, NULL},
+ {N_("/Select _all"), "<control>A", summary_select_all, 0, NULL},
{N_("/Select t_hread"), NULL, summary_select_thread, 0, NULL}
-};
+}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
static const gchar *const col_label[N_SUMMARY_COLS] = {
N_("M"), /* S_COL_MARK */
- N_("U"), /* S_COL_UNREAD */
+ N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("From"), /* S_COL_FROM */
N_("L") /* S_COL_LOCKED */
};
+/*
+ * Strings describing how to use Extended Search
+ *
+ * When adding new lines, remember to put 2 strings for each line
+ */
+static gchar *search_descr_strings[] = {
+ "a", N_("all messages"),
+ "ag #", N_("messages whose age is greather than #"),
+ "al #", N_("messages whose age is greather than #"),
+ "b S", N_("messages which contain S in the message body"),
+ "B S", N_("messages which contain S in the whole message"),
+ "c S", N_("messages carbon-copied to S"),
+ "C S", N_("message is either to: or cc: to S"),
+ "D", N_("deleted messages"), /** how I can filter deleted messages **/
+ "e S", N_("messages which contain S in the Sender field"),
+ "E S", N_("true if execute \"S\" succeeds"),
+ "f S", N_("messages originating from user S"),
+ "F", N_("forwarded messages"),
+ "h S", N_("messages which contain header S"),
+ "i S", N_("messages which contain S in Message-Id header"),
+ "I S", N_("messages which contain S in inreplyto header"),
+ "L", N_("locked messages"),
+ "n S", N_("messages which are in newsgroup S"),
+ "N", N_("new messages"),
+ "O", N_("old messages"),
+ "r", N_("messages which have been replied to"),
+ "R", N_("read messages"),
+ "s S", N_("messages which contain S in subject"),
+ "se #", N_("messages whose score is equal to #"),
+ "sg #", N_("messages whose score is greater than #"),
+ "sl #", N_("messages whose score is lower than #"),
+ "Se #", N_("messages whose size is equal to #"),
+ "Sg #", N_("messages whose size is greater than #"),
+ "Ss #", N_("messages whose size is smaller than #"),
+ "t S", N_("messages which have been sent to S"),
+ "T", N_("marked messages"),
+ "U", N_("unread messages"),
+ "x S", N_("messages which contain S in References header"),
+ "y S", N_("messages which contain S in X-Label header"),
+ "", "" ,
+ "&", N_("logical AND operator"),
+ "|", N_("logical OR operator"),
+ "! or ~", N_("logical NOT operator"),
+ "%", N_("case sensitive search"),
+ NULL, NULL
+};
+
+static DescriptionWindow search_descr = {
+ NULL,
+ 2,
+ N_("Extended Search symbols"),
+ search_descr_strings
+};
+
+static void search_description_cb (GtkWidget *widget) {
+ description_window_create(&search_descr);
+};
+
SummaryView *summary_create(void)
{
SummaryView *summaryview;
GtkWidget *search_type_opt;
GtkWidget *search_type;
GtkWidget *search_string;
+ GtkWidget *search_hbbox;
+ GtkWidget *search_description;
GtkWidget *menuitem;
GtkWidget *toggle_search;
GtkTooltips *search_tip;
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
- vbox = gtk_vbox_new(FALSE, 3);
+#define SUMMARY_VBOX_SPACING 3
+ vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
GTK_SIGNAL_FUNC(summary_searchtype_changed),
summaryview);
MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(summary_searchtype_changed),
+ summaryview);
+ MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(summary_searchtype_changed),
summaryview);
gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
+
+ gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
+
gtk_widget_show(search_type);
search_string = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox_search), search_string, FALSE, FALSE, 2);
+ gtkut_button_set_create(&search_hbbox, &search_description, _("Extended Symbols"),
+ NULL, NULL, NULL, NULL);
+ gtk_signal_connect(GTK_OBJECT(search_description), "clicked",
+ GTK_SIGNAL_FUNC(search_description_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
+
gtk_widget_show(search_string);
gtk_widget_show(hbox_search);
GTK_SIGNAL_FUNC(summary_searchbar_pressed),
summaryview);
+ gtk_signal_connect(GTK_OBJECT(search_string), "focus_in_event",
+ GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
+ summaryview);
+
+ gtk_signal_connect(GTK_OBJECT(search_string), "focus_out_event",
+ GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
+ summaryview);
+
gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
- GTK_SIGNAL_FUNC(tog_searchbar_cb), hbox_search);
+ GTK_SIGNAL_FUNC(tog_searchbar_cb), summaryview);
/* create popup menu */
n_entries = sizeof(summary_popup_entries) /
summaryview->search_type_opt = search_type_opt;
summaryview->search_type = search_type;
summaryview->search_string = search_string;
+ summaryview->search_description = search_description;
summaryview->msginfo_update_callback_id =
- msginfo_update_callback_register(summary_update_msg, (gpointer) summaryview);
+ hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
/* CLAWS: need this to get the SummaryView * from
* the CList */
&clipkeyxpm, &clipkeyxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
&keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+ &gpgsignedxpm, &gpgsignedxpmmask);
if (!small_style) {
small_style = gtk_style_copy
|| MSG_IS_LOCKED(msginfo->flags)
|| CURRENTLY_DISPLAYED(msginfo))
&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
GTK_MENU(summaryview->search_type))))));
gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
gchar *searched_header = NULL;
+ MatcherList * tmp_list = NULL;
+ if (search_type == S_SEARCH_EXTENDED) {
+ char *newstr = NULL;
+
+ newstr = expand_search_string(search_string);
+ if (newstr) {
+ tmp_list = matcher_parser_get_cond(newstr);
+ g_free(newstr);
+ }
+ else
+ tmp_list = NULL;
+ }
+
not_killed = NULL;
for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
case S_SEARCH_TO:
searched_header = msginfo->to;
break;
+ case S_SEARCH_EXTENDED:
+ break;
default:
debug_print("unknown search type (%d)\n", search_type);
break;
}
- if (searched_header && strcasestr(searched_header, search_string) != NULL)
- not_killed = g_slist_append(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
+ if (search_type != S_SEARCH_EXTENDED) {
+ if (searched_header && strcasestr(searched_header, search_string) != NULL)
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
+ } else {
+ if ((tmp_list != NULL) && matcherlist_match(tmp_list, msginfo))
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
+ }
}
+ if (search_type == S_SEARCH_EXTENDED && tmp_list != NULL) {
+ matcherlist_free(tmp_list);
+ tmp_list = NULL;
+ }
+
g_slist_free(mlist);
mlist = not_killed;
}
MsgInfo * msginfo = (MsgInfo *) cur->data;
if (msginfo->score > kill_score)
- not_killed = g_slist_append(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
/* set ctree and hash table from the msginfo list
creating thread, and count the number of messages */
+
summary_set_ctree_from_list(summaryview, mlist);
g_slist_free(mlist);
summary_select_node(summaryview, node, FALSE, TRUE);
}
+ summary_set_column_titles(summaryview);
summary_status_show(summaryview);
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
{
summary_clear_list(summaryview);
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
summary_status_show(summaryview);
}
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;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
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;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if ((msginfo->flags.perm_flags & flags) != 0) break;
+ if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
}
return node;
/* Find msg with matching flags but ignore messages with
ignore flags, if searching for new or unread messages */
if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) &&
- ((msginfo->flags.perm_flags & flags) != 0))
+ (msginfo && (msginfo->flags.perm_flags & flags) != 0))
break;
}
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 (msginfo && msginfo->msgnum == msgnum) break;
}
return node;
summaryview->newmsgs++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked++;
+
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
summaryview->newmsgs++;
if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
if (MSG_IS_MOVE(msginfo->flags))
msginfo = gtk_ctree_node_get_row_data
(GTK_CTREE(summaryview->ctree),
GTK_CTREE_NODE(cur->data));
- sel_size += msginfo->size;
- n_selected++;
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ sel_size += msginfo->size;
+ n_selected++;
+ }
}
- if (summaryview->folder_item->folder->type == F_NEWS &&
- prefs_common.ng_abbrev_len < strlen(summaryview->folder_item->path)) {
+ if (summaryview->folder_item->folder->type == F_NEWS) {
gchar *group;
group = get_abbrev_newsgroup_name
- (g_basename(summaryview->folder_item->path), prefs_common.ng_abbrev_len);
+ (g_basename(summaryview->folder_item->path),
+ prefs_common.ng_abbrev_len);
gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), group);
g_free(group);
} else {
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
SORT_BY_MARK,
- SORT_BY_UNREAD,
+ SORT_BY_STATUS,
SORT_BY_MIME,
SORT_BY_SUBJECT,
SORT_BY_FROM,
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- single_char = (type == S_COL_MIME || type == S_COL_UNREAD);
+ single_char = (type == S_COL_MIME || type == S_COL_STATUS);
justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
case SORT_BY_MARK:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
break;
- case SORT_BY_UNREAD:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_unread;
+ case SORT_BY_STATUS:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
break;
case SORT_BY_MIME:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
break;
case SORT_BY_FROM:
- if (summaryview->folder_item && summaryview->folder_item->stype != F_OUTBOX)
- cmp_func = (GtkCListCompareFunc) summary_cmp_by_from;
- else
- cmp_func = (GtkCListCompareFunc) summary_cmp_by_to;
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
break;
case SORT_BY_SUBJECT:
if (summaryview->simplify_subject_preg)
case SORT_BY_SCORE:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
break;
- case SORT_BY_LOCKED:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
- break;
case SORT_BY_LABEL:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
break;
+ case SORT_BY_TO:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_to;
+ break;
+ case SORT_BY_LOCKED:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+ break;
case SORT_BY_NONE:
cmp_func = NULL;
return;
g_node_destroy(root);
- folder_update_items_when_required(FALSE);
-
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
-
- mlist = g_slist_reverse(mlist);
+ cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
msginfo->subject,
node);
}
- mlist = g_slist_reverse(mlist);
+ mlist = cur;
}
if (prefs_common.enable_hscrollbar &&
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
- if (debug_mode) {
+ if (debug_get_mode()) {
debug_print("\tmsgid hash table size = %d\n",
g_hash_table_size(msgid_table));
debug_print("\tsubject hash table size = %d\n",
gint *col_pos = summaryview->col_pos;
text[col_pos[S_COL_MARK]] = NULL;
- text[col_pos[S_COL_UNREAD]] = NULL;
+ text[col_pos[S_COL_STATUS]] = NULL;
text[col_pos[S_COL_MIME]] = NULL;
text[col_pos[S_COL_LOCKED]] = NULL;
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
- folder_update_item(msginfo->folder, FALSE);
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(ctree));
summary_status_show(summaryview);
}
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
summary_unlock(summaryview);
}
/* set new/unread column */
if (MSG_IS_IGNORE_THREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
ignorethreadxpm, ignorethreadxpmmask);
} else if (MSG_IS_NEW(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
newxpm, newxpmmask);
} else if (MSG_IS_UNREAD(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
unreadxpm, unreadxpmmask);
} else if (MSG_IS_REPLIED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
repliedxpm, repliedxpmmask);
} else if (MSG_IS_FORWARDED(flags)) {
- gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
forwardedxpm, forwardedxpmmask);
} else {
- gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_UNREAD],
+ gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
NULL);
}
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
}
- if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+ if (MSG_IS_SIGNED(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+ gpgsignedxpm, gpgsignedxpmmask);
+ } else if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipkeyxpm, clipkeyxpmmask);
} else if (MSG_IS_ENCRYPTED(flags)) {
static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_update_unread_children (msginfo, TRUE);
+
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
summary_set_row_marks(summaryview, row);
summaryview->copied--;
changed = TRUE;
}
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked--;
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
- folder_update_items_when_required(FALSE);
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
GtkCTreeNode *node;
gtk_clist_freeze(clist);
+ folder_item_update_freeze();
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_read(summaryview, node);
summary_set_row_marks(summaryview, node);
}
gtk_clist_thaw(clist);
- folder_update_items_when_required(FALSE);
+ folder_item_update_thaw();
summary_status_show(summaryview);
}
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
- msginfo->to_folder = NULL;
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted--;
}
if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
+ if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked++;
+
procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
debug_print("Message %d is marked as unread\n",
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
- folder_update_items_when_required(FALSE);
-
+ folder_item_update_thaw();
+
summary_status_show(summaryview);
}
static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
if (MSG_IS_DELETED(msginfo->flags)) return;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_update_unread_children (msginfo, FALSE);
+
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted++;
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
+ folder_item_update_freeze();
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
sel_last = GTK_CTREE_NODE(cur->data);
summary_delete_row(summaryview, sel_last);
}
+ folder_item_update_thaw();
node = summary_find_next_msg(summaryview, sel_last);
if (!node)
FALSE);
}
- if (prefs_common.immediate_exec || item->stype == F_TRASH)
+ if (prefs_common.immediate_exec || item->stype == F_TRASH) {
summary_execute(summaryview);
- else
+ /* after deleting, the anchor may be at an invalid row
+ * so reset it to the node we found earlier */
+ gtk_sctree_set_anchor_row(GTK_SCTREE(ctree), node);
+ } else
summary_status_show(summaryview);
}
STATUSBAR_PUSH(summaryview->mainwin,
_("Deleting duplicated messages..."));
+ folder_item_update_freeze();
+
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_delete_duplicated_func),
summaryview);
else
summary_status_show(summaryview);
+ folder_item_update_thaw();
+
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
{
GtkCTreeNode *found;
MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;
-
+ MsgInfo *dup_msginfo;
+
if (!msginfo->msgid || !*msginfo->msgid) return;
found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
-
- if (found && found != node)
- summary_delete_row(summaryview, node);
+
+ if (found && found != node) {
+ dup_msginfo = gtk_ctree_node_get_row_data(ctree, found);
+ /* prefer to delete the unread one */
+ if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(dup_msginfo->flags))
+ || (MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(dup_msginfo->flags)))
+ summary_delete_row(summaryview, node);
+ }
}
static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
- if (MSG_IS_MOVE(msginfo->flags)) {
+ if (MSG_IS_MOVE(msginfo->flags))
summaryview->moved--;
- changed = TRUE;
- }
- if (MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- changed = TRUE;
- }
- if (changed && !prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0)
- folder_update_item(msginfo->to_folder, FALSE);
- }
- msginfo->to_folder = NULL;
+ procmsg_update_unread_children (msginfo, FALSE);
+
+ procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
FolderItem *to_folder)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_MOVE(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0) {
- folder_update_item(msginfo->to_folder, FALSE);
- changed = TRUE;
- }
- }
- }
- msginfo->to_folder = to_folder;
+ procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
- if (!prefs_common.immediate_exec)
- msginfo->to_folder->op_count--;
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
summaryview->moved++;
- changed = TRUE;
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- if (changed) {
- msginfo->to_folder->op_count++;
- if (msginfo->to_folder->op_count == 1)
- folder_update_item(msginfo->to_folder, FALSE);
- }
}
debug_print("Message %d is set to move to %s\n",
summary_execute(summaryview);
else {
summary_status_show(summaryview);
-
- folder_update_item(to_folder, FALSE);
}
if (!summaryview->selected) { /* this was the last message */
static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
FolderItem *to_folder)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
g_return_if_fail(to_folder != NULL);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_COPY(msginfo->flags)) {
- if (!prefs_common.immediate_exec) {
- msginfo->to_folder->op_count--;
- if (msginfo->to_folder->op_count == 0) {
- folder_update_item(msginfo->to_folder, FALSE);
- changed = TRUE;
- }
- }
- }
- msginfo->to_folder = to_folder;
+ procmsg_msginfo_set_to_folder(msginfo, to_folder);
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
- if (!prefs_common.immediate_exec)
- msginfo->to_folder->op_count--;
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
if (!MSG_IS_COPY(msginfo->flags)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
summaryview->copied++;
- changed = TRUE;
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
- if (changed) {
- msginfo->to_folder->op_count++;
- if (msginfo->to_folder->op_count == 1)
- folder_update_item(msginfo->to_folder, FALSE);
- }
}
debug_print("Message %d is set to copy to %s\n",
summary_execute(summaryview);
else {
summary_status_show(summaryview);
-
- folder_update_item(to_folder, FALSE);
}
}
gchar *filename = NULL;
gchar *src, *dest;
- AlertValue aval;
+ AlertValue aval = 0;
if (!summaryview->selected) return;
msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
aval = alertpanel(_("Append or Overwrite"),
_("Append or overwrite existing file?"),
_("Append"), _("Overwrite"), _("Cancel"));
- if (aval!=0 && aval!=1) return;
+ if (aval != 0 && aval != 1)
+ return;
}
src = procmsg_get_message_file(msginfo);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
+ GtkCTreeNode *new_selected = NULL;
if (!summaryview->folder_item) return FALSE;
if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
+ folder_item_update_freeze();
summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
+ folder_item_update_thaw();
node = GTK_CTREE_NODE(clist->row_list);
- while (node != NULL) {
+ for (; node != NULL; node = next) {
next = gtkut_ctree_node_next(ctree, node);
- if (gtk_ctree_node_get_row_data(ctree, node) == NULL) {
- if (node == summaryview->displayed) {
- messageview_clear(summaryview->messageview);
- summaryview->displayed = NULL;
- }
- if (GTK_CTREE_ROW(node)->children != NULL)
- g_warning("summary_execute(): children != NULL\n");
- else
- gtk_ctree_remove_node(ctree, node);
+ if (gtk_ctree_node_get_row_data(ctree, node) != NULL) continue;
+
+ if (node == summaryview->displayed) {
+ messageview_clear(summaryview->messageview);
+ summaryview->displayed = NULL;
}
- node = next;
+ if (GTK_CTREE_ROW(node)->children != NULL) {
+ g_warning("summary_execute(): children != NULL\n");
+ continue;
+ }
+
+ if (!new_selected &&
+ gtkut_ctree_node_is_selected(ctree, node)) {
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ new_selected = summary_find_next_msg(summaryview, node);
+ if (!new_selected)
+ new_selected = summary_find_prev_msg
+ (summaryview, node);
+ }
+
+ gtk_ctree_remove_node(ctree, node);
+ }
+
+ if (new_selected) {
+ gtk_sctree_select
+ (GTK_SCTREE(ctree),
+ summaryview->displayed ? summaryview->displayed
+ : new_selected);
}
if (summaryview->threaded)
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folder_update_items_when_required(FALSE);
-
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
-
- folder_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
- if (!prefs_common.immediate_exec &&
- msginfo->to_folder->op_count > 0)
- msginfo->to_folder->op_count--;
-
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
gtk_ctree_node_set_row_data(ctree, node, NULL);
if (summaryview->mlist) {
procmsg_copy_messages(summaryview->mlist);
- folder_update_items_when_required(FALSE);
-
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
- if (!prefs_common.immediate_exec &&
- msginfo->to_folder->op_count > 0)
- msginfo->to_folder->op_count--;
-
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
-
- if ((summaryview->folder_item != trash) && (trash != NULL)) {
- folder_update_item(trash, FALSE);
- }
- folder_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo->msgid)) {
g_hash_table_remove(summaryview->msgid_table,
msginfo->msgid);
- }
+ }
if (msginfo->subject && *msginfo->subject &&
- node == g_hash_table_lookup(summaryview->subject_table,
- msginfo->subject)) {
- g_hash_table_remove(summaryview->subject_table,
- msginfo->subject);
+ node == subject_table_lookup(summaryview->subject_table,
+ msginfo->subject)) {
+ subject_table_remove(summaryview->subject_table,
+ msginfo->subject);
}
}
}
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (prefs_common.expand_thread)
+ if (!summaryview->thread_collapsed)
gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
node = next;
}
+ gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+
gtk_clist_thaw(GTK_CLIST(ctree));
gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
summary_tree_expanded, summaryview);
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *next;
- if (prefs_common.expand_thread) {
+ if (!summaryview->thread_collapsed) {
while (node) {
next = GTK_CTREE_ROW(node)->sibling;
if (GTK_CTREE_ROW(node)->children)
gtk_clist_thaw(GTK_CLIST(ctree));
+ summaryview->thread_collapsed = FALSE;
+
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
}
gtk_clist_thaw(GTK_CLIST(ctree));
+
+ summaryview->thread_collapsed = TRUE;
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
summaryview);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
-
- folder_update_items_when_required(FALSE);
}
debug_print("done.\n");
}
break;
case COMPOSE_FORWARD_INLINE:
- if (!sel->next) {
+ if (sel && !sel->next) {
compose_forward(NULL, msginfo, FALSE, text);
break;
}
gint color_index;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
gtk_ctree_node_set_row_style(ctree, node, style);
}
+static void summary_set_row_colorlable(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ MsgInfo *msginfo;
+
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+
+ procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
+}
+
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
GtkWidget *widget)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCList *clist = GTK_CLIST(summaryview->ctree);
GList *cur;
- for (cur = clist->selection; cur != NULL; cur = cur->next)
- summary_set_colorlabel_color(ctree, GTK_CTREE_NODE(cur->data),
- labelcolor);
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ summary_set_row_colorlable(summaryview,
+ GTK_CTREE_NODE(cur->data), labelcolor);
}
static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
GTK_JUSTIFY_CENTER);
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MARK],
SUMMARY_COL_MARK_WIDTH);
- gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
- SUMMARY_COL_UNREAD_WIDTH);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_STATUS],
+ SUMMARY_COL_STATUS_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
SUMMARY_COL_LOCKED_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
summaryview)
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK , summary_mark_clicked);
- CLIST_BUTTON_SIGNAL_CONNECT(S_COL_UNREAD , summary_unread_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_STATUS , summary_status_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MIME , summary_mime_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_NUMBER , summary_num_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE , summary_size_clicked);
if (!event) return;
if (event->button == 3) {
+ summaryview->display_msg = TRUE;
/* right clicked */
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
summary_show(summaryview, summaryview->folder_item);
}
+static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
+ SummaryView *summaryview)
+{
+ if (event != NULL && event->in)
+ gtk_signal_handler_block_by_func(GTK_OBJECT(summaryview->mainwin->window),
+ GTK_SIGNAL_FUNC(mainwindow_key_pressed),
+ summaryview->mainwin);
+ else
+ gtk_signal_handler_unblock_by_func(GTK_OBJECT(summaryview->mainwin->window),
+ GTK_SIGNAL_FUNC(mainwindow_key_pressed),
+ summaryview->mainwin);
+}
+
static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
{
SummaryView *sw = (SummaryView *)data;
+ prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+ GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+ GTK_MENU(sw->search_type))))));
+
+ /* Show extended search description button, only when Extended is selected */
+ if (prefs_common.summary_quicksearch_type == S_SEARCH_EXTENDED) {
+ gtk_widget_show(sw->search_description);
+ } else {
+ gtk_widget_hide(sw->search_description);
+ }
+
if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
summary_show(sw, sw->folder_item);
}
static void tog_searchbar_cb(GtkWidget *w, gpointer data)
{
+ SummaryView *summaryview = (SummaryView *)data;
+ GtkWidget *hbox= summaryview->hbox_search;
+ GtkAllocation size = hbox->allocation;
+ GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
+ GtkAllocation parent_size = summaryview->vbox->allocation;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
prefs_common.show_searchbar = TRUE;
- gtk_widget_show(GTK_WIDGET(data));
+ gtk_widget_show(hbox);
+ if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
+ && msgview_size.height > 1 && parent_size.height > 1) {
+ gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
+ -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
+ gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
+ -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
+ gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
+ }
} else {
prefs_common.show_searchbar = FALSE;
- gtk_widget_hide(GTK_WIDGET(data));
+ gtk_widget_hide(hbox);
+ if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
+ && msgview_size.height > 1 && parent_size.height > 1) {
+ gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
+ -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
+ gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
+ -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
+ gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
+ }
}
}
summary_status_show(summaryview);
if (GTK_CLIST(ctree)->selection &&
- GTK_CLIST(ctree)->selection->next) {
+ GTK_CLIST(ctree)->selection->next) {
summaryview->display_msg = FALSE;
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
return;
}
summaryview->selected = row;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ g_return_if_fail(msginfo != NULL);
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
- procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, 0);
- summary_set_row_marks(summaryview, row);
+ summary_unmark_row(summaryview, row);
} else
summary_mark_row(summaryview, row);
break;
- case S_COL_UNREAD:
+ case S_COL_STATUS:
if (MSG_IS_UNREAD(msginfo->flags)) {
summary_mark_row_as_read(summaryview, row);
summary_status_show(summaryview);
!MSG_IS_FORWARDED(msginfo->flags)) {
summary_mark_row_as_unread(summaryview, row);
summary_status_show(summaryview);
+ } else if (MSG_IS_REPLIED(msginfo->flags)) {
+ summary_find_answers(summaryview, msginfo);
+ return;
}
break;
case S_COL_LOCKED:
summaryview->display_msg = FALSE;
} else {
summary_set_menu_sensitive(summaryview);
- toolbar_set_sensitive(summaryview->mainwin);
+ toolbar_main_set_sensitive(summaryview->mainwin);
}
}
summary_sort_by_column_click(summaryview, SORT_BY_MARK);
}
-static void summary_unread_clicked(GtkWidget *button, SummaryView *summaryview)
+static void summary_status_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_UNREAD);
+ summary_sort_by_column_click(summaryview, SORT_BY_STATUS);
}
static void summary_mime_clicked(GtkWidget *button, SummaryView *summaryview)
/* 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 msginfo1->msgnum - msginfo2->msgnum;
-}
-
-static gint summary_cmp_by_size(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return msginfo1->size - msginfo2->size;
-}
-
-static gint summary_cmp_by_date(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return msginfo1->date_t - msginfo2->date_t;
-}
-
-static gint summary_cmp_by_from(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- if (!msginfo1->fromname)
- return (msginfo2->fromname != NULL);
- if (!msginfo2->fromname)
- return -1;
-
- return strcasecmp(msginfo1->fromname, msginfo2->fromname);
-}
-
-static gint summary_cmp_by_to(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
+#define CMP_FUNC_DEF(func_name, val) \
+static gint func_name(GtkCList *clist, \
+ gconstpointer ptr1, gconstpointer ptr2) \
+{ \
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
+ \
+ if (!msginfo1 || !msginfo2) \
+ return -1; \
+ \
+ return (val); \
+}
+
+CMP_FUNC_DEF(summary_cmp_by_mark,
+ MSG_IS_MARKED(msginfo1->flags) - MSG_IS_MARKED(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_status,
+ MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_mime,
+ MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_label,
+ MSG_GET_COLORLABEL(msginfo1->flags) -
+ MSG_GET_COLORLABEL(msginfo2->flags))
+CMP_FUNC_DEF(summary_cmp_by_locked,
+ MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags))
+
+CMP_FUNC_DEF(summary_cmp_by_num, msginfo1->msgnum - msginfo2->msgnum)
+CMP_FUNC_DEF(summary_cmp_by_size, msginfo1->size - msginfo2->size)
+CMP_FUNC_DEF(summary_cmp_by_date, msginfo1->date_t - msginfo2->date_t)
+
+#undef CMP_FUNC_DEF
+#define CMP_FUNC_DEF(func_name, var_name) \
+static gint func_name(GtkCList *clist, \
+ gconstpointer ptr1, gconstpointer ptr2) \
+{ \
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
+ \
+ if (!msginfo1->var_name) \
+ return (msginfo2->var_name != NULL); \
+ if (!msginfo2->var_name) \
+ return -1; \
+ \
+ return strcasecmp(msginfo1->var_name, msginfo2->var_name); \
+}
+
+CMP_FUNC_DEF(summary_cmp_by_subject, subject);
+CMP_FUNC_DEF(summary_cmp_by_to, to);
+
+#undef CMP_FUNC_DEF
+
+ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
+ gconstpointer ptr2)
+ {
const gchar *str1, *str2;
const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
if (!str1)
return str2 != NULL;
-
+
if (!str2)
- return -1;
-
- if (g_strncasecmp(str1, "-->", 3) == 0)
- str1 += 3;
- if (g_strncasecmp(str2, "-->", 3) == 0)
- str2 += 3;
-
+ return -1;
+
return strcasecmp(str1, str2);
-}
-
-static gint summary_cmp_by_subject(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- if (!msginfo1->subject)
- return (msginfo2->subject != NULL);
- if (!msginfo2->subject)
- return -1;
-
- return strcasecmp(msginfo1->subject, msginfo2->subject);
-}
-
-static gint summary_cmp_by_simplified_subject
+ }
+
+ static gint summary_cmp_by_simplified_subject
(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
const PrefsFolderItem *prefs;
return strcasecmp(str1, str2);
}
-static gint summary_cmp_by_label(GtkCList *clist,
+static gint summary_cmp_by_score(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+ int diff;
+
+ /* if score are equal, sort by date */
- return MSG_GET_COLORLABEL(msginfo1->flags) -
- MSG_GET_COLORLABEL(msginfo2->flags);
+ diff = msginfo1->threadscore - msginfo2->threadscore;
+ if (diff != 0)
+ return diff;
+ else
+ return summary_cmp_by_date(clist, ptr1, ptr2);
}
static void news_flag_crosspost(MsgInfo *msginfo)
debug_print(" <%s>", (gchar *)value);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- folder_update_item(msginfo->folder, FALSE);
procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
}
g_hash_table_remove(mff->newsart, key);
}
}
-static gint summary_cmp_by_score(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
- int diff;
-
- /* if score are equal, sort by date */
-
- diff = msginfo1->threadscore - msginfo2->threadscore;
- if (diff != 0)
- return diff;
- else
- return summary_cmp_by_date(clist, ptr1, ptr2);
-}
-
-static gint summary_cmp_by_locked(GtkCList *clist,
- gconstpointer ptr1, gconstpointer ptr2)
-{
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
-
- return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
-}
-
static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
{
SummaryView *summaryview = (SummaryView *) data;
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread--;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked--;
procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_ignore_thread_func), summaryview);
}
- folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
summaryview->newmsgs++;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread++;
+ if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked++;
procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), GTK_CTREE_FUNC(summary_unignore_thread_func), summaryview);
}
- folder_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
/* Threading */
summaryview->threaded = item->threaded;
+ summaryview->thread_collapsed = item->thread_collapsed;
/* Scoring */
if (global_scoring || item->prefs->scoring) {
/* Threading */
item->threaded = summaryview->threaded;
+ item->thread_collapsed = summaryview->thread_collapsed;
}
-static void summary_update_msg(MsgInfo *msginfo, gpointer data) {
- GtkCTreeNode *node;
+static gboolean summary_update_msg(gpointer source, gpointer data)
+{
+ MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
SummaryView *summaryview = (SummaryView *)data;
- node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo);
+ GtkCTreeNode *node;
+
+ g_return_val_if_fail(msginfo_update != NULL, TRUE);
+ g_return_val_if_fail(summaryview != NULL, FALSE);
+
+ node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
if (node)
summary_set_row_marks(summaryview, node);
+
+ return FALSE;
}
-/*
- * End of Source.
+/*!
+ *\brief change summaryview to display your answer(s) to a message
+ *
+ *\param summaryview The SummaryView ;)
+ *\param msginfo The message for which answers are searched
+ *
*/
+static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
+{
+ FolderItem *sent_folder = NULL;
+ PrefsAccount *account = NULL;
+ GtkCTreeNode *node = NULL;
+ char *buf = NULL;
+ if (msg == NULL || msg->msgid == NULL)
+ return;
+
+ account = account_get_reply_account(msg, prefs_common.reply_account_autosel);
+ if (account == NULL)
+ return;
+ sent_folder = account_get_special_folder
+ (account, F_OUTBOX);
+
+ buf = g_strdup_printf("inreplyto matchcase \"%s\"", msg->msgid);
+
+ if (sent_folder != summaryview->folder_item) {
+ folderview_select(summaryview->mainwin->folderview, sent_folder);
+ }
+
+ gtk_option_menu_set_history(GTK_OPTION_MENU(summaryview->search_type_opt),
+ S_SEARCH_EXTENDED);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
+
+ gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), buf);
+ g_free(buf);
+ summary_show(summaryview, summaryview->folder_item);
+ node = gtk_ctree_node_nth(GTK_CTREE(summaryview->ctree), 0);
+ if (node)
+ summary_select_node(summaryview, node, TRUE, TRUE);
+}
projects / claws.git / blobdiff