#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwidget.h>
#include <string.h>
#include <ctype.h>
-#include "intl.h"
#include "main.h"
#include "menu.h"
#include "mainwindow.h"
#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
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 news_flag_crosspost (MsgInfo *msginfo);
+static void quicksearch_execute_cb (QuickSearch *quicksearch,
+ gpointer data);
static void tog_searchbar_cb (GtkWidget *w,
gpointer data);
{N_("/Cancel a news message"), NULL, summary_cancel, 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_("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_combo_new();
- gtk_box_pack_start(GTK_BOX(hbox_search), search_string, FALSE, FALSE, 2);
- gtk_combo_set_value_in_list(GTK_COMBO(search_string), FALSE, TRUE);
- gtk_combo_set_case_sensitive(GTK_COMBO(search_string), TRUE);
- if (prefs_common.summary_quicksearch_history)
- gtk_combo_set_popdown_strings(GTK_COMBO(search_string),
- prefs_common.summary_quicksearch_history);
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(search_string)->entry), "");
- gtk_widget_show(search_string);
-
- 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);
+ quicksearch = quicksearch_new();
+ gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string)->entry),
- "key_press_event",
- G_CALLBACK(summary_searchbar_pressed),
- summaryview);
-
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string)->entry),
- "focus_in_event",
- G_CALLBACK(summary_searchbar_focus_evt),
- summaryview);
-
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string)->entry),
- "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 */
g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
gtk_widget_show_all(vbox);
- /* hide widgets that shouldn't be displayed */
- if (prefs_common.summary_quicksearch_type != S_SEARCH_EXTENDED)
- gtk_widget_hide(search_description);
+ 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;
+ PangoFontDescription *font_desc;
+ gint size;
gtk_widget_realize(summaryview->ctree);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
&gpgsignedxpm, &gpgsignedxpmmask);
- if (!small_style) {
- PangoFontDescription *font_desc = NULL;
-
- small_style = gtk_style_copy
- (gtk_widget_get_style(summaryview->ctree));
- if (SMALL_FONT)
- font_desc = pango_font_description_from_string
- (SMALL_FONT);
- if (font_desc) {
- if (small_style->font_desc)
- pango_font_description_free(small_style->font_desc);
- small_style->font_desc = font_desc;
- }
- small_marked_style = gtk_style_copy(small_style);
- small_marked_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_marked;
- small_deleted_style = gtk_style_copy(small_style);
- small_deleted_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_dim;
- }
if (!bold_style) {
- PangoFontDescription *font_desc = NULL;
bold_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
- if (BOLD_FONT)
- font_desc = pango_font_description_from_string
- (BOLD_FONT);
- if (font_desc) {
- if (bold_style->font_desc)
- pango_font_description_free
- (bold_style->font_desc);
- bold_style->font_desc = font_desc;
- }
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_marked_style = gtk_style_copy(bold_style);
bold_marked_style->fg[GTK_STATE_NORMAL] =
summaryview->color_marked;
summaryview->color_dim;
}
- style = gtk_style_copy(gtk_widget_get_style
- (summaryview->statlabel_folder));
- gtk_widget_set_style(summaryview->statlabel_folder, style);
- gtk_widget_set_style(summaryview->statlabel_select, style);
- gtk_widget_set_style(summaryview->statlabel_msgs, style);
+ font_desc = pango_font_description_new();
+ size = pango_font_description_get_size
+ (summaryview->statlabel_folder->style->font_desc);
+ pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+ 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);
+ pango_font_description_free(font_desc);
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_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;
#define CURRENTLY_DISPLAYED(m) \
( (m->msgnum == displayed_msgnum) \
- && (!g_strcasecmp(m->folder->name,item->name)) )
+ && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
inc_lock();
summary_lock(summaryview);
- if (item != summaryview->folder_item) {
- /* changing folder, reset search */
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(summaryview->search_string)->entry), "");
+ if (!prefs_common.summary_quicksearch_sticky
+ && !prefs_common.summary_quicksearch_recurse
+ && !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;
if (summaryview->mainwin->lock_count == 0 &&
(summaryview->moved > 0 || summaryview->copied > 0)) {
AlertValue val;
+ gboolean changed = FALSE;
val = alertpanel(_("Process mark"),
_("Some marks are left. Process it?"),
- _("Yes"), _("No"), _("Cancel"));
+ GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
if (G_ALERTDEFAULT == val) {
summary_unlock(summaryview);
summary_execute(summaryview);
summary_lock(summaryview);
+ changed = TRUE;
} else if (G_ALERTALTERNATE == val) {
/* DO NOTHING */
} else {
inc_unlock();
return FALSE;
}
- folder_update_op_count();
+ if (changed || !quicksearch_is_active(summaryview->quicksearch))
+ folder_update_op_count();
}
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_thaw(GTK_CLIST(ctree));
summary_unlock(summaryview);
inc_unlock();
+ if (item && quicksearch_is_running(summaryview->quicksearch)) {
+ main_window_cursor_wait(summaryview->mainwin);
+ quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+ if (quicksearch_is_active(summaryview->quicksearch))
+ quicksearch_search_subfolders(summaryview->quicksearch,
+ summaryview->folderview,
+ summaryview->folder_item);
+ main_window_cursor_normal(summaryview->mainwin);
+ }
return TRUE;
}
g_free(buf);
summaryview->folder_item = item;
item->opened = TRUE;
- g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, 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(GTK_COMBO(summaryview->search_string)->entry))) > 0) {
+ if (quicksearch_is_active(summaryview->quicksearch)) {
GSList *not_killed;
- gint search_type = GPOINTER_TO_INT(g_object_get_data(
- G_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(GTK_COMBO(summaryview->search_string)->entry));
- 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 (quicksearch_match(summaryview->quicksearch, 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_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);
}
-
+
g_slist_free(mlist);
mlist = not_killed;
}
g_slist_free(mlist);
- if (summaryview->sort_key != SORT_BY_NONE)
+ if (summaryview->sort_key != SORT_BY_NONE) {
summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
-
- g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, summaryview);
+ summary_thread_init(summaryview);
+ }
gtk_clist_thaw(GTK_CLIST(ctree));
void summary_select_prev_unread(SummaryView *summaryview)
{
GtkCTreeNode *node;
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping current\n");
+ skip_cur = TRUE;
+ }
node = summary_find_prev_flagged_msg
- (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
+ (summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
if (!node) {
AlertValue val = 0;
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTDEFAULT;
{
GtkCTreeNode *node = summaryview->selected;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping cur\n");
+ skip_cur = TRUE;
+ }
+
node = summary_find_next_flagged_msg
- (summaryview, node, MSG_UNREAD, FALSE);
+ (summaryview, node, MSG_UNREAD, skip_cur);
if (node)
summary_select_node(summaryview, node, TRUE, FALSE);
val = alertpanel(_("No more unread messages"),
_("No unread message found. "
"Go to next folder?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
break;
case NEXTUNREADMSGDIALOG_ASSUME_YES:
val = G_ALERTDEFAULT;
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_NEW, FALSE);
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Go to next folder?"),
- _("Yes"), _("Search again"), _("No"));
+ GTK_STOCK_YES, _("Search again"),
+ GTK_STOCK_NO);
if (val == G_ALERTDEFAULT) {
g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
folderview_select_next_unread(summaryview->folderview);
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
val = alertpanel(_("No more marked messages"),
_("No marked message found. "
"Search from the beginning?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_MARKED, TRUE);
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the end?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_prev_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
val = alertpanel(_("No more labeled messages"),
_("No labeled message found. "
"Search from the beginning?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (val != G_ALERTDEFAULT) return;
node = summary_find_next_flagged_msg(summaryview, NULL,
MSG_CLABEL_FLAG_MASK, TRUE);
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);
}
}
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 {
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
/* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
summary_status_show(summaryview);
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_status_show(summaryview);
}
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_lock_row(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_unlock_row(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
GList *cur;
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(summaryview);
}
g_strdup_printf("%s",
account->address);
- if (g_strcasecmp(from_name, msginfo->from) == 0) {
+ if (g_utf8_collate(from_name, msginfo->from) == 0) {
g_free(from_name);
found = TRUE;
break;
/* 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);
+ GTK_STOCK_YES, GTK_STOCK_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);
/* next code sets current row focus right. We need to find a row
* that is not deleted. */
- folder_item_update_freeze();
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
sel_last = GTK_CTREE_NODE(cur->data);
summary_delete_row(summaryview, sel_last);
}
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
node = summary_find_next_msg(summaryview, sel_last);
if (!node)
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_status_show(summaryview);
}
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;
}
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL; cur = cur->next)
summary_move_row_to
(summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
if (prefs_common.immediate_exec)
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;
}
+ folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+
for (cur = GTK_CLIST(summaryview->ctree)->selection;
cur != NULL; cur = cur->next)
summary_copy_row_to
(summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
if (prefs_common.immediate_exec)
MsgInfo *msginfo;
gchar *filename = NULL;
gchar *src, *dest;
+ gchar *tmp;
AlertValue aval = 0;
gchar *oldstr = filename;
filename = conv_codeset_strdup(filename,
CS_UTF_8,
- conv_get_current_charset_str());
+ conv_get_locale_charset_str());
if (!filename) {
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)) {
aval = alertpanel(_("Append or Overwrite"),
_("Append or overwrite existing file?"),
- _("Append"), _("Overwrite"), _("Cancel"));
+ _("Append"), _("Overwrite"),
+ GTK_STOCK_CANCEL);
if (aval != 0 && aval != 1)
return;
}
src = procmsg_get_message_file(msginfo);
+ tmp = g_path_get_basename(dest);
+
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
} else { /* overwrite */
if (copy_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
}
g_free(src);
-
/*
* If two or more msgs are selected,
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
}
g_free(src);
}
+ g_free(dest);
+ g_free(tmp);
}
void summary_print(SummaryView *summaryview)
summary_unthread_for_exec(summaryview);
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
folder_item_update_thaw();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
node = GTK_CTREE_NODE(clist->row_list);
for (; node != NULL; node = next) {
next = gtkut_ctree_node_next(ctree, node);
if (parent && parent != node) {
gtk_ctree_move(ctree, node, parent, NULL);
- gtk_ctree_expand(ctree, node);
}
node = next;
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (!summaryview->thread_collapsed)
- gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
summary_set_row_marks(summaryview, node);
main_window_cursor_wait(summaryview->mainwin);
folder_item_update_freeze();
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_set_row_colorlabel(summaryview,
GTK_CTREE_NODE(cur->data), labelcolor);
folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
main_window_cursor_normal(summaryview->mainwin);
}
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_TRIANGLE);
#endif
- gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
+ gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
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))
MessageView *messageview;
TextView *textview;
GtkAdjustment *adj;
+ gboolean mod_pressed;
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
case GDK_Down:
if ((node = summaryview->selected) != NULL) {
GtkCTreeNode *next = NULL;
- next = (event->keyval == GDK_Down)
- ? gtkut_ctree_node_next(ctree, node)
- : gtkut_ctree_node_prev(ctree, node);
+ do {
+ next = (event->keyval == GDK_Down)
+ ? gtkut_ctree_node_next(ctree, next ? next:node)
+ : gtkut_ctree_node_prev(ctree, next ? next:node);
+ } while (next && !gtk_ctree_is_viewable(ctree, next));
+
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);
-
- return TRUE;
+ summaryview->selected = next;
}
}
- break;
+ return TRUE;
+ 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;
}
summaryview->selected);
break;
}
- if (!textview_scroll_page(textview, FALSE))
- summary_select_next_unread(summaryview);
- }
+ mod_pressed = ((event->state &
+ (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
+ 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;
}
textview_scroll_one_line
- (textview, (event->state & GDK_MOD1_MASK) != 0);
+ (textview, (event->state &
+ (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
break;
case GDK_Delete:
BREAK_ON_MODIFIER_KEY();
default:
break;
}
- return TRUE;
-}
-
-static gboolean summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
- SummaryView *summaryview)
-{
- if (event != NULL && event->keyval == GDK_Return) {
- gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(summaryview->search_string)->entry));
- if (search_string && strlen(search_string) != 0) {
- prefs_common.summary_quicksearch_history =
- add_history(prefs_common.summary_quicksearch_history,
- search_string);
- gtk_combo_set_popdown_strings(GTK_COMBO(summaryview->search_string),
- prefs_common.summary_quicksearch_history);
- }
- summary_show(summaryview, summaryview->folder_item);
- g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
- return TRUE;
- }
- return FALSE;
-}
-
-static gboolean summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
- SummaryView *summaryview)
-{
- 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)
+static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
{
- SummaryView *sw = (SummaryView *)data;
- prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
- G_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(GTK_COMBO(sw->search_string)->entry)))
- 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);
}
}
{
MessageView *msgview = (MessageView*)summaryview->messageview;
GSList *msginfo_list;
- gchar *body;
g_return_if_fail(msgview != NULL);
msginfo_list = summary_get_selection(summaryview);
g_return_if_fail(msginfo_list != NULL);
-
- body = messageview_get_selection(msgview);
-
- compose_reply_mode((ComposeMode)action, msginfo_list, body);
- g_free(body);
+ compose_reply_from_messageview(msgview, msginfo_list, action);
g_slist_free(msginfo_list);
}
(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))
if (!msginfo2->var_name) \
return -1; \
\
- return strcasecmp(msginfo1->var_name, msginfo2->var_name); \
+ return g_utf8_collate(msginfo1->var_name, msginfo2->var_name); \
}
CMP_FUNC_DEF(summary_cmp_by_to, to);
if (!str2)
return -1;
- return strcasecmp(str1, str2);
+ return g_utf8_collate(str1, str2);
}
static gint summary_cmp_by_simplified_subject
GList *cur;
folder_item_update_freeze();
-
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
GTK_CTREE_FUNC(summary_ignore_thread_func),
summaryview);
folder_item_update_thaw();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
summary_status_show(summaryview);
}
GList *cur;
folder_item_update_freeze();
-
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data),
GTK_CTREE_FUNC(summary_unignore_thread_func),
summaryview);
folder_item_update_thaw();
-
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
summary_status_show(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(GTK_COMBO(summaryview->search_string)->entry), 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);
}
+
+void summaryview_export_mbox_list(SummaryView *summaryview)
+{
+ GSList *list = summary_get_selected_msg_list(summaryview);
+ gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL);
+
+ if (mbox == NULL || list == NULL)
+ return;
+
+ export_list_to_mbox(list, mbox);
+
+ g_slist_free(list);
+ g_free(mbox);
+
+}
projects / claws.git / blobdiff