/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
*
- * This program is free software; you can redistributte it and/or modify
+ * 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
#include "string_match.h"
#include "toolbar.h"
#include "news.h"
-#include "matcher.h"
-#include "matcher_parser.h"
#include "hooks.h"
#include "description_window.h"
#include "folderutils.h"
+#include "quicksearch.h"
+#include "partial_download.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
GtkCTreeNode *row,
FolderItem *to_folder);
-static void summary_delete_duplicated_func
- (GtkCTree *ctree,
- GtkCTreeNode *node,
- SummaryView *summaryview);
-
static void summary_execute_move (SummaryView *summaryview);
static void summary_execute_move_func (GtkCTree *ctree,
GtkCTreeNode *node,
static gboolean summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static gboolean summary_searchbar_pressed
- (GtkWidget *ctree,
- GdkEventKey *event,
- SummaryView *summaryview);
-static gboolean summary_searchbar_focus_evt (GtkWidget *ctree,
- GdkEventFocus *event,
- SummaryView *summaryview);
-static void summary_searchtype_changed (GtkMenuItem *widget,
- gpointer data);
static void summary_open_row (GtkSCTree *sctree,
SummaryView *summaryview);
static void summary_tree_expanded (GtkCTree *ctree,
static void summary_reply_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
-static void summary_execute_cb (SummaryView *summaryview,
- guint action,
- GtkWidget *widget);
static void summary_show_all_header_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
static void news_flag_crosspost (MsgInfo *msginfo);
+static void quicksearch_execute_cb (QuickSearch *quicksearch,
+ gpointer data);
static void tog_searchbar_cb (GtkWidget *w,
gpointer data);
{N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
{N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
{N_("/_Delete"), "<control>D", summary_delete, 0, NULL},
{N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
- {N_("/E_xecute"), "X", summary_execute_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Mark/_Mark"), "<shift>asterisk", summary_mark, 0, NULL},
- {N_("/_Mark/_Unmark"), "U", summary_unmark, 0, NULL},
+ {N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
+ {N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Mark/Mark as unr_ead"), "<shift>exclam", summary_mark_as_unread, 0, NULL},
+ {N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
{N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
{N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
"<control><alt>N", summary_open_msg, 0, NULL},
{N_("/_View/_Source"), "<control>U", summary_view_source, 0, NULL},
{N_("/_View/All _header"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
- {N_("/_Print..."), NULL, summary_print, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Select _all"), "<control>A", summary_select_all, 0, NULL},
- {N_("/Select t_hread"), NULL, summary_select_thread, 0, NULL}
}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
static const gchar *const col_label[N_SUMMARY_COLS] = {
N_("L") /* S_COL_LOCKED */
};
-/*
- * Strings describing how to use Extended Search
- *
- * When adding new lines, remember to put 2 strings for each line
- */
-static gchar *search_descr_strings[] = {
- "a", N_("all messages"),
- "ag #", N_("messages whose age is greater than #"),
- "al #", N_("messages whose age is less than #"),
- "b S", N_("messages which contain S in the message body"),
- "B S", N_("messages which contain S in the whole message"),
- "c S", N_("messages carbon-copied to S"),
- "C S", N_("message is either to: or cc: to S"),
- "D", N_("deleted messages"), /** how I can filter deleted messages **/
- "e S", N_("messages which contain S in the Sender field"),
- "E S", N_("true if execute \"S\" succeeds"),
- "f S", N_("messages originating from user S"),
- "F", N_("forwarded messages"),
- "h S", N_("messages which contain header S"),
- "i S", N_("messages which contain S in Message-Id header"),
- "I S", N_("messages which contain S in inreplyto header"),
- "L", N_("locked messages"),
- "n S", N_("messages which are in newsgroup S"),
- "N", N_("new messages"),
- "O", N_("old messages"),
- "r", N_("messages which have been replied to"),
- "R", N_("read messages"),
- "s S", N_("messages which contain S in subject"),
- "se #", N_("messages whose score is equal to #"),
- "sg #", N_("messages whose score is greater than #"),
- "sl #", N_("messages whose score is lower than #"),
- "Se #", N_("messages whose size is equal to #"),
- "Sg #", N_("messages whose size is greater than #"),
- "Ss #", N_("messages whose size is smaller than #"),
- "t S", N_("messages which have been sent to S"),
- "T", N_("marked messages"),
- "U", N_("unread messages"),
- "x S", N_("messages which contain S in References header"),
- "X cmd", N_("messages returning 0 when passed to command"),
- "y S", N_("messages which contain S in X-Label header"),
- "", "" ,
- "&", N_("logical AND operator"),
- "|", N_("logical OR operator"),
- "! or ~", N_("logical NOT operator"),
- "%", N_("case sensitive search"),
- NULL, NULL
-};
-
-static DescriptionWindow search_descr = {
- NULL,
- 2,
- N_("Extended Search symbols"),
- search_descr_strings
-};
-
-static void search_description_cb(GtkWidget *widget)
-{
- description_window_create(&search_descr);
-};
-
SummaryView *summary_create(void)
{
SummaryView *summaryview;
GtkWidget *ctree;
GtkWidget *hbox;
GtkWidget *hbox_l;
- GtkWidget *hbox_search;
GtkWidget *statlabel_folder;
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
GtkWidget *toggle_eventbox;
GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
- GtkWidget *search_type_opt;
- GtkWidget *search_type;
- GtkWidget *search_string;
- GtkWidget *search_hbbox;
- GtkWidget *search_description;
- GtkWidget *menuitem;
GtkWidget *toggle_search;
GtkTooltips *search_tip;
GtkItemFactory *popupfactory;
gint n_entries;
+ QuickSearch *quicksearch;
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
/* create status label */
hbox = gtk_hbox_new(FALSE, 0);
-
+ gtk_widget_show(hbox);
+
search_tip = gtk_tooltips_new();
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),
toggle_search,
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
hbox_l = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(hbox_l);
gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
statlabel_folder = gtk_label_new("");
+ gtk_widget_show(statlabel_folder);
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
statlabel_select = gtk_label_new("");
+ gtk_widget_show(statlabel_select);
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
/* 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),
statlabel_msgs = gtk_label_new("");
+ gtk_widget_show(statlabel_msgs);
gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
hbox_spc = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(hbox_spc);
gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_show(scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_set_size_request(vbox,
prefs_common.summaryview_width,
prefs_common.summaryview_height);
ctree = summary_ctree_create(summaryview);
+ gtk_widget_show(ctree);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->hadjustment);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
/* quick search */
- hbox_search = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox_search, FALSE, FALSE, 0);
-
- search_type_opt = gtk_option_menu_new();
- gtk_widget_show(search_type_opt);
- gtk_box_pack_start(GTK_BOX(hbox_search), search_type_opt, FALSE, FALSE, 0);
-
- search_type = gtk_menu_new();
- MENUITEM_ADD (search_type, menuitem, _("Subject"), S_SEARCH_SUBJECT);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(summary_searchtype_changed),
- summaryview);
- MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(summary_searchtype_changed),
- summaryview);
- MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(summary_searchtype_changed),
- summaryview);
- MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(summary_searchtype_changed),
- summaryview);
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
-
- gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
-
- gtk_widget_show(search_type);
-
- search_string = gtk_entry_new();
-
- gtk_box_pack_start(GTK_BOX(hbox_search), search_string, FALSE, FALSE, 2);
-
- gtkut_button_set_create(&search_hbbox, &search_description, _("Extended Symbols"),
- NULL, NULL, NULL, NULL);
- g_signal_connect(G_OBJECT(search_description), "clicked",
- G_CALLBACK(search_description_cb), NULL);
- gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
-
- gtk_widget_show(search_string);
- gtk_widget_show(hbox_search);
-
- g_signal_connect(G_OBJECT(search_string), "key_press_event",
- G_CALLBACK(summary_searchbar_pressed),
- summaryview);
-
- g_signal_connect(G_OBJECT(search_string), "focus_in_event",
- G_CALLBACK(summary_searchbar_focus_evt),
- summaryview);
+ quicksearch = quicksearch_new();
+ gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(search_string), "focus_out_event",
- G_CALLBACK(summary_searchbar_focus_evt),
- summaryview);
+ quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
g_signal_connect (G_OBJECT(toggle_search), "toggled",
G_CALLBACK(tog_searchbar_cb), summaryview);
summaryview->ctree = ctree;
summaryview->hbox = hbox;
summaryview->hbox_l = hbox_l;
- summaryview->hbox_search = hbox_search;
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
summaryview->lock_count = 0;
- summaryview->search_type_opt = search_type_opt;
- summaryview->search_type = search_type;
- summaryview->search_string = search_string;
- summaryview->search_description = search_description;
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
+ summaryview->quicksearch = quicksearch;
+
/* CLAWS: need this to get the SummaryView * from
* the CList */
- gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview);
+ g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
gtk_widget_show_all(vbox);
+ gtk_widget_show(vbox);
+
+ if (prefs_common.show_searchbar)
+ quicksearch_show(quicksearch);
+ else
+ quicksearch_hide(quicksearch);
+
return summaryview;
}
void summary_init(SummaryView *summaryview)
{
- static GdkFont *boldfont = NULL;
- static GdkFont *smallfont = NULL;
GtkStyle *style;
GtkWidget *pixmap;
gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
-
+
/* Init summaryview prefs */
summaryview->sort_key = SORT_BY_NONE;
summaryview->sort_type = SORT_ASCENDING;
inc_lock();
summary_lock(summaryview);
- if (item != summaryview->folder_item) {
- /* changing folder, reset search */
- gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), "");
+ if (!prefs_common.summary_quicksearch_sticky
+ && !quicksearch_is_running(summaryview->quicksearch)) {
+ quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
}
-
+
/* STATUSBAR_POP(summaryview->mainwin); */
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
summaryview->folder_item = item;
item->opened = TRUE;
- gtk_signal_handler_block_by_data(GTK_OBJECT(ctree), summaryview);
-
buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path);
debug_print("%s\n", buf);
STATUSBAR_PUSH(summaryview->mainwin, buf);
|| MSG_IS_LOCKED(msginfo->flags)
|| CURRENTLY_DISPLAYED(msginfo))
&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
- not_killed = g_slist_prepend(not_killed, msginfo);
+ not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
}
summary_set_hide_read_msgs_menu(summaryview, FALSE);
}
- if (strlen(gtk_entry_get_text(GTK_ENTRY(summaryview->search_string))) > 0) {
+ if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
- gint search_type = GPOINTER_TO_INT(g_object_get_data(
- GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
- GTK_MENU(summaryview->search_type)))), MENU_VAL_ID));
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
- gchar *searched_header = NULL;
- MatcherList * tmp_list = NULL;
- if (search_type == S_SEARCH_EXTENDED) {
- char *newstr = NULL;
-
- newstr = expand_search_string(search_string);
- if (newstr) {
- tmp_list = matcher_parser_get_cond(newstr);
- g_free(newstr);
- }
- else
- tmp_list = NULL;
- }
-
not_killed = NULL;
for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- switch (search_type) {
- case S_SEARCH_SUBJECT:
- searched_header = msginfo->subject;
- break;
- case S_SEARCH_FROM:
- searched_header = msginfo->from;
- break;
- case S_SEARCH_TO:
- searched_header = msginfo->to;
- break;
- case S_SEARCH_EXTENDED:
- break;
- default:
- debug_print("unknown search type (%d)\n", search_type);
- break;
- }
- if (search_type != S_SEARCH_EXTENDED) {
- if (searched_header && strcasestr(searched_header, search_string) != NULL)
- not_killed = g_slist_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
- } else {
- if ((tmp_list != NULL) && matcherlist_match(tmp_list, msginfo))
- not_killed = g_slist_prepend(not_killed, msginfo);
- else
- procmsg_msginfo_free(msginfo);
- }
- }
- if (search_type == S_SEARCH_EXTENDED && tmp_list != NULL) {
- matcherlist_free(tmp_list);
- tmp_list = NULL;
+ if (quicksearch_match(summaryview->quicksearch, msginfo))
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
}
g_slist_free(mlist);
if (summaryview->sort_key != SORT_BY_NONE)
summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
- gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
-
gtk_clist_thaw(GTK_CLIST(ctree));
if (is_refresh) {
return selection;
}
+/*!
+ *\return MsgInfo * Selected message if there's one selected;
+ * if multiple selected, or none, return NULL.
+ */
+MsgInfo *summary_get_selected_msg(SummaryView *summaryview)
+{
+ /* summaryview->selected may be valid when multiple
+ * messages were selected */
+ GList *sellist = GTK_CLIST(summaryview->ctree)->selection;
+
+ if (sellist == NULL || sellist->next)
+ return NULL;
+
+ return GTKUT_CTREE_NODE_GET_ROW_DATA(sellist->data);
+}
+
GSList *summary_get_selected_msg_list(SummaryView *summaryview)
{
GSList *mlist = NULL;
{"/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
{"/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
{"/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
- {"/Execute" , M_DELAY_EXEC},
{"/Mark" , M_TARGET_EXIST},
{"/Mark/Mark" , M_TARGET_EXIST},
{"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
{"/View/Source" , M_SINGLE_TARGET_EXIST},
{"/View/All header" , M_SINGLE_TARGET_EXIST},
-
+#if 0
{"/Save as..." , M_TARGET_EXIST|M_UNLOCKED},
{"/Print..." , M_TARGET_EXIST|M_UNLOCKED},
{"/Select thread" , M_SINGLE_TARGET_EXIST},
{"/Select all" , M_TARGET_EXIST},
-
+#endif
{NULL, 0}
};
GtkCTreeNode *node;
node = summary_find_prev_flagged_msg
- (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
+ (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
if (!node) {
AlertValue val = 0;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
node = summary_find_next_flagged_msg
- (summaryview, node, MSG_UNREAD, FALSE);
+ (summaryview, node, MSG_UNREAD, TRUE);
if (node)
summary_select_node(summaryview, node, TRUE, FALSE);
}
if (val == G_ALERTDEFAULT) {
- gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
+ g_signal_stop_emission_by_name(G_OBJECT(ctree),
"key_press_event");
folderview_select_next_unread(summaryview->folderview);
return;
"Go to next folder?"),
_("Yes"), _("Search again"), _("No"));
if (val == G_ALERTDEFAULT) {
-#warning FIXME_GTK2
-#if 0
- if (gtk_signal_n_emissions_by_name
- (GTK_OBJECT(ctree), "key_press_event") > 0)
- gtk_signal_emit_stop_by_name
- (GTK_OBJECT(ctree),
- "key_press_event");
+ g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
folderview_select_next_unread(summaryview->folderview);
-#endif
return;
} else if (val == G_ALERTALTERNATE)
node = NULL;
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
+ FolderType ftype = F_UNKNOWN;
text[col_pos[S_COL_MARK]] = NULL;
text[col_pos[S_COL_STATUS]] = NULL;
text[col_pos[S_COL_FROM]] = msginfo->fromname ? msginfo->fromname :
_("(No From)");
- if (prefs_common.swap_from && msginfo->from && msginfo->to &&
- !MSG_IS_NEWS(msginfo->flags)) {
+
+ if (msginfo->folder && msginfo->folder->folder)
+ ftype = msginfo->folder->folder->klass->type;
+
+ if (ftype != F_NEWS && prefs_common.swap_from && msginfo->from && msginfo->to) {
gchar *addr = NULL;
Xstrdup_a(addr, msginfo->from, return);
summary_display_msg_full(summaryview, row, FALSE, FALSE);
}
+static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
+ GtkCTreeNode *row)
+{
+ g_return_if_fail(summaryview != NULL);
+ g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(row != NULL);
+
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked--;
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ procmsg_msginfo_unset_flags
+ (msginfo, MSG_NEW | MSG_UNREAD, 0);
+ summary_set_row_marks(summaryview, row);
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_status_show(summaryview);
+ }
+}
+
+typedef struct {
+ MsgInfo *msginfo;
+ SummaryView *summaryview;
+ GtkCTreeNode *row;
+} MarkAsReadData;
+
+static int msginfo_mark_as_read_timeout(void *data)
+{
+ 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->row);
+
+ g_free(mdata);
+
+ return FALSE;
+}
+
static void summary_display_msg_full(SummaryView *summaryview,
GtkCTreeNode *row,
gboolean new_window, gboolean all_headers)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
- MsgFlags flags;
gint val;
if (!new_window) {
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
- if (val == 0 &&
- (new_window || !prefs_common.mark_as_read_on_new_window)) {
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags
- (msginfo, MSG_NEW | MSG_UNREAD, 0);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
-
- flags = msginfo->flags;
+ if (val == 0) {
+ if (prefs_common.mark_as_read_delay) {
+ 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,
+ 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);
}
}
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
+ messageview_set_menu_sensitive(summaryview->messageview);
summary_unlock(summaryview);
}
if (MSG_IS_SIGNED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
gpgsignedxpm, gpgsignedxpmmask);
- } else if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+ } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipkeyxpm, clipkeyxpmmask);
} else if (MSG_IS_ENCRYPTED(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
keyxpm, keyxpmmask);
- } else if (MSG_IS_MIME(flags)) {
+ } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} else {
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
node = gtkut_ctree_node_next(ctree, node))
summary_mark_row_as_read(summaryview, node);
- gtk_clist_thaw(clist);
folder_item_update_thaw();
+ gtk_clist_thaw(clist);
summary_status_show(summaryview);
}
/* if current folder is trash, ask for confirmation */
if (item->stype == F_TRASH) {
AlertValue aval;
+ MsgInfo *msginfo;
aval = alertpanel(_("Delete message(s)"),
_("Do you really want to delete message(s) from the trash?"),
_("Yes"), _("No"), NULL);
if (aval != G_ALERTDEFAULT) return;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
+ GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ partial_mark_for_delete(msginfo);
+ }
+
}
main_window_cursor_wait(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
}
-void summary_delete_duplicated(SummaryView *summaryview)
-{
- main_window_cursor_wait(summaryview->mainwin);
- STATUSBAR_PUSH(summaryview->mainwin,
- _("Deleting duplicated messages..."));
-
- folderutils_delete_duplicates(summaryview->folder_item);
-
- STATUSBAR_POP(summaryview->mainwin);
- main_window_cursor_normal(summaryview->mainwin);
-}
-
static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if (summary_is_locked(summaryview)) return;
if (summaryview->folder_item == to_folder) {
- alertpanel_notice(_("Destination is same as current folder."));
+ alertpanel_error(_("Destination is same as current folder."));
return;
}
if (summary_is_locked(summaryview)) return;
if (summaryview->folder_item == to_folder) {
- alertpanel_notice
+ alertpanel_error
(_("Destination to copy is same as current folder."));
return;
}
g_warning("summary_save_as(): faild to convert character set.");
filename = g_strdup(oldstr);
}
- dest = filesel_select_file(_("Save as"), filename);
+ dest = filesel_select_file_save(_("Save as"), filename);
g_free(filename);
} else
- dest = filesel_select_file(_("Save as"), filename);
+ dest = filesel_select_file_save(_("Save as"), filename);
filename = NULL;
if (!dest) return;
if (is_file_exist(dest)) {
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
}
-void summary_filter(SummaryView *summaryview)
+void summary_filter(SummaryView *summaryview, gboolean selected_only)
{
if (!filtering_rules) {
alertpanel_error(_("No filter rules defined."));
summary_status_show(summaryview);
}
else {
- gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
- GTK_CTREE_FUNC(summary_filter_func),
- summaryview);
-
+ if (selected_only) {
+ GList *cur;
+
+ for (cur = GTK_CLIST(summaryview->ctree)->selection;
+ cur != NULL; cur = cur->next) {
+ summary_filter_func(GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(cur->data),
+ summaryview);
+ }
+ } else {
+ gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
+ GTK_CTREE_FUNC(summary_filter_func),
+ summaryview);
+ }
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
}
if (!event) return FALSE;
if (event->button == 3) {
- summaryview->display_msg = TRUE;
+ summaryview->display_msg = messageview_is_visible(summaryview->messageview);
/* right clicked */
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
} else if (event->button == 2) {
- summaryview->display_msg = TRUE;
+ summaryview->display_msg = messageview_is_visible(summaryview->messageview);
} else if (event->button == 1) {
if (!prefs_common.emulate_emacs &&
messageview_is_visible(summaryview->messageview))
if (summary_is_locked(summaryview)) return TRUE;
if (!event) return TRUE;
+ if (quicksearch_has_focus(summaryview->quicksearch))
+ return FALSE;
+
switch (event->keyval) {
case GDK_Left: /* Move focus */
adj = gtk_scrolled_window_get_hadjustment
? gtkut_ctree_node_next(ctree, node)
: gtkut_ctree_node_prev(ctree, node);
if (next) {
- gtk_sctree_select(GTK_SCTREE(ctree), next);
+ gtk_sctree_select_with_state
+ (GTK_SCTREE(ctree), next, event->state);
+
+ /* Deprecated - what are the non-deprecated equivalents? */
+ if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
+ gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
+ summaryview->selected = next;
+ return TRUE;
+ }
+ }
+ break;
+ case GDK_Home:
+ case GDK_End:
+ if ((node = summaryview->selected) != NULL) {
+ GtkCTreeNode *next = NULL;
+ next = (event->keyval == GDK_Home)
+ ? gtk_ctree_node_nth(ctree, 0)
+ : gtk_ctree_node_nth(ctree,
+ g_list_length(GTK_CLIST(ctree)->row_list)-1);
+ if (next) {
+ gtk_sctree_select_with_state
+ (GTK_SCTREE(ctree), next, event->state);
+
+ /* Deprecated - what are the non-deprecated equivalents? */
+ if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
+ gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
+ summaryview->selected = next;
return TRUE;
}
}
default:
break;
}
- return TRUE;
-}
-
-static gboolean summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
- SummaryView *summaryview)
-{
- if (event != NULL && event->keyval == GDK_Return)
- summary_show(summaryview, summaryview->folder_item);
return FALSE;
}
-static gboolean summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
- SummaryView *summaryview)
+static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
{
- if (event != NULL && event->in)
- g_signal_handlers_block_by_func(G_OBJECT(summaryview->mainwin->window),
- G_CALLBACK(mainwindow_key_pressed),
- summaryview->mainwin);
- else
- g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->mainwin->window),
- G_CALLBACK(mainwindow_key_pressed),
- summaryview->mainwin);
-
- return FALSE;
-}
-
-static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
-{
- SummaryView *sw = (SummaryView *)data;
- prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
- GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
- GTK_MENU(sw->search_type)))), MENU_VAL_ID));
-
- /* Show extended search description button, only when Extended is selected */
- if (prefs_common.summary_quicksearch_type == S_SEARCH_EXTENDED) {
- gtk_widget_show(sw->search_description);
- } else {
- gtk_widget_hide(sw->search_description);
- }
+ SummaryView *summaryview = data;
- if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
- summary_show(sw, sw->folder_item);
+ summary_show(summaryview, summaryview->folder_item);
}
static void tog_searchbar_cb(GtkWidget *w, gpointer data)
{
SummaryView *summaryview = (SummaryView *)data;
- GtkWidget *hbox= summaryview->hbox_search;
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
prefs_common.show_searchbar = TRUE;
- gtk_widget_show(hbox);
+ quicksearch_show(summaryview->quicksearch);
} else {
prefs_common.show_searchbar = FALSE;
- gtk_widget_hide(hbox);
+ quicksearch_hide(summaryview->quicksearch);
}
}
g_slist_free(msginfo_list);
}
-static void summary_execute_cb(SummaryView *summaryview, guint action,
- GtkWidget *widget)
-{
- summary_execute(summaryview);
-}
-
static void summary_show_all_header_cb(SummaryView *summaryview,
guint action, GtkWidget *widget)
{
(ctree, GTK_CTREE_NODE(cur->data));
tmp2 = procmsg_get_message_file(msginfo);
if (!tmp2) continue;
- tmp1 = g_strconcat("file:/", tmp2, NULL);
+ tmp1 = g_strconcat("file://", tmp2, NULL);
g_free(tmp2);
if (!mail_list) {
CMP_FUNC_DEF(summary_cmp_by_status,
MSG_IS_UNREAD(msginfo1->flags) - MSG_IS_UNREAD(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_mime,
- MSG_IS_MIME(msginfo1->flags) - MSG_IS_MIME(msginfo2->flags))
+ MSG_IS_WITH_ATTACHMENT(msginfo1->flags) - MSG_IS_WITH_ATTACHMENT(msginfo2->flags))
CMP_FUNC_DEF(summary_cmp_by_label,
MSG_GET_COLORLABEL(msginfo1->flags) -
MSG_GET_COLORLABEL(msginfo2->flags))
const gchar *str1, *str2;
const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
- const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+ const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
g_return_val_if_fail(sv, -1);
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
const MsgInfo *msginfo1 = r1->data;
const MsgInfo *msginfo2 = r2->data;
- const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+ const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
g_return_val_if_fail(sv, -1);
g_return_val_if_fail(msginfo1 != NULL && msginfo2 != NULL, -1);
widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
"/View/Hide read messages");
- gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(1));
+ 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);
- gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
+ g_object_set_data(G_OBJECT(widget), "dont_toggle",
+ GINT_TO_POINTER(0));
}
void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
folderview_select(summaryview->mainwin->folderview, sent_folder);
}
- gtk_option_menu_set_history(GTK_OPTION_MENU(summaryview->search_type_opt),
- S_SEARCH_EXTENDED);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(summaryview->toggle_search), TRUE);
- gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), buf);
+ quicksearch_set(summaryview->quicksearch, QUICK_SEARCH_EXTENDED, buf);
g_free(buf);
- summary_show(summaryview, summaryview->folder_item);
+
node = gtk_ctree_node_nth(GTK_CTREE(summaryview->ctree), 0);
if (node)
summary_select_node(summaryview, node, TRUE, TRUE);
projects / claws.git / blobdiff