/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "edittags.h"
#include "manual.h"
#include "manage_window.h"
+#include "avatars.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
GtkCMCTreeNode *node);
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
- guint action);
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
- guint action);
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
- guint action);
+static void summary_set_hide_menu (SummaryView *summaryview,
+ const gchar *menu_item,
+ guint action);
static GtkCMCTreeNode *summary_find_prev_msg
(SummaryView *summaryview,
static void quicksearch_execute_cb (QuickSearch *quicksearch,
gpointer data);
+
static void tog_searchbar_cb (GtkWidget *w,
gpointer data);
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
-#if !(GTK_CHECK_VERSION(2,12,0))
- summaryview->tooltips = tips;
-#endif
#define SUMMARY_VBOX_SPACING 3
vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
SummaryColumnState *col_state = summaryview->col_state;
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
- if (!item || (prefs_common.layout_mode == VERTICAL_LAYOUT && prefs_common.two_line_vert) )
+ if (!item || ((prefs_common.layout_mode == VERTICAL_LAYOUT || prefs_common.layout_mode == SMALL_LAYOUT) && prefs_common.two_line_vert) )
return;
if (FOLDER_SHOWS_TO_HDR(item))
show_to = TRUE;
summary_set_column_titles(summaryview);
}
-static gboolean summaryview_quicksearch_recurse(gpointer data)
+static void summaryview_reset_recursive_folder_match(SummaryView *summaryview)
{
- SummaryView *summaryview = (SummaryView *)data;
+ GSList *cur;
+
+ for (cur = summaryview->recursive_matched_folders; cur != NULL; cur = cur->next) {
+ folderview_update_search_icon(cur->data, FALSE);
+ }
+
+ g_slist_free(summaryview->recursive_matched_folders);
+ summaryview->recursive_matched_folders = NULL;
+ summaryview->search_root_folder = NULL;
+}
+
+static gboolean summaryview_quicksearch_recursive_progress(gpointer data, guint at, guint matched, guint total)
+{
+ QuickSearch *search = (QuickSearch*) data;
+ gint interval = quicksearch_is_fast(search) ? 5000 : 100;
+
+ statusbar_progress_all(at, total, interval);
+ if (at % interval == 0)
+ GTK_EVENTS_FLUSH();
+
+ if (matched > 0)
+ return FALSE;
+
+ return TRUE;
+}
+
+static void summaryview_quicksearch_recurse_step(SummaryView *summaryview, FolderItem *item)
+{
+ MsgInfoList *msgs = NULL;
+ gboolean result = TRUE;
+
+ statusbar_print_all(_("Searching in %s... \n"),
+ item->path ? item->path : "(null)");
+ folder_item_update_freeze();
+
+ quicksearch_set_on_progress_cb(summaryview->quicksearch, summaryview_quicksearch_recursive_progress, summaryview->quicksearch);
+ if (!quicksearch_run_on_folder(summaryview->quicksearch, item, &msgs))
+ result = FALSE;
+
+ result = result && msgs != NULL;
+
+ if (msgs != NULL)
+ procmsg_msg_list_free(msgs);
+
+ folder_item_update_thaw();
+ statusbar_progress_all(0, 0, 0);
+ statusbar_pop_all();
+
+ if (result) {
+ summaryview->recursive_matched_folders = g_slist_prepend(
+ summaryview->recursive_matched_folders, item);
+
+ folderview_update_search_icon(item, TRUE);
+ }
+}
+
+static void summaryview_quicksearch_search_subfolders(SummaryView *summaryview, FolderItem *folder_item)
+{
+ FolderItem *cur = NULL;
+ GNode *node = folder_item->node->children;
+
+ if (!prefs_common.summary_quicksearch_recurse
+ || !quicksearch_has_sat_predicate(summaryview->quicksearch)
+ || quicksearch_is_in_typing(summaryview->quicksearch))
+ return;
+
+ for (; node != NULL; node = node->next) {
+ if (!quicksearch_has_sat_predicate(summaryview->quicksearch))
+ return;
+
+ cur = FOLDER_ITEM(node->data);
+ summaryview_quicksearch_recurse_step(summaryview, cur);
+ if (cur->node->children)
+ summaryview_quicksearch_search_subfolders(summaryview, cur);
+ }
+}
+
+static void summaryview_quicksearch_recurse(SummaryView *summaryview)
+{
+ if (!prefs_common.summary_quicksearch_recurse
+ || !quicksearch_has_sat_predicate(summaryview->quicksearch)
+ || summaryview->folder_item == NULL) {
+ return;
+ }
+
main_window_cursor_wait(summaryview->mainwin);
- quicksearch_reset_cur_folder_item(summaryview->quicksearch);
- quicksearch_search_subfolders(summaryview->quicksearch,
- summaryview->folderview,
- summaryview->folder_item);
+
+ summaryview_reset_recursive_folder_match(summaryview);
+ summaryview->search_root_folder = summaryview->folder_item;
+
+ summaryview_quicksearch_search_subfolders(summaryview, summaryview->folder_item);
+
main_window_cursor_normal(summaryview->mainwin);
- return FALSE;
}
static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
return TRUE;
}
+gboolean summaryview_search_root_progress(gpointer data, guint at, guint matched, guint total)
+{
+ SummaryView *summaryview = (SummaryView*) data;
+
+ gint interval = quicksearch_is_fast(summaryview->quicksearch) ? 5000 : 100;
+
+ statusbar_progress_all(at, total, interval);
+
+ if (at % interval == 0)
+ GTK_EVENTS_FLUSH();
+
+ return TRUE;
+}
+
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
}
if (!prefs_common.summary_quicksearch_sticky
&& (!prefs_common.summary_quicksearch_recurse
- || !quicksearch_is_active(summaryview->quicksearch)
- || (item && !quicksearch_is_in_subfolder(summaryview->quicksearch, item)))
+ || !quicksearch_has_sat_predicate(summaryview->quicksearch)
+ || (item && !folder_is_child_of(item, summaryview->search_root_folder)))
&& !quicksearch_is_running(summaryview->quicksearch)
&& !is_refresh) {
quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
END_TIMING();
return FALSE;
}
- if (changed || !quicksearch_is_active(summaryview->quicksearch))
+ if (changed || !quicksearch_has_sat_predicate(summaryview->quicksearch))
folder_update_op_count();
}
(item && item->path)?item->path:"(null)",
item?folder_item_parent(item):0x0,
item?item->no_select:FALSE);
- summary_set_hide_read_msgs_menu(summaryview, FALSE);
- summary_set_hide_del_msgs_menu(summaryview, FALSE);
- summary_set_hide_read_threads_menu(summaryview, FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages", FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages", FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads", FALSE);
summary_clear_all(summaryview);
summaryview->folder_item = item;
summary_thaw(summaryview);
summary_unlock(summaryview);
inc_unlock();
- if (item && quicksearch_is_running(summaryview->quicksearch)) {
- main_window_cursor_wait(summaryview->mainwin);
- quicksearch_reset_cur_folder_item(summaryview->quicksearch);
- if (quicksearch_is_active(summaryview->quicksearch))
- quicksearch_search_subfolders(summaryview->quicksearch,
- summaryview->folderview,
- summaryview->folder_item);
- main_window_cursor_normal(summaryview->mainwin);
- }
- END_TIMING();
+ END_TIMING();
return TRUE;
}
g_free(buf);
mlist = folder_item_get_msg_list(item);
}
+ if (quicksearch_has_sat_predicate(summaryview->quicksearch)) {
+ procmsg_msg_list_free(mlist);
+ mlist = NULL;
+
+ START_TIMING("quicksearch");
+
+ statusbar_print_all(_("Searching in %s... \n"),
+ summaryview->folder_item->path ?
+ summaryview->folder_item->path : "(null)");
+
+ folder_item_update_freeze();
+
+ quicksearch_set_on_progress_cb(summaryview->quicksearch, summaryview_search_root_progress, summaryview);
+ quicksearch_run_on_folder(summaryview->quicksearch, summaryview->folder_item, &mlist);
+
+ folder_item_update_thaw();
+ statusbar_progress_all(0, 0, 0);
+ statusbar_pop_all();
+
+ if (!quicksearch_has_sat_predicate(summaryview->quicksearch)) {
+ debug_print("search cancelled!\n");
+ summary_thaw(summaryview);
+ STATUSBAR_POP(summaryview->mainwin);
+ main_window_cursor_normal(summaryview->mainwin);
+ summary_unlock(summaryview);
+ inc_unlock();
+ summary_show(summaryview, summaryview->folder_item);
+ END_TIMING();
+ return FALSE;
+ }
+ END_TIMING();
+ }
+
if ((summaryview->folder_item->hide_read_msgs
|| summaryview->folder_item->hide_del_msgs
|| summaryview->folder_item->hide_read_threads) &&
- quicksearch_is_active(summaryview->quicksearch) == FALSE) {
+ quicksearch_has_sat_predicate(summaryview->quicksearch) == FALSE) {
GSList *not_killed;
- summary_set_hide_read_msgs_menu(summaryview, summaryview->folder_item->hide_read_msgs);
- summary_set_hide_del_msgs_menu(summaryview, summaryview->folder_item->hide_del_msgs);
- summary_set_hide_read_threads_menu(summaryview, summaryview->folder_item->hide_read_threads);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+ summaryview->folder_item->hide_read_msgs);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+ summaryview->folder_item->hide_del_msgs);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+ summaryview->folder_item->hide_read_threads);
not_killed = NULL;
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
g_slist_free(mlist);
mlist = not_killed;
} else {
- summary_set_hide_read_msgs_menu(summaryview, FALSE);
- summary_set_hide_del_msgs_menu(summaryview, FALSE);
- summary_set_hide_read_threads_menu(summaryview, FALSE);
- }
-
- if (quicksearch_is_active(summaryview->quicksearch)) {
- GSList *not_killed;
- gint interval = quicksearch_is_fast(summaryview->quicksearch) ? 5000:100;
- START_TIMING("quicksearch");
- gint num = 0, total = summaryview->folder_item->total_msgs;
- statusbar_print_all(_("Searching in %s... \n"),
- summaryview->folder_item->path ?
- summaryview->folder_item->path : "(null)");
- not_killed = NULL;
- folder_item_update_freeze();
- for (cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
- MsgInfo * msginfo = (MsgInfo *) cur->data;
-
- statusbar_progress_all(num++,total, interval);
-
- if (!msginfo->hidden && quicksearch_match(summaryview->quicksearch, msginfo))
- not_killed = g_slist_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
- if (num % interval == 0)
- GTK_EVENTS_FLUSH();
- if (!quicksearch_is_active(summaryview->quicksearch)) {
- break;
- }
- }
- folder_item_update_thaw();
- statusbar_progress_all(0,0,0);
- statusbar_pop_all();
-
- hidden_removed = TRUE;
- if (!quicksearch_is_active(summaryview->quicksearch)) {
- debug_print("search cancelled!\n");
- summary_thaw(summaryview);
- STATUSBAR_POP(summaryview->mainwin);
- main_window_cursor_normal(summaryview->mainwin);
- summary_unlock(summaryview);
- inc_unlock();
- summary_show(summaryview, summaryview->folder_item);
- END_TIMING();
- return FALSE;
- }
- g_slist_free(mlist);
- mlist = not_killed;
- END_TIMING();
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+ FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+ FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+ FALSE);
}
if (!hidden_removed) {
g_slist_free(mlist);
- if (quicksearch_is_active(summaryview->quicksearch) &&
- quicksearch_is_running(summaryview->quicksearch)) {
- /* only scan subfolders when quicksearch changed,
- * not when search is the same and folder changed */
- g_timeout_add(100, summaryview_quicksearch_recurse, summaryview);
- }
-
if (is_refresh) {
if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
summaryview->displayed =
#undef CURRENTLY_DISPLAYED
+static void summary_cancel_mark_read_timeout(SummaryView *summaryview) {
+ if (summaryview->mark_as_read_timeout_tag != 0) {
+ g_source_remove(summaryview->mark_as_read_timeout_tag);
+ summaryview->mark_as_read_timeout_tag = 0;
+ }
+}
void summary_clear_list(SummaryView *summaryview)
{
summaryview->folder_item = NULL;
}
+ summary_cancel_mark_read_timeout(summaryview);
+
summaryview->display_msg = FALSE;
summaryview->selected = NULL;
void summary_set_menu_sensitive(SummaryView *summaryview)
{
- SensitiveCond state;
+ SensitiveCondMask state;
gboolean sensitive;
gint i;
- static const struct {
- gchar *const entry;
- SensitiveCond cond;
- } entry[] = {
- {"Menus/SummaryViewPopup/Reply" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+#define N_ENTRIES 38
+ static struct {
+ const gchar *entry;
+ SensitiveCondMask cond;
+ } entry[N_ENTRIES];
+
+ i = 0;
+#define FILL_TABLE(entry_str, ...) \
+do { \
+ entry[i].entry = (const gchar *) entry_str; entry[i++].cond = main_window_get_mask(__VA_ARGS__, -1); \
+} while (0)
+
+ FILL_TABLE("Menus/SummaryViewPopup/Reply", M_HAVE_ACCOUNT, M_TARGET_EXIST);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/ReplyTo" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/ReplyTo/All" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/ReplyTo/Sender" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/ReplyTo/MailingList" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/ReplyTo", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/ReplyTo/All", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/ReplyTo/Sender", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/ReplyTo/MailingList", M_HAVE_ACCOUNT, M_TARGET_EXIST);
#endif
- {"Menus/SummaryViewPopup/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/Forward", M_HAVE_ACCOUNT, M_TARGET_EXIST);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/ForwardAtt" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Redirect" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/ForwardAtt", M_HAVE_ACCOUNT, M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Redirect", M_HAVE_ACCOUNT, M_TARGET_EXIST);
#endif
- {"Menus/SummaryViewPopup/Move" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
- {"Menus/SummaryViewPopup/Copy" , M_TARGET_EXIST|M_EXEC},
- {"Menus/SummaryViewPopup/Trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS|M_NOT_TRASH},
+ FILL_TABLE("Menus/SummaryViewPopup/Move", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS);
+ FILL_TABLE("Menus/SummaryViewPopup/Copy", M_TARGET_EXIST, M_EXEC);
+ FILL_TABLE("Menus/SummaryViewPopup/Trash", M_TARGET_EXIST, M_ALLOW_DELETE, M_NOT_NEWS, M_NOT_TRASH);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE},
+ FILL_TABLE("Menus/SummaryViewPopup/Delete", M_TARGET_EXIST, M_ALLOW_DELETE);
#endif
- {"Menus/SummaryViewPopup/Mark" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/Mark" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/Unmark" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/MarkUnread" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/MarkRead" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/MarkAllRead" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/IgnoreThread" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/UnignoreThread" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/WatchThread" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/UnwatchThread" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/Unlock" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/Lock" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Mark/MarkSpam" , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
- {"Menus/SummaryViewPopup/Mark/MarkHam" , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
- {"Menus/SummaryViewPopup/ColorLabel" , M_TARGET_EXIST},
- {"Menus/SummaryViewPopup/Tags" , M_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/Mark", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/Mark", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/Unmark", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkUnread", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkRead", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkAllRead", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/IgnoreThread", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/UnignoreThread", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/WatchThread", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/UnwatchThread", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/Unlock", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/Lock", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+ FILL_TABLE("Menus/SummaryViewPopup/Mark/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
+ FILL_TABLE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/Tags", M_TARGET_EXIST);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/AddSenderToAB" , M_SINGLE_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/AddSenderToAB", M_SINGLE_TARGET_EXIST);
#endif
- {"Menus/SummaryViewPopup/CreateFilterRule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ FILL_TABLE("Menus/SummaryViewPopup/CreateFilterRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/CreateProcessingRule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ FILL_TABLE("Menus/SummaryViewPopup/CreateProcessingRule", M_SINGLE_TARGET_EXIST, M_UNLOCKED);
#endif
- {"Menus/SummaryViewPopup/View" , M_SINGLE_TARGET_EXIST},
- {"Menus/SummaryViewPopup/View/OpenNewWindow" , M_SINGLE_TARGET_EXIST},
- {"Menus/SummaryViewPopup/View/MessageSource" , M_SINGLE_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/View", M_SINGLE_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/View/OpenNewWindow", M_SINGLE_TARGET_EXIST);
+ FILL_TABLE("Menus/SummaryViewPopup/View/MessageSource", M_SINGLE_TARGET_EXIST);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/View/AllHeaders" , M_SINGLE_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/View/AllHeaders", M_SINGLE_TARGET_EXIST);
#endif
- {"Menus/SummaryViewPopup/SaveAs" , M_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/SaveAs", M_TARGET_EXIST);
#ifndef GENERIC_UMPC
- {"Menus/SummaryViewPopup/Print" , M_TARGET_EXIST},
+ FILL_TABLE("Menus/SummaryViewPopup/Print", M_TARGET_EXIST);
#endif
- {NULL, 0}
- };
+ FILL_TABLE(NULL, -1);
+#undef FILL_TABLE
+ if (i != N_ENTRIES)
+ g_error("summaryview menu entry table size mismatch (%d/%d)", i, N_ENTRIES);
+#undef ENTRIES
main_window_set_menu_sensitive(summaryview->mainwin);
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val == G_ALERTALTERNATE) {
- folderview_select_next_unread(summaryview->folderview, TRUE);
- return;
- }
- else
- return;
- } else
+ if (val == G_ALERTALTERNATE)
+ folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD, TRUE);
+ } else {
summary_select_node(summaryview, node, TRUE, FALSE);
-
+ }
}
}
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_new(summaryview->folderview);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_NEW, TRUE);
return;
}
else
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_marked(summaryview->folderview);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED, TRUE);
return;
}
else
ctree = GTK_CMCTREE(summaryview->ctree);
- msgnum_list = NULL;
- for(walk = msginfos; walk; walk = walk->next) {
- MsgInfo *msginfo;
- msginfo = walk->data;
- msgnum_list = g_slist_prepend(msgnum_list, GUINT_TO_POINTER(msginfo->msgnum));
- }
+ msgnum_list = procmsg_get_number_list_for_msgs(msginfos);
+
START_LONG_OPERATION(summaryview, FALSE);
for(walk = msgnum_list; walk; walk = walk->next) {
GtkCMCTreeNode *node;
if (!summaryview->folder_item)
return;
if (node) {
+ summary_cancel_mark_read_timeout(summaryview);
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
summary_lock(summaryview);
msginfo = gtk_cmctree_node_get_row_data(ctree, node);
+ cm_return_if_fail(msginfo != NULL);
+
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
if (summaryview->folder_item->hide_read_msgs
|| summaryview->folder_item->hide_del_msgs
|| summaryview->folder_item->hide_read_threads
- || quicksearch_is_active(summaryview->quicksearch)) {
+ || quicksearch_has_sat_predicate(summaryview->quicksearch)) {
rowlist = GTK_CMCLIST(summaryview->ctree)->row_list;
for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
msginfo = gtk_cmctree_node_get_row_data
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
summary_set_header(summaryview, text, msginfo);
if (summaryview->col_state[summaryview->col_pos[S_COL_TAGS]].visible)
SET_TEXT(S_COL_TAGS);
- if (vert && prefs_common.two_line_vert)
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert)
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
#undef SET_TEXT
GHashTable *msgid_table;
GHashTable *subject_table = NULL;
GSList * cur;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
START_TIMING("");
if (!mlist) return;
(ctree, NULL, node, text, 2,
NULL, NULL,
FALSE, FALSE);
- if (vert && prefs_common.two_line_vert)
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert)
g_free(text[summaryview->col_pos[S_COL_SUBJECT]]);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
gint *col_pos = summaryview->col_pos;
gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
gboolean should_swap = FALSE;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
static const gchar *color_dim_rgb = NULL;
if (!color_dim_rgb)
color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
/* slow! */
if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible ||
- (vert && prefs_common.two_line_vert)) {
+ ((vert_layout || small_layout) && prefs_common.two_line_vert)) {
if (msginfo->date_t && msginfo->date_t > 0) {
procheader_date_get_localtime(date_modified,
sizeof(date_modified),
from_text = msginfo->from;
else {
from_text = msginfo->from;
- extract_address(from_text);
+ if (from_text)
+ extract_address(from_text);
}
if (!from_text)
_("(No From)");
#endif
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
_("(No Subject)");
- if (vert && prefs_common.two_line_vert) {
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert) {
if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) {
gchar *tmp = g_markup_printf_escaped(_("%s\n<span color='%s' style='italic'>From: %s, on %s</span>"),
text[col_pos[S_COL_SUBJECT]],
MarkAsReadData *mdata = (MarkAsReadData *)data;
if (!mdata)
return FALSE;
-
+
if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
- mdata->summaryview->selected);
+ mdata->summaryview->selected);
+ procmsg_msginfo_free(mdata->msginfo);
- g_free(mdata);
+ mdata->summaryview->mark_as_read_timeout_tag = 0;
- return FALSE;
+ g_free(mdata);
+ return FALSE;
}
static void summary_display_msg_full(SummaryView *summaryview,
prefs_common.mark_as_read_delay) {
MarkAsReadData *data = g_new0(MarkAsReadData, 1);
data->summaryview = summaryview;
- data->msginfo = msginfo;
-#if GLIB_CHECK_VERSION(2,14,0)
- g_timeout_add_seconds(prefs_common.mark_as_read_delay,
- msginfo_mark_as_read_timeout, data);
-#else
- g_timeout_add(prefs_common.mark_as_read_delay * 1000,
- msginfo_mark_as_read_timeout, data);
-#endif
+ data->msginfo = procmsg_msginfo_new_ref(msginfo);
+ if (summaryview->mark_as_read_timeout_tag != 0)
+ g_source_remove(summaryview->mark_as_read_timeout_tag);
+ summaryview->mark_as_read_timeout_tag =
+ g_timeout_add_seconds(prefs_common.mark_as_read_delay,
+ msginfo_mark_as_read_timeout, data);
} else if (new_window || !prefs_common.mark_as_read_on_new_window) {
msginfo_mark_as_read(summaryview, msginfo, row);
}
msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
source_window_show_msg(srcwin, msginfo);
source_window_show(srcwin);
-#ifdef MAEMO
- maemo_window_full_screen_if_needed(GTK_WINDOW(srcwin->window));
- maemo_connect_key_press_to_mainwindow(GTK_WINDOW(srcwin->window));
-#endif
}
void summary_reedit(SummaryView *summaryview)
static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
MsgInfo *msginfo;
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
- changed = TRUE;
}
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
- changed = TRUE;
}
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED,
if (prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this "
- "folder as read ?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+ "folder as read?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
if (summary_is_locked(summaryview)) return;
if (!summaryview->folder_item) return;
+
+ START_LONG_OPERATION(summaryview, FALSE);
if (!summaryview->folder_item->folder->account || summaryview->folder_item->folder->account->imap_use_trash) {
if (!prefs_common.live_dangerously) {
buf,
GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
g_free(buf);
- if (aval != G_ALERTALTERNATE) return;
+ if (aval != G_ALERTALTERNATE) {
+ END_LONG_OPERATION(summaryview);
+ return;
+ }
}
}
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
- START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
sel_last = GTK_CMCTREE_NODE(cur->data);
{
MsgInfo *msginfo, *full_msginfo;
gchar *from;
- GtkWidget *image = NULL;
GdkPixbuf *picture = NULL;
+ AvatarRender *avatarr;
msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
summaryview->selected);
extract_address(from);
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
- if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->face) {
- image = face_get_from_header(full_msginfo->extradata->face);
- }
-#if HAVE_LIBCOMPFACE
- else if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->xface) {
- image = xface_get_from_header(full_msginfo->extradata->xface,
- &summaryview->ctree->style->white,
- summaryview->mainwin->window->window);
- }
-#endif
+
+ avatarr = avatars_avatarrender_new(full_msginfo);
+ hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
+
procmsg_msginfo_free(full_msginfo);
- if (image)
- picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
+
+ if (avatarr->image)
+ picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
#ifndef USE_NEW_ADDRBOOK
addressbook_add_contact(msginfo->fromname, from, NULL, picture);
debug_print( "addressbook_add_contact - added\n" );
}
#endif
- if (image)
- gtk_widget_destroy(image);
+ avatars_avatarrender_free(avatarr);
}
void summary_select_all(SummaryView *summaryview)
if (node == summaryview->displayed) {
messageview_clear(summaryview->messageview);
+ summary_cancel_mark_read_timeout(summaryview);
summaryview->displayed = NULL;
}
if (GTK_CMCTREE_ROW(node)->children != NULL) {
if (node == summaryview->displayed) {
messageview_clear(summaryview->messageview);
+ summary_cancel_mark_read_timeout(summaryview);
summaryview->displayed = NULL;
}
if (GTK_CMCTREE_ROW(node)->children != NULL) {
if (node == summaryview->displayed)
summaryview->displayed = NULL;
+ summary_cancel_mark_read_timeout(summaryview);
+
for (top_parent = node;
GTK_CMCTREE_ROW(top_parent)->parent != NULL;
top_parent = GTK_CMCTREE_ROW(top_parent)->parent)
accel_path = g_strdup_printf("<ClawsColorLabels>/None");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
- gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
+ gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
if (i < 9)
- gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
+ gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
for (; sel != NULL; sel = sel->next) {
MsgInfo *msginfo;
GSList *tags = NULL;
- gint id;
GtkCheckMenuItem *item;
msginfo = gtk_cmctree_node_get_row_data
(GTK_CMCTREE(summaryview->ctree),
for (; tags; tags = tags->next) {
gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
- id = GPOINTER_TO_INT(tags->data);
item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
if (item && !gtk_check_menu_item_get_active(item)) {
gtk_check_menu_item_set_active
return tag_b == NULL ? 0:1;
if (tag_b == NULL)
- return tag_a == NULL ? 0:1;
+ return 1;
return g_utf8_collate(tag_a, tag_b);
}
gchar *formatted = NULL;
MsgInfo *info = NULL;
GdkRectangle rect;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
if (!prefs_common.show_tooltips)
return FALSE;
formatted = g_strdup(text);
g_strstrip(formatted);
- if (!vert)
- gtk_tooltip_set_text (tooltip, formatted);
- else if (prefs_common.two_line_vert)
+ if ((vert_layout || small_layout) && prefs_common.two_line_vert)
gtk_tooltip_set_markup (tooltip, formatted);
+ else
+ gtk_tooltip_set_text (tooltip, formatted);
g_free(formatted);
rect.x = x - 2;
gchar *titles[N_SUMMARY_COLS];
SummaryColumnType type;
gint pos;
- gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-
+ gboolean vert_layout = (prefs_common.layout_mode == VERTICAL_LAYOUT);
+ gboolean small_layout = (prefs_common.layout_mode == SMALL_LAYOUT);
memset(titles, 0, sizeof(titles));
col_state = prefs_summary_column_get_config();
ctree = gtk_sctree_new_with_titles
(N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
- /* get normal row height */
- gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
- normal_row_height = GTK_CMCLIST(ctree)->row_height;
-
if (prefs_common.show_col_headers == FALSE)
gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
- gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_EXTENDED);
+ gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_MARK],
GTK_JUSTIFY_CENTER);
gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[S_COL_STATUS],
FALSE);
if (((pos == summaryview->col_pos[S_COL_FROM] && !FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
(pos == summaryview->col_pos[S_COL_TO] && FOLDER_SHOWS_TO_HDR(summaryview->folder_item)) ||
- pos == summaryview->col_pos[S_COL_DATE]) && vert &&
+ pos == summaryview->col_pos[S_COL_DATE]) && (vert_layout || small_layout) &&
prefs_common.two_line_vert)
gtk_cmclist_set_column_visibility
(GTK_CMCLIST(ctree), pos, FALSE);
(GTK_CMCLIST(ctree), pos, col_state[pos].visible);
}
if (prefs_common.two_line_vert)
- gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert);
+ gtk_sctree_set_use_markup(GTK_SCTREE(ctree), summaryview->col_pos[S_COL_SUBJECT], vert_layout||small_layout);
/* connect signal to the buttons for sorting */
#define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(summary_button_pressed),
summaryview);
-#ifndef MAEMO
g_signal_connect(G_OBJECT(ctree), "popup-menu",
G_CALLBACK(summary_popup_menu), summaryview);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
- G_CALLBACK(summary_popup_menu), summaryview);
-#endif
g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(summary_button_released),
summaryview);
else
summary_redisplay_msg(summaryview);
- if (prefs_common.layout_mode == VERTICAL_LAYOUT &&
+ /* get normal row height */
+ gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+ normal_row_height = GTK_CMCLIST(ctree)->row_height;
+
+ if ((prefs_common.layout_mode == SMALL_LAYOUT || prefs_common.layout_mode == VERTICAL_LAYOUT) &&
prefs_common.two_line_vert) {
gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);
- } else {
- gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);
}
}
GtkCMCTree *ctree = GTK_CMCTREE(widget);
GtkCMCTreeNode *node;
MessageView *messageview;
- TextView *textview;
GtkAdjustment *adj;
gboolean mod_pressed;
return FALSE;
messageview = summaryview->messageview;
- textview = messageview->mimeview->textview;
mod_pressed =
((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
{
SummaryView *summaryview = data;
- summary_show(summaryview, summaryview->folder_item);
+ summaryview_reset_recursive_folder_match(summaryview);
+ if (summary_show(summaryview, summaryview->folder_item))
+ summaryview_quicksearch_recurse(summaryview);
+ else
+ summaryview_reset_recursive_folder_match(summaryview);
}
static void tog_searchbar_cb(GtkWidget *w, gpointer data)
static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
gint column, SummaryView *summaryview)
{
- GList *list, *cur;
+ const GList *list, *cur;
MessageView *msgview;
MsgInfo *msginfo;
gboolean marked_unread = FALSE;
summary_show(summaryview, summaryview->folder_item);
}
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
- guint action)
-{
- GtkWidget *widget;
-
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadMessages");
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(1));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
- guint action)
+static void summary_set_hide_menu (SummaryView *summaryview,
+ const gchar *menu_item,
+ guint action)
{
GtkWidget *widget;
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadThreads");
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(1));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
- guint action)
-{
- GtkWidget *widget;
+ widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, menu_item);
+ cm_return_if_fail(widget != NULL);
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideDelMessages");
g_object_set_data(G_OBJECT(widget), "dont_toggle",
GINT_TO_POINTER(1));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
guint new, unread, unreadmarked, marked, total;
guint replied, forwarded, locked, ignored, watched;
static gboolean tips_initialized = FALSE;
-#if !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *tips = summaryview->tooltips;
-#endif
if (prefs_common.layout_mode != SMALL_LAYOUT) {
if (tips_initialized) {
hookdata = source;
if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
summary_update_unread(summaryview, hookdata->item);
- quicksearch_folder_item_invalidate(summaryview->quicksearch,
- hookdata->item);
} else
summary_update_unread(summaryview, NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
- quicksearch_set(summaryview->quicksearch, QUICK_SEARCH_EXTENDED, buf);
+ quicksearch_set(summaryview->quicksearch, ADVANCED_SEARCH_EXTENDED, buf);
g_free(buf);
node = gtk_cmctree_node_nth(GTK_CMCTREE(summaryview->ctree), 0);