/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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 "sourcewindow.h"
#include "prefs_common.h"
#include "prefs_summary_column.h"
+#include "prefs_summary_open.h"
#include "prefs_filtering.h"
#include "account.h"
#include "compose.h"
#include "timing.h"
#include "gedit-print.h"
#include "log.h"
+#include "manual.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
static GdkBitmap *markxpmmask;
static GdkPixmap *deletedxpm;
static GdkBitmap *deletedxpmmask;
+static GdkPixmap *movedxpm;
+static GdkBitmap *movedxpmmask;
+static GdkPixmap *copiedxpm;
+static GdkBitmap *copiedxpmmask;
static GdkPixmap *newxpm;
static GdkBitmap *newxpmmask;
GSList *mlist);
static void summary_set_header (SummaryView *summaryview,
gchar *text[],
- MsgInfo *msginfo,
- gboolean *free_from);
+ MsgInfo *msginfo);
static void summary_display_msg (SummaryView *summaryview,
GtkCTreeNode *row);
static void summary_display_msg_full (SummaryView *summaryview,
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_unthread_for_exec (SummaryView *summaryview);
static void summary_unthread_for_exec_func (GtkCTree *ctree,
static gint summary_toggle_pressed (GtkWidget *eventbox,
GdkEventButton *event,
SummaryView *summaryview);
+#ifdef MAEMO
+static void summary_toggle_multiple_pressed
+ (GtkWidget *widget,
+ SummaryView *summaryview);
+#endif
+static gint summary_folder_eventbox_pressed
+ (GtkWidget *eventbox,
+ GdkEventButton *event,
+ SummaryView *summaryview);
static gboolean summary_button_pressed (GtkWidget *ctree,
GdkEventButton *event,
SummaryView *summaryview);
static gboolean summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static void summary_open_row (GtkSCTree *sctree,
- SummaryView *summaryview);
static void summary_tree_expanded (GtkCTree *ctree,
GtkCTreeNode *node,
SummaryView *summaryview);
gint y,
guint time,
SummaryView *summaryview);
-
+static void summary_drag_end(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ SummaryView *summaryview);
/* custom compare functions for sorting */
static gint summary_cmp_by_mark (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
-static void news_flag_crosspost (MsgInfo *msginfo);
-
static void quicksearch_execute_cb (QuickSearch *quicksearch,
gpointer data);
static void tog_searchbar_cb (GtkWidget *w,
MsgInfo *msg);
static gboolean summary_update_msg (gpointer source, gpointer data);
+static gboolean summary_update_folder_item_hook(gpointer source, gpointer data);
+static gboolean summary_update_folder_hook(gpointer source, gpointer data);
GtkTargetEntry summary_drag_types[2] =
{
{"text/uri-list", 0, TARGET_MAIL_URI_LIST},
- {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+ {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
};
static GtkItemFactoryEntry summary_popup_entries[] =
{N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Repl_y to/mailing _list"),
"<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
{N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
{N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
{N_("/Move to _trash"), "<control>D", summary_delete_trash, 0, NULL},
{N_("/_Delete..."), NULL, summary_delete, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", 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/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
{N_("/Create f_ilter rule"), NULL, NULL, 0, "<Branch>"},
NULL, summary_create_processing_cb, FILTER_BY_TO, NULL},
{N_("/Create processing rule/by _Subject"),
NULL, summary_create_processing_cb, FILTER_BY_SUBJECT, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Open in new _window"),
"<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_("/_View/Message _source"), "<control>U", summary_view_source, 0, NULL},
+ {N_("/_View/All _headers"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
{N_("/_Print..."), "<control>P", summary_print, 0, NULL},
}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
"", /* S_COL_LOCKED */
};
-#define START_LONG_OPERATION(summaryview) { \
+void summary_freeze(SummaryView *summaryview)
+{
+ if (summaryview)
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+}
+
+void summary_thaw(SummaryView *summaryview)
+{
+ if (summaryview)
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+}
+
+void summary_grab_focus(SummaryView *summaryview)
+{
+ if (summaryview)
+ gtk_widget_grab_focus(summaryview->ctree);
+}
+
+GtkWidget *summary_get_main_widget(SummaryView *summaryview)
+{
+ if (summaryview)
+ return summaryview->ctree;
+ else
+ return NULL;
+}
+
+#define START_LONG_OPERATION(summaryview,force_freeze) { \
summary_lock(summaryview); \
main_window_cursor_wait(summaryview->mainwin); \
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); \
+ if (force_freeze || sc_g_list_bigger(GTK_CLIST(summaryview->ctree)->selection, 1)) {\
+ froze = TRUE; \
+ summary_freeze(summaryview); \
+ } \
folder_item_update_freeze(); \
inc_lock(); \
hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST, \
#define END_LONG_OPERATION(summaryview) { \
inc_unlock(); \
folder_item_update_thaw(); \
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree)); \
+ if (froze) \
+ summary_thaw(summaryview); \
main_window_cursor_normal(summaryview->mainwin); \
summary_unlock(summaryview); \
summaryview->msginfo_update_callback_id = \
GtkWidget *ctree;
GtkWidget *hbox;
GtkWidget *hbox_l;
+ GtkWidget *stat_box;
+ GtkWidget *stat_box2;
+ GtkWidget *stat_vbox;
GtkWidget *statlabel_folder;
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
GtkWidget *hbox_spc;
GtkWidget *toggle_eventbox;
+#ifdef MAEMO
+ GtkWidget *multiple_sel_togbtn;
+#endif
GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
GtkWidget *toggle_search;
- GtkTooltips *search_tip;
GtkItemFactory *popupfactory;
gint n_entries;
QuickSearch *quicksearch;
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
+ summaryview->tips = gtk_tooltips_new();
#define SUMMARY_VBOX_SPACING 3
vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
hbox = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox);
- search_tip = gtk_tooltips_new();
+ stat_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(stat_vbox);
+
+ stat_box = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(stat_box);
+
+ stat_box2 = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(stat_box2);
+
toggle_search = gtk_toggle_button_new();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search),
prefs_common.show_searchbar);
gtk_widget_show(toggle_search);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
toggle_search,
_("Toggle quick search bar"), NULL);
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), stat_vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box2, TRUE, TRUE, 0);
+
hbox_l = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox_l);
- gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(stat_box), hbox_l, TRUE, TRUE, 0);
statlabel_folder = gtk_label_new("");
gtk_widget_show(statlabel_folder);
/* toggle view button */
toggle_eventbox = gtk_event_box_new();
gtk_widget_show(toggle_eventbox);
+
gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
+
toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
gtk_widget_show(toggle_arrow);
gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
g_signal_connect(G_OBJECT(toggle_eventbox), "button_press_event",
G_CALLBACK(summary_toggle_pressed),
summaryview);
-
+
+#ifdef MAEMO
+ multiple_sel_togbtn = gtk_toggle_button_new();
+ gtk_widget_show(multiple_sel_togbtn);
+ gtk_box_pack_end(GTK_BOX(hbox), multiple_sel_togbtn, FALSE, FALSE, 4);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
+ multiple_sel_togbtn,
+ _("Toggle multiple selection"), NULL);
+ g_signal_connect(G_OBJECT(multiple_sel_togbtn), "toggled",
+ G_CALLBACK(summary_toggle_multiple_pressed),
+ summaryview);
+#endif
statlabel_msgs = gtk_label_new("");
gtk_widget_show(statlabel_msgs);
- gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
+ gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, 4);
hbox_spc = gtk_hbox_new(FALSE, 0);
gtk_widget_show(hbox_spc);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+#endif
gtk_widget_set_size_request(vbox,
prefs_common.summaryview_width,
prefs_common.summaryview_height);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
/* status label */
+ gtk_widget_show_all(stat_vbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* quick search */
quicksearch = quicksearch_new();
gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
+#ifdef MAEMO
+ gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+#endif
quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
g_signal_connect (G_OBJECT(toggle_search), "toggled",
summaryview->ctree = ctree;
summaryview->hbox = hbox;
summaryview->hbox_l = hbox_l;
+ summaryview->hbox_spc = hbox_spc;
+ summaryview->stat_box = stat_box;
+ summaryview->stat_box2 = stat_box2;
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->toggle_eventbox = toggle_eventbox;
summaryview->toggle_arrow = toggle_arrow;
+#ifdef MAEMO
+ summaryview->multiple_sel_togbtn = multiple_sel_togbtn;
+#endif
summaryview->toggle_search = toggle_search;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
summaryview->lock_count = 0;
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
+ summaryview->folder_item_update_callback_id =
+ hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST,
+ summary_update_folder_item_hook,
+ (gpointer) summaryview);
+ summaryview->folder_update_callback_id =
+ hooks_register_hook(FOLDER_UPDATE_HOOKLIST,
+ summary_update_folder_hook,
+ (gpointer) summaryview);
summaryview->target_list = gtk_target_list_new(summary_drag_types, 2);
else
quicksearch_hide(quicksearch);
+ if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT ||
+ prefs_common.layout_mode == SMALL_LAYOUT)
+ gtk_widget_hide(summaryview->toggle_eventbox);
+
return summaryview;
}
+void summary_relayout(SummaryView *summaryview)
+{
+ gtk_widget_realize(summaryview->stat_box);
+
+ gtk_widget_ref(summaryview->hbox_l);
+ gtk_widget_ref(summaryview->statlabel_msgs);
+
+ gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
+ gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
+
+ switch (prefs_common.layout_mode) {
+ case NORMAL_LAYOUT:
+ case WIDE_LAYOUT:
+ case WIDE_MSGLIST_LAYOUT:
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(summaryview->stat_box), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+ gtk_widget_show_all(summaryview->stat_box);
+ gtk_widget_show_all(summaryview->stat_box2);
+ if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT ||
+ prefs_common.layout_mode == SMALL_LAYOUT)
+ gtk_widget_hide(summaryview->toggle_eventbox);
+ else
+ gtk_widget_show(summaryview->toggle_eventbox);
+ break;
+ case VERTICAL_LAYOUT:
+ case SMALL_LAYOUT:
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+ gtk_widget_show_all(summaryview->stat_box);
+ gtk_widget_show_all(summaryview->stat_box2);
+ if (prefs_common.layout_mode == SMALL_LAYOUT)
+ gtk_widget_hide(summaryview->toggle_eventbox);
+ else
+ gtk_widget_show(summaryview->toggle_eventbox);
+
+ break;
+ }
+ gtk_widget_unref(summaryview->hbox_l);
+ gtk_widget_unref(summaryview->statlabel_msgs);
+ quicksearch_relayout(summaryview->quicksearch);
+}
+
static void summary_set_fonts(SummaryView *summaryview)
{
PangoFontDescription *font_desc;
gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+ /* ici */
pango_font_description_free(font_desc);
}
+static void summary_set_folder_pixmap(SummaryView *summaryview, StockPixmap icon)
+{
+ GtkWidget *pixmap;
+ if (!summaryview->folder_pixmap_eventbox) {
+ summaryview->folder_pixmap_eventbox = gtk_event_box_new();
+ gtk_widget_show(summaryview->folder_pixmap_eventbox);
+ gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), summaryview->folder_pixmap_eventbox, FALSE, FALSE, 4);
+ gtk_box_reorder_child(GTK_BOX(summaryview->hbox_l), summaryview->folder_pixmap_eventbox, 0); /* search_toggle before */
+ g_signal_connect(G_OBJECT(summaryview->folder_pixmap_eventbox), "button_press_event",
+ G_CALLBACK(summary_folder_eventbox_pressed),
+ summaryview);
+ }
+ if (summaryview->folder_pixmap)
+ gtk_widget_destroy(summaryview->folder_pixmap);
+
+ pixmap = stock_pixmap_widget(summaryview->hbox_l, icon);
+ gtk_container_add(GTK_CONTAINER(summaryview->folder_pixmap_eventbox), pixmap);
+ gtk_widget_show(pixmap);
+ summaryview->folder_pixmap = pixmap;
+}
+
void summary_init(SummaryView *summaryview)
{
GtkWidget *pixmap;
&clipgpgsignedxpm, &clipgpgsignedxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
&spamxpm, &spamxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED,
+ &movedxpm, &movedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED,
+ &copiedxpm, &copiedxpmmask);
summary_set_fonts(summaryview);
- pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
- gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox_l), pixmap, 0);
- gtk_widget_show(pixmap);
- summaryview->folder_pixmap = pixmap;
+ summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
+
+#ifdef MAEMO
+ pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
+ gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
+ gtk_widget_show(pixmap);
+ summaryview->multiple_sel_image = pixmap;
+#endif
/* Init summaryview prefs */
summaryview->sort_key = SORT_BY_NONE;
if (!item)
return;
- if(FOLDER_SHOWS_TO_HDR(item))
+ if (FOLDER_SHOWS_TO_HDR(item))
show_to = TRUE;
else
show_from = TRUE;
summary_set_column_titles(summaryview);
}
+static gboolean summaryview_quicksearch_recurse(gpointer data)
+{
+ SummaryView *summaryview = (SummaryView *)data;
+ main_window_cursor_wait(summaryview->mainwin);
+ quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+ quicksearch_search_subfolders(summaryview->quicksearch,
+ summaryview->folderview,
+ summaryview->folder_item);
+ main_window_cursor_normal(summaryview->mainwin);
+ return FALSE;
+}
+
+static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
+{
+ int u = 0, n = 0, m = 0, t = 0;
+ GSList *cur;
+ START_TIMING("");
+ for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+ t++;
+ if (MSG_IS_NEW(msginfo->flags))
+ n++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ u++;
+ if (MSG_IS_MARKED(msginfo->flags))
+ m++;
+ }
+ if (t != item->total_msgs
+ || n != item->new_msgs
+ || u != item->unread_msgs
+ || m != item->marked_msgs
+ || (m == 0 && item->unreadmarked_msgs != 0)
+ || item->unreadmarked_msgs < 0) {
+ debug_print("Inconsistency\n");
+ folder_item_scan_full(item, FALSE);
+ END_TIMING();
+ return FALSE;
+ }
+ END_TIMING();
+ return TRUE;
+}
+
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
+ GtkCTreeNode *node = NULL;
GSList *mlist = NULL;
gchar *buf;
gboolean is_refresh;
if (!summaryview->mainwin)
return FALSE;
-
+ START_TIMING("");
+ summaryview->last_displayed = NULL;
summary_switch_from_to(summaryview, item);
inc_lock();
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
- if (!is_refresh)
+ if (!is_refresh) {
main_create_mailing_list_menu (summaryview->mainwin, NULL);
-
+ if (prefs_common.layout_mode == SMALL_LAYOUT) {
+ if (item) {
+ mainwindow_enter_folder(summaryview->mainwin);
+ gtk_widget_grab_focus(summaryview->ctree);
+ }
+ }
+ }
if (!prefs_common.summary_quicksearch_sticky
&& !prefs_common.summary_quicksearch_recurse
&& !quicksearch_is_running(summaryview->quicksearch)
} else {
summary_unlock(summaryview);
inc_unlock();
+ END_TIMING();
return FALSE;
}
if (changed || !quicksearch_is_active(summaryview->quicksearch))
folder_update_op_count();
}
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
summary_clear_list(summaryview);
summary_set_hide_read_msgs_menu(summaryview, FALSE);
summary_clear_all(summaryview);
summaryview->folder_item = item;
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
summary_unlock(summaryview);
inc_unlock();
if (item && quicksearch_is_running(summaryview->quicksearch)) {
summaryview->folderview,
summaryview->folder_item);
main_window_cursor_normal(summaryview->mainwin);
- }
+ }
+ END_TIMING();
return TRUE;
}
g_free(buf);
mlist = folder_item_get_msg_list(item);
+ if (!summary_check_consistency(item, mlist)) {
+ debug_print("reloading due to inconsistency\n");
+ procmsg_msg_list_free(mlist);
+ mlist = folder_item_get_msg_list(item);
+ }
+
if (summaryview->folder_item->hide_read_msgs &&
quicksearch_is_active(summaryview->quicksearch) == FALSE) {
GSList *not_killed;
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, 50);
+ 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);
- GTK_EVENTS_FLUSH();
+ 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_running(summaryview->quicksearch)) {
- /* only scan subfolders when quicksearch changed,
- * not when search is the same and folder changed */
- main_window_cursor_wait(summaryview->mainwin);
- quicksearch_reset_cur_folder_item(summaryview->quicksearch);
- quicksearch_search_subfolders(summaryview->quicksearch,
- summaryview->folderview,
- summaryview->folder_item);
- main_window_cursor_normal(summaryview->mainwin);
- }
-
if (!quicksearch_is_active(summaryview->quicksearch)) {
debug_print("search cancelled!\n");
- gtk_clist_thaw(GTK_CLIST(ctree));
+ 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();
}
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) {
- summaryview->displayed =
- summary_find_msg_by_msgnum(summaryview,
- displayed_msgnum);
- if (!summaryview->displayed)
- messageview_clear(summaryview->messageview);
- summary_unlock(summaryview);
- summary_select_by_msgnum(summaryview, selected_msgnum);
- summary_lock(summaryview);
- if (!summaryview->selected) {
- /* no selected message - select first unread
- message, but do not display it */
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+ if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
+ summaryview->last_displayed = summaryview->displayed;
+ summaryview->displayed =
+ summary_find_msg_by_msgnum(summaryview,
+ displayed_msgnum);
+ if (!summaryview->displayed)
+ messageview_clear(summaryview->messageview);
+ summary_unlock(summaryview);
+ summary_select_by_msgnum(summaryview, selected_msgnum);
+ summary_lock(summaryview);
+ if (!summaryview->selected) {
+ /* no selected message - select first unread
+ message, but do not display it */
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+ node = gtk_ctree_node_nth
+ (ctree,
+ item->sort_type == SORT_DESCENDING
+ ? 0 : GTK_CLIST(ctree)->rows - 1);
+ summary_unlock(summaryview);
+ summary_select_node(summaryview, node, FALSE, TRUE);
+ summary_lock(summaryview);
+ }
+ } else {
+ /* just select first/last */
+ if (GTK_CLIST(ctree)->row_list != NULL)
node = gtk_ctree_node_nth
(ctree,
item->sort_type == SORT_DESCENDING
? 0 : GTK_CLIST(ctree)->rows - 1);
- summary_unlock(summaryview);
- summary_select_node(summaryview, node, FALSE, TRUE);
- summary_lock(summaryview);
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
} else {
- switch (prefs_common.select_on_entry) {
- case SELECTONENTRY_MNU:
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_NEW, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
+ /* backward compat */
+ int i = 0;
+ gboolean set = FALSE, stop = FALSE;
+ for (i = 0; i < 6; i++) {
+ EntryAction act = prefs_common.summary_select_prio[i];
+
+ if (act != ACTION_UNSET) {
+ set = TRUE;
break;
- case SELECTONENTRY_MUN:
+ }
+ }
+ if (!set)
+ prefs_summary_open_set_defaults();
+
+ for (i = 0; i < 6 && node == NULL; i++) {
+ EntryAction act = prefs_common.summary_select_prio[i];
+
+ switch(act) {
+ case ACTION_MARKED:
node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_NEW, FALSE);
+ MSG_MARKED, FALSE);
break;
- case SELECTONENTRY_NMU:
+ case ACTION_NEW:
node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_NEW, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
+ MSG_NEW, FALSE);
break;
- case SELECTONENTRY_NUM:
+ case ACTION_UNREAD:
node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_NEW, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, FALSE);
+ MSG_UNREAD, FALSE);
break;
- case SELECTONENTRY_UNM:
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_NEW, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, FALSE);
+ case ACTION_LAST_OPENED:
+ if (summaryview->folder_item) {
+ node = summary_find_msg_by_msgnum(summaryview,
+ summaryview->folder_item->last_seen);
+ }
break;
- case SELECTONENTRY_UMN:
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, FALSE);
- if (node == NULL)
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_NEW, FALSE);
+ case ACTION_LAST_LIST:
+ if (GTK_CLIST(ctree)->row_list != NULL) {
+ node = gtk_ctree_node_nth
+ (ctree,
+ item->sort_type == SORT_DESCENDING
+ ? 0 : GTK_CLIST(ctree)->rows - 1);
+ }
break;
- default:
+ case ACTION_NOTHING:
+ case ACTION_UNSET:
node = NULL;
- }
-
- if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
- node = gtk_ctree_node_nth
- (ctree,
- item->sort_type == SORT_DESCENDING
- ? 0 : GTK_CLIST(ctree)->rows - 1);
+ stop = TRUE;
+ break;
+ }
+
+ if (stop || node)
+ break;
}
+
summary_unlock(summaryview);
- summary_select_node(summaryview, node,
+ if (node)
+ summary_select_node(summaryview, node,
prefs_common.always_show_msg,
TRUE);
summary_lock(summaryview);
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
summary_unlock(summaryview);
inc_unlock();
-
+ END_TIMING();
return TRUE;
}
GtkCList *clist = GTK_CLIST(summaryview->ctree);
gint optimal_width;
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
NULL, summary_free_msginfo_func, NULL);
optimal_width);
}
- gtk_clist_thaw(clist);
+ summary_thaw(summaryview);
}
void summary_clear_all(SummaryView *summaryview)
return mlist;
}
-GSList *summary_get_msg_list(SummaryView *summaryview)
-{
- GSList *mlist = NULL;
- GtkCTree *ctree;
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- ctree = GTK_CTREE(summaryview->ctree);
-
- for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- mlist = g_slist_prepend(mlist, msginfo);
- }
-
- mlist = g_slist_reverse(mlist);
-
- return mlist;
-}
-
void summary_set_menu_sensitive(SummaryView *summaryview)
{
GtkItemFactory *ifactory = summaryview->popupfactory;
{"/Mark/Mark as unread" , M_TARGET_EXIST},
{"/Mark/Mark all read" , M_TARGET_EXIST},
{"/Mark/Ignore thread" , M_TARGET_EXIST},
+ {"/Mark/Unignore thread" , M_TARGET_EXIST},
{"/Mark/Lock" , M_TARGET_EXIST},
{"/Mark/Unlock" , M_TARGET_EXIST},
{"/Mark/Mark as spam" , M_TARGET_EXIST|M_CAN_LEARN_SPAM},
{"/View" , M_SINGLE_TARGET_EXIST},
{"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
- {"/View/Source" , M_SINGLE_TARGET_EXIST},
- {"/View/All header" , M_SINGLE_TARGET_EXIST},
+ {"/View/Message source" , M_SINGLE_TARGET_EXIST},
+ {"/View/All headers" , M_SINGLE_TARGET_EXIST},
{"/Save as..." , M_TARGET_EXIST},
{"/Print..." , M_TARGET_EXIST},
{NULL, 0}
summary_lock(summaryview);
- menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
+ menuitem = gtk_item_factory_get_widget(ifactory, "/View/All headers");
if (summaryview->messageview
&& summaryview->messageview->mimeview
&& summaryview->messageview->mimeview->textview)
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_unread(summaryview->folderview);
+ folderview_select_next_unread(summaryview->folderview, TRUE);
return;
}
else
void summary_select_next_marked(SummaryView *summaryview)
{
- GtkCTreeNode *node;
+ GtkCTreeNode *node = summaryview->selected;
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping cur (%p %p)\n",
+ summaryview->displayed, summaryview->selected);
+ skip_cur = TRUE;
+ }
+
node = summary_find_next_flagged_msg
- (summaryview, summaryview->selected, MSG_MARKED, TRUE);
+ (summaryview, node, MSG_MARKED, skip_cur);
+
+ if (node)
+ summary_select_node(summaryview, node, TRUE, FALSE);
+ else {
+ node = summary_find_next_flagged_msg
+ (summaryview, NULL, MSG_MARKED, FALSE);
+ if (node == NULL || node == summaryview->selected) {
+ AlertValue val = 0;
- if (!node) {
- AlertValue val;
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more marked messages"),
+ _("No marked message found. "
+ "Go to next folder?"),
+ GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ val = G_ALERTALTERNATE;
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ val = G_ALERTOTHER;
+ break;
+ default:
+ debug_print(
+ _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+ }
- val = alertpanel(_("No more marked messages"),
- _("No marked message found. "
- "Search from the beginning?"),
- GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
- if (val != G_ALERTALTERNATE) return;
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_MARKED, TRUE);
- }
+ if (val == G_ALERTALTERNATE) {
+ folderview_select_next_marked(summaryview->folderview);
+ return;
+ }
+ else
+ return;
+ } else
+ summary_select_node(summaryview, node, TRUE, FALSE);
- if (!node)
- alertpanel_notice(_("No marked messages."));
- else
- summary_select_node(summaryview, node, TRUE, FALSE);
+ }
}
void summary_select_prev_labeled(SummaryView *summaryview)
summary_select_node(summaryview, node, TRUE, FALSE);
}
+void summary_select_last_read(SummaryView *summaryview)
+{
+ if (summaryview->last_displayed)
+ summary_select_node(summaryview, summaryview->last_displayed, TRUE, FALSE);
+}
+
+void summary_select_parent(SummaryView *summaryview)
+{
+ GtkCTreeNode *node = NULL;
+
+ if (summaryview->selected)
+ node = GTK_CTREE_ROW(summaryview->selected)->parent;
+ if (node)
+ summary_select_node(summaryview, node, TRUE, FALSE);
+}
+
void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
{
GtkCTreeNode *node;
summary_select_node(summaryview, node, FALSE, TRUE);
}
+typedef struct _PostponedSelectData
+{
+ GtkCTree *ctree;
+ GtkCTreeNode *row;
+ GtkCTreeNode *node;
+ GtkScrollType type;
+ gint column;
+ SummaryView *summaryview;
+ gboolean display_msg;
+ gboolean do_refresh;
+} PostponedSelectData;
+
+static gboolean summary_select_retry(void *data)
+{
+ PostponedSelectData *psdata = (PostponedSelectData *)data;
+ debug_print("trying again\n");
+ if (psdata->row)
+ summary_selected(psdata->ctree, psdata->row,
+ psdata->column, psdata->summaryview);
+ else if (psdata->node)
+ summary_select_node(psdata->summaryview, psdata->node,
+ psdata->display_msg, psdata->do_refresh);
+ else
+ summary_step(psdata->summaryview, psdata->type);
+ g_free(psdata);
+ return FALSE;
+}
+
/**
* summary_select_node:
* @summaryview: Summary view.
gboolean display_msg, gboolean do_refresh)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- if (summary_is_locked(summaryview))
+
+ if (summary_is_locked(summaryview)
+ && !GTK_SCTREE(ctree)->selecting_range
+ && summaryview->messageview->mimeview
+ && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
+ && summaryview->messageview->mimeview->textview->loading) {
+ PostponedSelectData *data = g_new0(PostponedSelectData, 1);
+ summaryview->messageview->mimeview->textview->stop_loading = TRUE;
+
+ data->ctree = ctree;
+ data->row = NULL;
+ data->node = node;
+ data->summaryview = summaryview;
+ data->display_msg = display_msg;
+ data->do_refresh = do_refresh;
+ debug_print("postponing open of message till end of load\n");
+ g_timeout_add(100, summary_select_retry, data);
+ return;
+ }
+ if (summary_is_locked(summaryview)) {
return;
+ }
if (!summaryview->folder_item)
return;
if (node) {
GTK_EVENTS_FLUSH();
summary_unlock(summaryview);
gtk_widget_grab_focus(GTK_WIDGET(ctree));
- if (GTK_CTREE_ROW(node) == NULL) {
- g_warning("crash avoidance hack 1\n");
- return;
- }
- if (((GtkCListRow *)(GTK_CTREE_ROW(node)))->state < GTK_STATE_NORMAL
- || ((GtkCListRow *)(GTK_CTREE_ROW(node)))->state > GTK_STATE_INSENSITIVE) {
- g_warning("crash avoidance hack 2\n");
- return;
- }
gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
- summary_unselect_all(summaryview);
if (display_msg && summaryview->displayed == node)
summaryview->displayed = NULL;
summaryview->display_msg = display_msg;
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
+ if (msginfo && !MSG_IS_DELETED(msginfo->flags)
+ && !MSG_IS_MOVE(msginfo->flags)) break;
}
return node;
_("Attracting messages by subject..."));
main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
subject_table = g_hash_table_new(attract_hash_func,
attract_compare_func);
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
- gtk_clist_thaw(clist);
+ summary_thaw(summaryview);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (msginfo && msginfo->folder && msginfo->folder->folder &&
- msginfo->folder->folder->klass->type == F_NEWS)
- news_flag_crosspost(msginfo);
-
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), "");
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), "");
+ toolbar_main_set_sensitive(summaryview->mainwin);
return;
}
to_human_readable(n_size));
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
+ toolbar_main_set_sensitive(summaryview->mainwin);
}
static void summary_set_column_titles(SummaryView *summaryview)
case S_COL_DATE:
case S_COL_NUMBER:
if(type == S_COL_FROM && item != NULL &&
- FOLDER_SHOWS_TO_HDR(item))
+ FOLDER_SHOWS_TO_HDR(item) &&
+ !summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible)
type = S_COL_TO;
- if (prefs_common.trans_hdr)
+ if(type == S_COL_NUMBER)
title = gettext(col_label[type]);
else
- title = col_label[type];
+ title = prefs_common_translated_header_name(col_label[type]);
break;
default:
title = gettext(col_label[type]);
label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Attachment"));
continue;
} else if (type == S_COL_MARK) {
label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Mark"));
continue;
} else if (type == S_COL_LOCKED) {
label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Locked"));
continue;
} else if (type == S_COL_STATUS) {
gtk_clist_set_column_title(clist, pos, title);
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Status"));
continue;
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func = NULL;
- START_TIMING("summary_sort");
+ START_TIMING("");
g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ summary_freeze(summaryview);
switch (sort_key) {
case SORT_BY_MARK:
main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_freeze(clist);
gtk_clist_set_compare_func(clist, cmp_func);
gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
- gtk_clist_thaw(clist);
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
}
unlock:
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
END_TIMING();
}
-gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
+static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
GtkCTreeNode *cnode, gpointer data)
{
SummaryView *summaryview = (SummaryView *)data;
gint *col_pos = summaryview->col_pos;
const gchar *msgid = msginfo->msgid;
GHashTable *msgid_table = summaryview->msgid_table;
- gboolean free_from = FALSE;
- summary_set_header(summaryview, text, msginfo, &free_from);
+ summary_set_header(summaryview, text, msginfo);
gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE, summaryview->threaded && !summaryview->thread_collapsed);
if (summaryview->col_state[summaryview->col_pos[S_COL_TO]].visible)
SET_TEXT(S_COL_TO);
- if (free_from) {
- g_free(text[col_pos[S_COL_FROM]]);
- text[col_pos[S_COL_FROM]] = NULL;
- }
-
#undef SET_TEXT
GTKUT_CTREE_NODE_SET_ROW_DATA(cnode, msginfo);
MsgInfo *msginfo;
GtkCTreeNode *node = NULL;
GHashTable *msgid_table;
- GHashTable *subject_table;
+ GHashTable *subject_table = NULL;
GSList * cur;
- START_TIMING("summary_set_ctree_from_list");
+ START_TIMING("");
if (!mlist) return;
- debug_print("\tSetting summary from message data...");
+ debug_print("\tSetting summary from message data...\n");
STATUSBAR_PUSH(summaryview->mainwin,
_("Setting summary from message data..."));
gdk_flush();
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
summaryview->msgid_table = msgid_table;
- subject_table = g_hash_table_new(g_str_hash, g_str_equal);
- summaryview->subject_table = subject_table;
+
+ if (prefs_common.thread_by_subject) {
+ subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+ summaryview->subject_table = subject_table;
+ } else {
+ summaryview->subject_table = NULL;
+ }
if (prefs_common.use_addr_book)
- start_address_completion();
+ start_address_completion(NULL);
if (summaryview->threaded) {
GNode *root, *gnode;
- START_TIMING("summaryview_set_ctree_from_list(1)");
+ START_TIMING("threaded");
root = procmsg_get_thread_tree(mlist);
for (gnode = root->children; gnode != NULL;
END_TIMING();
} else {
gchar *text[N_SUMMARY_COLS];
- gboolean free_from = FALSE;
- gint *col_pos = summaryview->col_pos;
- START_TIMING("summaryview_set_ctree_from_list(2)");
+ START_TIMING("unthreaded");
cur = mlist;
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
- summary_set_header(summaryview, text, msginfo, &free_from);
+ summary_set_header(summaryview, text, msginfo);
node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
NULL, NULL, NULL, NULL,
FALSE, FALSE);
- if (free_from) {
- g_free(text[col_pos[S_COL_FROM]]);
- text[col_pos[S_COL_FROM]] = NULL;
- }
+
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
- subject_table_insert(subject_table,
+ if (prefs_common.thread_by_subject)
+ subject_table_insert(subject_table,
msginfo->subject,
node);
}
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",
+ if (prefs_common.thread_by_subject)
+ debug_print("\tsubject hash table size = %d\n",
g_hash_table_size(subject_table));
}
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
if (prefs_common.bold_unread) {
- START_TIMING("summaryview_set_ctree_from_list(3)");
+ START_TIMING("bold_unread");
while (node) {
GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
if (GTK_CTREE_ROW(node)->children)
}
static void summary_set_header(SummaryView *summaryview, gchar *text[],
- MsgInfo *msginfo, gboolean *free_from)
+ MsgInfo *msginfo)
{
static gchar date_modified[80];
static gchar col_score[11];
else
text[col_pos[S_COL_NUMBER]] = "";
+ /* slow! */
if (summaryview->col_state[summaryview->col_pos[S_COL_SIZE]].visible)
text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
else
else
text[col_pos[S_COL_SCORE]] = "";
+ /* slow! */
if (summaryview->col_state[summaryview->col_pos[S_COL_DATE]].visible) {
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
msginfo->fromname :
_("(No From)");
} else {
+ gchar buf[BUFFSIZE];
gchar *tmp = summary_complete_address(msginfo->from);
- from_text = tmp ? tmp : (msginfo->fromname ?
- msginfo->fromname:
- _("(No From)"));
+ if (tmp) {
+ strncpy2(buf, tmp, sizeof(buf));
+ g_free(tmp);
+ from_text = buf;
+ } else {
+ from_text = (msginfo->fromname) ?
+ msginfo->fromname:
+ _("(No From)");
+ }
}
to_text = msginfo->to ? msginfo->to :
text[col_pos[S_COL_TO]] = to_text;
if (!should_swap) {
text[col_pos[S_COL_FROM]] = from_text;
- *free_from = FALSE;
} else {
- gchar *tmp = NULL;
- tmp = g_strconcat("-->", to_text, NULL);
+ gchar tmp[BUFFSIZE];
+ snprintf(tmp, BUFFSIZE-1, "--> %s", to_text);
+ tmp[BUFFSIZE-1]='\0';
text[col_pos[S_COL_FROM]] = tmp;
- *free_from = TRUE;
}
if (summaryview->simplify_subject_preg != NULL)
typedef struct {
MsgInfo *msginfo;
SummaryView *summaryview;
- GtkCTreeNode *row;
} MarkAsReadData;
static int msginfo_mark_as_read_timeout(void *data)
if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
- mdata->row);
+ mdata->summaryview->selected);
g_free(mdata);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
gint val;
- START_TIMING("summary_display_msg_full");
+ START_TIMING("");
if (!new_window) {
if (summaryview->displayed == row)
return;
- else
+ else if (summaryview->messageview)
summaryview->messageview->filtered = FALSE;
}
g_return_if_fail(row != NULL);
g_return_if_fail(msginfo);
- if (new_window) {
+ if (new_window && prefs_common.layout_mode != SMALL_LAYOUT) {
MessageView *msgview;
msgview = messageview_create_with_new_window(summaryview->mainwin);
} else {
MessageView *msgview;
- msgview = summaryview->messageview;
-
- summaryview->displayed = row;
- if (!messageview_is_visible(msgview)) {
- main_window_toggle_message_view(summaryview->mainwin);
- GTK_EVENTS_FLUSH();
+ if (prefs_common.layout_mode == SMALL_LAYOUT) {
+ if (summaryview->ext_messageview == NULL)
+ summaryview->ext_messageview = messageview_create_with_new_window(summaryview->mainwin);
+ else
+ gtkut_window_popup(summaryview->ext_messageview->window);
+ msgview = summaryview->ext_messageview;
+ summaryview->last_displayed = summaryview->displayed;
+ summaryview->displayed = row;
+ val = messageview_show(msgview, msginfo, all_headers);
+ if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
+ gtk_widget_grab_focus(summaryview->ctree);
+ gtkut_ctree_node_move_if_on_the_edge(ctree, row,
+ GTK_CLIST(summaryview->ctree)->focus_row);
+ } else {
+ msgview = summaryview->messageview;
+ summaryview->last_displayed = summaryview->displayed;
+ summaryview->displayed = row;
+ if (!messageview_is_visible(msgview)) {
+ main_window_toggle_message_view(summaryview->mainwin);
+ GTK_EVENTS_FLUSH();
+ }
+ val = messageview_show(msgview, msginfo, all_headers);
+ if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
+ gtk_widget_grab_focus(summaryview->ctree);
+ gtkut_ctree_node_move_if_on_the_edge(ctree, row,
+ GTK_CLIST(summaryview->ctree)->focus_row);
}
- val = messageview_show(msgview, msginfo, all_headers);
- if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
- gtk_widget_grab_focus(summaryview->ctree);
- gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
if (val == 0 && MSG_IS_UNREAD(msginfo->flags)) {
MarkAsReadData *data = g_new0(MarkAsReadData, 1);
data->summaryview = summaryview;
data->msginfo = msginfo;
- data->row = row;
- gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
+ g_timeout_add(prefs_common.mark_as_read_delay * 1000,
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);
/* CLAWS: if separate message view, don't open a new window
* but rather use the current separated message view */
- summary_display_msg_full(summaryview, summaryview->selected,
- prefs_common.sep_msg ? FALSE : TRUE,
- FALSE);
+ summary_display_msg_full(summaryview, summaryview->selected,
+ TRUE, FALSE);
}
void summary_view_source(SummaryView * summaryview)
msginfo = gtk_ctree_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)
summaryview->selected);
if (!msginfo) return;
- compose_reedit(msginfo);
+ compose_reedit(msginfo, FALSE);
}
gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
- if (summary_is_locked(summaryview)) return FALSE;
+ if (summary_is_locked(summaryview)
+ && !GTK_SCTREE(ctree)->selecting_range
+ && summaryview->messageview->mimeview
+ && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
+ && summaryview->messageview->mimeview->textview->loading) {
+ PostponedSelectData *data = g_new0(PostponedSelectData, 1);
+ summaryview->messageview->mimeview->textview->stop_loading = TRUE;
+
+ data->ctree = ctree;
+ data->row = NULL;
+ data->node = NULL;
+ data->type = type;
+ data->summaryview = summaryview;
+ debug_print("postponing open of message till end of load\n");
+ g_timeout_add(100, summary_select_retry, data);
+ return FALSE;
+ }
+ if (summary_is_locked(summaryview))
+ return FALSE;
if (type == GTK_SCROLL_STEP_FORWARD) {
node = gtkut_ctree_node_next(ctree, summaryview->selected);
if (node)
void summary_toggle_view(SummaryView *summaryview)
{
+ if (prefs_common.layout_mode == SMALL_LAYOUT)
+ return;
if (!messageview_is_visible(summaryview->messageview) &&
summaryview->selected)
summary_display_msg(summaryview,
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, col_pos[S_COL_MARK], "o");
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+ movedxpm, movedxpmmask);
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, col_pos[S_COL_MARK], "O");
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+ copiedxpm, copiedxpmmask);
if (style)
style = bold_marked_style;
else {
summaryview->copied--;
procmsg_msginfo_set_to_folder(msginfo, NULL);
- summary_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+ summary_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED,
+ MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
}
changed = TRUE;
}
procmsg_msginfo_set_to_folder(msginfo, NULL);
- summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+ summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED,
+ MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
msginfo->msgnum);
}
-void summary_mark_as_read
-(SummaryView *summaryview)
+void summary_mark_as_read(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
summary_lock_row(summaryview,
GTK_CTREE_NODE(cur->data));
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
summary_unlock_row(summaryview,
GTK_CTREE_NODE(cur->data));
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
AlertValue val;
+ gboolean froze = FALSE;
if (prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
prefs_common.ask_mark_all_read = FALSE;
}
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, TRUE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node))
GSList *msgs = NULL;
gboolean immediate_exec = prefs_common.immediate_exec;
gboolean moved = FALSE;
+ gboolean froze = FALSE;
+
prefs_common.immediate_exec = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
continue;
if (is_spam) {
summary_msginfo_change_flags(msginfo, MSG_SPAM, 0, MSG_NEW|MSG_UNREAD, 0);
- if (procmsg_spam_get_folder() != summaryview->folder_item) {
- summary_move_row_to(summaryview, row, procmsg_spam_get_folder());
+ if (procmsg_spam_get_folder(msginfo) != summaryview->folder_item) {
+ summary_move_row_to(summaryview, row,
+ procmsg_spam_get_folder(msginfo));
moved = TRUE;
}
} else {
summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
}
+ summaryview->display_msg = prefs_common.always_show_msg;
+
summary_set_row_marks(summaryview, row);
}
} else {
- log_error(_("An error happened while learning.\n"));
+ log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
}
- g_slist_free(msgs);
-
prefs_common.immediate_exec = immediate_exec;
END_LONG_OPERATION(summaryview);
summary_execute(summaryview);
}
+ if (!moved && msgs) {
+ MsgInfo *msginfo = (MsgInfo *)msgs->data;
+ toolbar_set_learn_button
+ (summaryview->mainwin->toolbar,
+ MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+ }
+ g_slist_free(msgs);
+
summary_status_show(summaryview);
}
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL;
cur = cur->next)
summaryview->copied--;
procmsg_msginfo_set_to_folder(msginfo, NULL);
- summary_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED, MSG_MOVE | MSG_COPY);
+ summary_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED,
+ MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
summaryview->deleted++;
if (!prefs_common.immediate_exec &&
void summary_cancel(SummaryView *summaryview)
{
MsgInfo * msginfo;
- GtkCList *clist = GTK_CLIST(summaryview->ctree);
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
summary_lock(summaryview);
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
summary_update_status(summaryview);
summary_status_show(summaryview);
- gtk_clist_thaw(clist);
+ summary_thaw(summaryview);
summary_unlock(summaryview);
}
GtkCTreeNode *node;
AlertValue aval;
MsgInfo *msginfo;
+ gboolean froze = FALSE;
if (!item) return;
if (!summaryview->folder_item) return;
- aval = alertpanel(_("Delete message(s)"),
- _("Do you really want to delete selected message(s)?"),
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
- if (aval != G_ALERTALTERNATE) return;
+ if (!prefs_common.live_dangerously) {
+ gchar *buf = NULL;
+ int num = g_list_length(GTK_CLIST(summaryview->ctree)->selection);
+ if (num == 1)
+ buf = g_strdup_printf(_(
+ "Do you really want to delete the selected message?"));
+ else
+ buf = g_strdup_printf(_(
+ "Do you really want to delete the %d selected messages?"),
+ num);
+ aval = alertpanel(_("Delete message(s)"),
+ buf,
+ GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL);
+ g_free(buf);
+ if (aval != G_ALERTALTERNATE) return;
+ }
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL;
cur = cur->next) {
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
sel_last = GTK_CTREE_NODE(cur->data);
summaryview->copied--;
procmsg_msginfo_set_to_folder(msginfo, NULL);
- summary_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
+ summary_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED,
+ MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is unmarked\n",
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
folder_item_set_batch(summaryview->folder_item, TRUE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
summaryview->copied--;
}
if (!MSG_IS_MOVE(msginfo->flags)) {
- summary_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_DELETED, MSG_COPY);
+ summary_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_DELETED,
+ MSG_COPY | MSG_MOVE_DONE);
summaryview->moved++;
} else {
summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_COPY);
void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
{
GList *cur;
+ GtkCTreeNode *sel_last = NULL;
+ gboolean froze = FALSE;
if (!to_folder) return;
if (!summaryview->folder_item ||
return;
}
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(summaryview->ctree)->selection;
- cur != NULL && cur->data != NULL; cur = cur->next)
+ cur != NULL && cur->data != NULL; cur = cur->next) {
+ sel_last = GTK_CTREE_NODE(cur->data);
summary_move_row_to
(summaryview, GTK_CTREE_NODE(cur->data), to_folder);
-
+ }
END_LONG_OPERATION(summaryview);
summaryview->display_msg = prefs_common.always_show_msg;
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
+ GtkCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
+ if (!node)
+ node = summary_find_prev_msg(summaryview, sel_last);
+ summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
summary_status_show(summaryview);
}
}
if (!MSG_IS_COPY(msginfo->flags)) {
- summary_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_DELETED, MSG_MOVE);
+ summary_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_DELETED,
+ MSG_MOVE | MSG_MOVE_DONE);
summaryview->copied++;
} else {
summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE);
void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
{
GList *cur;
+ gboolean froze = FALSE;
if (!to_folder) return;
if (!summaryview->folder_item) return;
return;
}
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL && cur->data != NULL; cur = cur->next)
summary_status_show(summaryview);
}
-void summary_select_thread(SummaryView *summaryview)
+void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node = summaryview->selected;
-
- if (!node) return;
+ GtkCTreeNode *node = NULL;
+ gboolean froze = FALSE;
+ GList *cur = NULL;
+ GList *copy = NULL;
+ if (!GTK_CLIST(summaryview->ctree)->selection)
+ return;
- while (GTK_CTREE_ROW(node)->parent != NULL)
- node = GTK_CTREE_ROW(node)->parent;
- if (node != summaryview->selected)
- summary_select_node
- (summaryview, node,
- messageview_is_visible(summaryview->messageview),
- FALSE);
+ START_LONG_OPERATION(summaryview, FALSE);
+ copy = g_list_copy(GTK_CLIST(summaryview->ctree)->selection);
+ for (cur = copy; cur != NULL && cur->data != NULL;
+ cur = cur->next) {
+ node = GTK_CTREE_NODE(cur->data);
+ if (!node)
+ continue;
+ while (GTK_CTREE_ROW(node)->parent != NULL)
+ node = GTK_CTREE_ROW(node)->parent;
- gtk_ctree_select_recursive(ctree, node);
+ gtk_ctree_select_recursive(ctree, node);
+ }
+ g_list_free(copy);
+ END_LONG_OPERATION(summaryview);
+ if (delete_thread) {
+ if (FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS)
+ summary_delete(summaryview);
+ else
+ summary_delete_trash(summaryview);
+ }
summary_status_show(summaryview);
}
Xstrdup_a(filename, msginfo->subject, return);
subst_for_filename(filename);
}
- if (g_getenv ("G_BROKEN_FILENAMES") &&
- filename && !g_utf8_validate(filename, -1, NULL)) {
+ if (filename && !g_utf8_validate(filename, -1, NULL)) {
gchar *oldstr = filename;
filename = conv_codeset_strdup(filename,
conv_get_locale_charset_str(),
CS_UTF_8);
if (!filename) {
- g_warning("summary_save_as(): faild to convert character set.");
+ g_warning("summary_save_as(): failed to convert character set.");
filename = g_strdup(oldstr);
}
dest = filesel_select_file_save(_("Save as"), filename);
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file '%s'."), tmp);
+ alertpanel_error(_("Couldn't save the file '%s'."), tmp);
} else { /* overwrite */
if (copy_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file '%s'."), tmp);
+ alertpanel_error(_("Couldn't save the file '%s'."), tmp);
}
g_free(src);
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file '%s'."), tmp);
+ alertpanel_error(_("Couldn't save the file '%s'."), tmp);
}
g_free(src);
}
g_free(tmp);
}
-#ifdef USE_GNOMEPRINT
-static void print_mimeview(MimeView *mimeview)
-{
- if (!mimeview
- || !mimeview->textview
- || !mimeview->textview->text)
- alertpanel_warning(_("Cannot print: the message doesn't "
- "contain text."));
- else {
- gtk_widget_realize(mimeview->textview->text);
- gedit_print(GTK_TEXT_VIEW(mimeview->textview->text));
- }
-}
-#endif
-
void summary_print(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
cur != NULL && cur->data != NULL;
cur = cur->next) {
GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
- if (node != summaryview->displayed) {
- MessageView *tmpview = messageview_create(
- summaryview->mainwin);
- MsgInfo *msginfo = gtk_ctree_node_get_row_data(
- GTK_CTREE(summaryview->ctree),
- node);
-
- messageview_init(tmpview);
- tmpview->all_headers = summaryview->messageview->all_headers;
- if (msginfo && messageview_show(tmpview, msginfo,
- tmpview->all_headers) >= 0) {
- print_mimeview(tmpview->mimeview);
- }
- messageview_destroy(tmpview);
- } else {
- print_mimeview(summaryview->messageview->mimeview);
- }
+ MsgInfo *msginfo = gtk_ctree_node_get_row_data(
+ GTK_CTREE(summaryview->ctree),
+ node);
+ gint sel_start = -1, sel_end = -1, partnum = 0;
+
+ if (node == summaryview->displayed) {
+ partnum = mimeview_get_selected_part_num(summaryview->messageview->mimeview);
+ textview_get_selection_offsets(summaryview->messageview->mimeview->textview,
+ &sel_start, &sel_end);
+ }
+ messageview_print(msginfo, summaryview->messageview->all_headers,
+ sel_start, sel_end, partnum);
}
#endif
}
if (summary_is_locked(summaryview)) return FALSE;
summary_lock(summaryview);
- gtk_clist_freeze(clist);
+ summary_freeze(summaryview);
main_window_cursor_wait(summaryview->mainwin);
}
folder_item_update_thaw();
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
if (new_selected) {
summary_unlock(summaryview);
gtk_sctree_select
- (GTK_SCTREE(ctree),
- new_selected);
+ (GTK_SCTREE(ctree), new_selected);
summary_lock(summaryview);
}
if (summaryview->threaded) {
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
summary_thread_build(summaryview);
summary_thread_init(summaryview);
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
}
+ summary_thaw(summaryview);
+
summaryview->selected = clist->selection ?
GTK_CTREE_NODE(clist->selection->data) : NULL;
msginfo->msgid))
g_hash_table_remove(summaryview->msgid_table,
msginfo->msgid);
- if (msginfo->subject && *msginfo->subject &&
+ if (prefs_common.thread_by_subject &&
+ msginfo->subject && *msginfo->subject &&
node == subject_table_lookup(summaryview->subject_table,
msginfo->subject)) {
subject_table_remove(summaryview->subject_table,
g_hash_table_remove(summaryview->msgid_table,
msginfo->msgid);
}
- if (msginfo->subject && *msginfo->subject &&
+ if (prefs_common.thread_by_subject &&
+ msginfo->subject && *msginfo->subject &&
node == subject_table_lookup(summaryview->subject_table,
msginfo->subject)) {
subject_table_remove(summaryview->subject_table,
g_signal_handlers_block_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
while (node) {
gtkut_ctree_set_focus_row(ctree, summaryview->selected);
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
GtkCTreeNode *next;
- START_TIMING("summary_thread_init");
+ START_TIMING("");
if (!summaryview->thread_collapsed) {
g_signal_handlers_block_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
{
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ gboolean froze = FALSE;
debug_print("Unthreading for execution...");
- START_LONG_OPERATION(summaryview);
-
+ START_LONG_OPERATION(summaryview, TRUE);
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
summary_unthread_for_exec_func(ctree, node, summaryview);
g_signal_handlers_block_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
while (node) {
if (GTK_CTREE_ROW(node)->children) {
node = GTK_CTREE_NODE_NEXT(node);
}
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
G_CALLBACK(summary_tree_expanded), summaryview);
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- gtk_clist_freeze(GTK_CLIST(ctree));
+ summary_freeze(summaryview);
while (node) {
if (GTK_CTREE_ROW(node)->children)
node = GTK_CTREE_ROW(node)->sibling;
}
- gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_thaw(summaryview);
summaryview->thread_collapsed = TRUE;
gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
+static void account_rules_radio_button_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+ prefs_common.apply_per_account_filtering_rules = GPOINTER_TO_INT(data);
+}
+
+static gboolean summary_filter_get_mode(void)
+/* ask what to do w/ them: skip them, apply them regardless to the account,
+ use the current account */
+{
+ /* TODO: eventually also propose to use the current folder's default account,
+ if it is set */
+ /* TODO: eventually allow to select the account to use from a optmenu */
+
+ GtkWidget *vbox;
+ GtkWidget *account_rules_skip;
+ GtkWidget *account_rules_force;
+ GtkWidget *account_rules_user_current;
+ AlertValue val;
+
+ vbox = gtk_vbox_new (FALSE, 0);
+
+ account_rules_skip = gtk_radio_button_new_with_label
+ (NULL, _("Skip these rules"));
+ account_rules_force = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON(account_rules_skip),
+ _("Apply these rules regardless of the account they belong to"));
+ account_rules_user_current = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON(account_rules_skip),
+ _("Apply these rules if they apply to the current account"));
+ gtk_box_pack_start (GTK_BOX (vbox), account_rules_skip, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), account_rules_force, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), account_rules_user_current, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(account_rules_skip), "toggled",
+ G_CALLBACK(account_rules_radio_button_toggled_cb),
+ GINT_TO_POINTER(FILTERING_ACCOUNT_RULES_SKIP));
+ g_signal_connect(G_OBJECT(account_rules_force), "toggled",
+ G_CALLBACK(account_rules_radio_button_toggled_cb),
+ GINT_TO_POINTER(FILTERING_ACCOUNT_RULES_FORCE));
+ g_signal_connect(G_OBJECT(account_rules_user_current), "toggled",
+ G_CALLBACK(account_rules_radio_button_toggled_cb),
+ GINT_TO_POINTER(FILTERING_ACCOUNT_RULES_USE_CURRENT));
+ switch (prefs_common.apply_per_account_filtering_rules) {
+ case FILTERING_ACCOUNT_RULES_SKIP:
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(account_rules_skip), TRUE);
+ break;
+ case FILTERING_ACCOUNT_RULES_FORCE:
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(account_rules_force), TRUE);
+ break;
+ case FILTERING_ACCOUNT_RULES_USE_CURRENT:
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(account_rules_user_current), TRUE);
+ break;
+ }
+
+ val = alertpanel_with_widget(
+ _("Filtering"),
+ _("There are some filtering rules that belong to an account.\n"
+ "Please choose what to do with these rules:"),
+ GTK_STOCK_CANCEL, _("_Filter"), NULL, TRUE, G_ALERTALTERNATE, vbox);
+
+ if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) {
+ return FALSE;
+ } else if (val & G_ALERTDISABLE)
+ prefs_common.ask_apply_per_account_filtering_rules = FALSE;
+
+ return TRUE;
+}
+
void summary_filter(SummaryView *summaryview, gboolean selected_only)
{
GSList *mlist = NULL, *cur_list;
summary_lock(summaryview);
+ /* are there any per-account filtering rules? */
+ if (prefs_common.ask_apply_per_account_filtering_rules == TRUE &&
+ filtering_peek_per_account_rules(filtering_rules)) {
+
+ if (summary_filter_get_mode() == FALSE) {
+ summary_unlock(summaryview);
+ return;
+ }
+ }
+
folder_item_update_freeze();
debug_print("filtering...");
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ summary_freeze(summaryview);
if (selected_only) {
GList *cur;
}
g_slist_free(mlist);
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
folder_item_update_thaw();
debug_print("done.\n");
MailFilteringData mail_filtering_data;
mail_filtering_data.msginfo = msginfo;
+ mail_filtering_data.msglist = NULL;
+ mail_filtering_data.filtered = NULL;
+ mail_filtering_data.unfiltered = NULL;
if (hooks_invoke(MAIL_MANUAL_FILTERING_HOOKLIST, &mail_filtering_data))
return;
- filter_message_by_msginfo(filtering_rules, msginfo);
+ filter_message_by_msginfo(filtering_rules, msginfo, NULL,
+ FILTERING_MANUALLY, NULL);
}
void summary_msginfo_filter_open(FolderItem * item, MsgInfo *msginfo,
if (item == NULL)
prefs_filtering_open(&pre_global_processing,
_("Processing rules to apply before folder rules"),
- header, key);
+ MANUAL_ANCHOR_PROCESSING,
+ header, key, FALSE);
else
prefs_filtering_open(&item->prefs->processing,
_("Processing configuration"),
- header, key);
+ MANUAL_ANCHOR_PROCESSING,
+ header, key, FALSE);
}
else {
prefs_filtering_open(&filtering_rules,
- _("Filtering configuration"),
- header, key);
+ _("Filtering configuration"),
+ MANUAL_ANCHOR_FILTERING,
+ header, key, TRUE);
}
g_free(header);
style->fg[GTK_STATE_NORMAL] = color;
/* 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;
+ style->fg[GTK_STATE_SELECTED].red = (color.red + 3*ctree_style->fg[GTK_STATE_SELECTED].red ) / 4;
+ style->fg[GTK_STATE_SELECTED].green = (color.green + 3*ctree_style->fg[GTK_STATE_SELECTED].green) / 4;
+ style->fg[GTK_STATE_SELECTED].blue = (color.blue + 3*ctree_style->fg[GTK_STATE_SELECTED].blue ) / 4;
}
gtk_ctree_node_set_row_style(ctree, node, style);
+ gtk_style_unref(style);
}
static void summary_set_row_colorlabel(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
-
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
summary_set_row_colorlabel(summaryview,
GTK_CTREE_NODE(cur->data), labelcolor);
prefs_common.summary_col_size[S_COL_NUMBER]);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
prefs_common.summary_col_size[S_COL_SCORE]);
- gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
- gtk_ctree_set_expander_style(GTK_CTREE(ctree),
+
+ if (prefs_common.enable_dotted_lines) {
+ gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
+ gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_SQUARE);
+ } else {
+ gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
+ gtk_ctree_set_expander_style(GTK_CTREE(ctree),
+ GTK_CTREE_EXPANDER_TRIANGLE);
+ }
+
+ gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+
gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
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);
g_signal_connect(G_OBJECT(ctree), "drag_data_get",
G_CALLBACK(summary_drag_data_get),
summaryview);
+ g_signal_connect(G_OBJECT(ctree), "drag_end",
+ G_CALLBACK(summary_drag_end),
+ summaryview);
gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
summary_drag_types, 2,
summary_select_by_msgnum(summaryview, selected_msgnum);
summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
+ summaryview->last_displayed = summaryview->displayed;
if (!summaryview->displayed)
messageview_clear(summaryview->messageview);
else
/* callback functions */
+static gint summary_folder_eventbox_pressed(GtkWidget *eventbox, GdkEventButton *event,
+ SummaryView *summaryview)
+{
+ if (event) {
+ gtk_widget_grab_focus(summaryview->folderview->ctree);
+ mainwindow_exit_folder(summaryview->mainwin);
+ }
+ return TRUE;
+}
+
static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
SummaryView *summaryview)
{
summary_toggle_view(summaryview);
return TRUE;
}
-
+#ifdef MAEMO
+static void summary_toggle_multiple_pressed(GtkWidget *widget,
+ SummaryView *summaryview)
+{
+ GTK_SCTREE(summaryview->ctree)->force_additive_sel =
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+}
+#endif
static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
SummaryView *summaryview)
{
GtkAdjustment *adj;
gboolean mod_pressed;
- if (summary_is_locked(summaryview)) return TRUE;
- if (!event) return TRUE;
+ if (!event)
+ return TRUE;
if (quicksearch_has_focus(summaryview->quicksearch))
return FALSE;
+ messageview = summaryview->messageview;
+ textview = messageview->mimeview->textview;
+
+ mod_pressed =
+ ((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
+
+ if (summaryview->selected) {
+ gboolean handled = FALSE;
+ switch (event->keyval) {
+ case GDK_space: /* Page down or go to the next */
+ handled = TRUE;
+ if (event->state & GDK_CONTROL_MASK)
+ event->state &= ~GDK_CONTROL_MASK;
+ if (event->state & GDK_SHIFT_MASK)
+ mimeview_scroll_page(messageview->mimeview, TRUE);
+ else {
+ if (summaryview->displayed != summaryview->selected) {
+ summary_display_msg(summaryview,
+ summaryview->selected);
+ break;
+ }
+ if (mod_pressed) {
+ if (!mimeview_scroll_page(messageview->mimeview, TRUE))
+ summary_select_prev_unread(summaryview);
+ } else {
+ if (!mimeview_scroll_page(messageview->mimeview, FALSE))
+ summary_select_next_unread(summaryview);
+ }
+ }
+ break;
+ case GDK_BackSpace: /* Page up */
+ handled = TRUE;
+ mimeview_scroll_page(messageview->mimeview, TRUE);
+ break;
+ case GDK_Return: /* Scroll up/down one line */
+ handled = TRUE;
+ if (summaryview->displayed != summaryview->selected) {
+ summary_display_msg(summaryview,
+ summaryview->selected);
+ break;
+ }
+ mimeview_scroll_one_line(messageview->mimeview, mod_pressed);
+ break;
+ }
+
+ if (handled)
+ return FALSE;
+ }
+ if (summary_is_locked(summaryview))
+ return TRUE;
+
switch (event->keyval) {
case GDK_Left: /* Move focus */
adj = gtk_scrolled_window_get_hadjustment
/* FALLTHROUGH */
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
+ mainwindow_exit_folder(summaryview->mainwin);
return TRUE;
case GDK_Home:
case GDK_End:
g_list_length(GTK_CLIST(ctree)->row_list)-1);
if (next) {
gtk_sctree_select_with_state
- (GTK_SCTREE(ctree), next, event->state);
+ (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
/* Deprecated - what are the non-deprecated equivalents? */
if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
return TRUE;
}
- messageview = summaryview->messageview;
- textview = messageview->mimeview->textview;
-
- mod_pressed =
- ((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
-
switch (event->keyval) {
- case GDK_space: /* Page down or go to the next */
- if (event->state & GDK_SHIFT_MASK)
- textview_scroll_page(textview, TRUE);
- else {
- if (summaryview->displayed != summaryview->selected) {
- summary_display_msg(summaryview,
- summaryview->selected);
- break;
- }
- if (mod_pressed) {
- if (!textview_scroll_page(textview, TRUE))
- summary_select_prev_unread(summaryview);
- } else {
- if (!textview_scroll_page(textview, FALSE))
- summary_select_next_unread(summaryview);
- }
- }
- break;
- case GDK_BackSpace: /* Page up */
- textview_scroll_page(textview, TRUE);
- break;
- case GDK_Return: /* Scroll up/down one line */
- if (summaryview->displayed != summaryview->selected) {
- summary_display_msg(summaryview,
- summaryview->selected);
- break;
- }
- textview_scroll_one_line(textview, mod_pressed);
- break;
case GDK_Delete:
BREAK_ON_MODIFIER_KEY();
summary_delete_trash(summaryview);
case GDK_t:
case GDK_l:
case GDK_c:
+ case GDK_a:
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
g_signal_stop_emission_by_name(G_OBJECT(widget),
"key_press_event");
}
}
-void summaryview_activate_quicksearch(SummaryView *summaryview)
+void summaryview_activate_quicksearch(SummaryView *summaryview, gboolean show)
{
+ prefs_common.show_searchbar = show;
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(summaryview->toggle_search),
- TRUE);
- quicksearch_show(summaryview->quicksearch);
+ show);
+ if (show) {
+ quicksearch_show(summaryview->quicksearch);
+ } else {
+ quicksearch_hide(summaryview->quicksearch);
+ summary_grab_focus(summaryview);
+ }
}
-static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
+void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
if (FOLDER_SHOWS_TO_HDR(summaryview->folder_item))
summary_reedit(summaryview);
MsgInfo *msginfo;
gboolean marked_unread = FALSE;
+ if (summary_is_locked(summaryview)
+ && !GTK_SCTREE(ctree)->selecting_range
+ && summaryview->messageview
+ && summaryview->messageview->mimeview
+ && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
+ && summaryview->messageview->mimeview->textview->loading) {
+ PostponedSelectData *data = g_new0(PostponedSelectData, 1);
+ summaryview->messageview->mimeview->textview->stop_loading = TRUE;
+
+ data->ctree = ctree;
+ data->row = row;
+ data->node = NULL;
+ data->column = column;
+ data->summaryview = summaryview;
+ debug_print("postponing open of message till end of load\n");
+ g_timeout_add(100, summary_select_retry, data);
+ return;
+ }
if (summary_is_locked(summaryview)
|| GTK_SCTREE(ctree)->selecting_range) {
return;
if (procmsg_spam_learner_learn(msginfo, NULL, FALSE) == 0)
summary_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
else
- log_error(_("An error happened while learning.\n"));
+ log_error(LOG_PROTOCOL, _("An error happened while learning.\n"));
} else if (!MSG_IS_REPLIED(msginfo->flags) &&
!MSG_IS_FORWARDED(msginfo->flags)) {
marked_unread = TRUE;
FolderSortKey sort_key)
{
GtkCTreeNode *node = NULL;
- START_TIMING("summary_sort_by_column_click");
+ START_TIMING("");
if (summaryview->sort_key == sort_key)
summary_sort(summaryview, sort_key,
summaryview->sort_type == SORT_ASCENDING
node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+ summary_freeze(summaryview);
if (prefs_common.bold_unread) {
while (node) {
GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
node = next;
}
}
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_thaw(summaryview);
END_TIMING();
}
context = gtk_drag_begin(widget, summaryview->target_list,
GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
gtk_drag_set_icon_default(context);
+ if (prefs_common.layout_mode == SMALL_LAYOUT) {
+ GtkWidget *paned = GTK_WIDGET_PTR(summaryview)->parent;
+ if (paned && GTK_IS_PANED(paned)) {
+ mainwindow_reset_paned(GTK_PANED(paned));
+ }
+ }
+}
+
+static gboolean summary_return_to_list(void *data)
+{
+ SummaryView *summaryview = (SummaryView *)data;
+ mainwindow_enter_folder(summaryview->mainwin);
+ return FALSE;
+}
+
+static void summary_drag_end (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ SummaryView *summaryview)
+{
+ if (prefs_common.layout_mode == SMALL_LAYOUT) {
+ g_timeout_add(250, summary_return_to_list, summaryview);
+ }
}
static void summary_drag_data_get(GtkWidget *widget,
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))
+ (-(MSG_IS_SPAM(msginfo1->flags))+(MSG_IS_UNREAD(msginfo1->flags)<<1)+(MSG_IS_NEW(msginfo1->flags)<<2))
+ - (-(MSG_IS_SPAM(msginfo2->flags))+(MSG_IS_UNREAD(msginfo2->flags)<<1)+(MSG_IS_NEW(msginfo2->flags)<<2)) )
CMP_FUNC_DEF(summary_cmp_by_mime,
MSG_IS_WITH_ATTACHMENT(msginfo1->flags) - MSG_IS_WITH_ATTACHMENT(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_label,
return summary_cmp_by_date(clist, ptr1, ptr2);
}
-static void news_flag_crosspost(MsgInfo *msginfo)
-{
- GString *line;
- gpointer key;
- gpointer value;
- Folder *mff;
-
- g_return_if_fail(msginfo != NULL);
- g_return_if_fail(msginfo->folder != NULL);
- g_return_if_fail(msginfo->folder->folder != NULL);
- mff = msginfo->folder->folder;
- g_return_if_fail(mff->klass->type == F_NEWS);
-
- if (mff->account->mark_crosspost_read) {
- line = g_string_sized_new(128);
- g_string_printf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
- debug_print("nfcp: checking <%s>", line->str);
- if (mff->newsart &&
- g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
- debug_print(" <%s>", (gchar *)value);
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- summary_msginfo_change_flags(msginfo,
- mff->account->crosspost_col, 0, MSG_NEW | MSG_UNREAD, 0);
- }
- g_hash_table_remove(mff->newsart, key);
- g_free(key);
- }
- g_string_free(line, TRUE);
- debug_print("\n");
- }
-}
-
static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
{
SummaryView *summaryview = (SummaryView *) data;
msginfo->msgnum);
}
-static void summary_ignore_thread(SummaryView *summaryview)
+void summary_ignore_thread(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
GTK_CTREE_FUNC(summary_ignore_thread_func),
msginfo->msgnum);
}
-static void summary_unignore_thread(SummaryView *summaryview)
+void summary_unignore_thread(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ gboolean froze = FALSE;
- START_LONG_OPERATION(summaryview);
+ START_LONG_OPERATION(summaryview, FALSE);
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
GTK_CTREE_FUNC(summary_unignore_thread_func),
GtkWidget *ctree = summaryview->ctree;
GtkWidget *pixmap;
- gtk_widget_destroy(summaryview->folder_pixmap);
-
stock_pixmap_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm, &markxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm, &deletedxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm, &newxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm, &clipgpgsignedxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm, &spamxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm, &movedxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm, &copiedxpmmask);
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
- gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 1); /* search_toggle before */
- gtk_widget_show(pixmap);
- summaryview->folder_pixmap = pixmap;
+ summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
gtk_container_remove (GTK_CONTAINER(summaryview->toggle_search),
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
+#ifdef MAEMO
+ pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
+ gtk_container_remove (GTK_CONTAINER(summaryview->multiple_sel_togbtn),
+ summaryview->multiple_sel_image);
+ gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
+ gtk_widget_show(pixmap);
+ summaryview->multiple_sel_togbtn = pixmap;
+#endif
+
folderview_unselect(summaryview->folderview);
folderview_select(summaryview->folderview, summaryview->folder_item);
summary_set_column_titles(summaryview);
void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *item)
{
+ FolderSortKey sort_key;
+ FolderSortType sort_type;
g_return_if_fail(summaryview != NULL);
g_return_if_fail(item != NULL);
summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
/* Sorting */
- summaryview->sort_key = item->sort_key;
- summaryview->sort_type = item->sort_type;
+ sort_key = item->sort_key;
+ sort_type = item->sort_type;
+
+ folder_get_sort_type(item->folder, &sort_key, &sort_type);
+
+ summaryview->sort_key = sort_key;
+ summaryview->sort_type = sort_type;
/* Threading */
summaryview->threaded = item->threaded;
return FALSE;
}
+void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
+{
+ guint new, unread, unreadmarked, marked, total;
+ static gboolean tips_initialized = FALSE;
+
+ if (prefs_common.layout_mode != SMALL_LAYOUT) {
+ if (tips_initialized) {
+ summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
+ summaryview->folder_pixmap_eventbox,
+ NULL, NULL);
+ tips_initialized = FALSE;
+ }
+ return;
+ }
+ folder_count_total_msgs(&new, &unread, &unreadmarked, &marked, &total);
+ if (removed_item) {
+ total -= removed_item->total_msgs;
+ new -= removed_item->new_msgs;
+ unread -= removed_item->unread_msgs;
+ }
+
+ if (new > 0 || unread > 0) {
+ tips_initialized = TRUE;
+ summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN_HRM);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
+ summaryview->folder_pixmap_eventbox,
+ _("Go back to the folder list (You have unread messages)"), NULL);
+ } else {
+ tips_initialized = TRUE;
+ summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(summaryview->tips),
+ summaryview->folder_pixmap_eventbox,
+ _("Go back to the folder list"), NULL);
+ }
+}
+
+static gboolean summary_update_folder_item_hook(gpointer source, gpointer data)
+{
+ FolderItemUpdateData *hookdata = (FolderItemUpdateData *)source;
+ SummaryView *summaryview = (SummaryView *)data;
+
+ g_return_val_if_fail(hookdata != NULL, FALSE);
+ g_return_val_if_fail(hookdata->item != NULL, FALSE);
+ g_return_val_if_fail(summaryview != NULL, FALSE);
+
+ if (hookdata->update_flags & F_ITEM_UPDATE_NAME) {
+ gchar *name = folder_item_get_name(hookdata->item);
+ gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
+ g_free(name);
+ }
+ summary_update_unread(summaryview, NULL);
+
+ return FALSE;
+}
+
+static gboolean summary_update_folder_hook(gpointer source, gpointer data)
+{
+ FolderUpdateData *hookdata;
+ SummaryView *summaryview = (SummaryView *)data;
+ hookdata = source;
+ if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM)
+ summary_update_unread(summaryview, hookdata->item);
+ else
+ summary_update_unread(summaryview, NULL);
+
+ return FALSE;
+}
+
/*!
*\brief change summaryview to display your answer(s) to a message
*
projects / claws.git / blobdiff