--- /dev/null
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2004 Hiroyuki Yamamoto & the Sylpheed-Claws 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "intl.h"
+#include "utils.h"
+#include "menu.h"
+#include "prefs_common.h"
+#include "description_window.h"
+#include "matcher.h"
+#include "matcher_parser.h"
+#include "quicksearch.h"
+
+struct _QuickSearch
+{
+ GtkWidget *hbox_search;
+ GtkWidget *search_type;
+ GtkWidget *search_type_opt;
+ GtkWidget *search_string_entry;
+ GtkWidget *search_description;
+
+ gboolean active;
+ gchar *search_string;
+ MatcherList *matcher_list;
+
+ QuickSearchExecuteCallback callback;
+ gpointer callback_data;
+};
+
+static void prepare_matcher(QuickSearch *quicksearch)
+{
+ gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+
+ if (quicksearch->matcher_list != NULL) {
+ matcherlist_free(quicksearch->matcher_list);
+ quicksearch->matcher_list = NULL;
+ }
+
+ if (search_string == NULL || search_string[0] == '\0') {
+ quicksearch->active = FALSE;
+ return;
+ }
+
+ if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
+ char *newstr = NULL;
+
+ newstr = expand_search_string(search_string);
+ if (newstr && newstr[0] != '\0') {
+ quicksearch->matcher_list = matcher_parser_get_cond(newstr);
+ g_free(newstr);
+ } else {
+ quicksearch->matcher_list = NULL;
+ quicksearch->active = FALSE;
+
+ return;
+ }
+ } else {
+ if (quicksearch->search_string != NULL)
+ g_free(quicksearch->search_string);
+ quicksearch->search_string = g_strdup(search_string);
+ }
+
+ quicksearch->active = TRUE;
+}
+
+static gint searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+ QuickSearch *quicksearch)
+{
+ if (event != NULL && event->keyval == GDK_Return) {
+ gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->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(quicksearch->search_string_entry),
+ prefs_common.summary_quicksearch_history);
+ }
+
+ prepare_matcher(quicksearch);
+
+ if (quicksearch->callback != NULL)
+ quicksearch->callback(quicksearch, quicksearch->callback_data);
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
+ }
+
+ return TRUE;
+}
+
+static void searchtype_changed(GtkMenuItem *widget, gpointer data)
+{
+ QuickSearch *quicksearch = (QuickSearch *)data;
+
+ prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+ GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+ GTK_MENU(quicksearch->search_type))))));
+
+ /* Show extended search description button, only when Extended is selected */
+ if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
+ gtk_widget_show(quicksearch->search_description);
+ } else {
+ gtk_widget_hide(quicksearch->search_description);
+
+ }
+
+ prepare_matcher(quicksearch);
+
+ if (quicksearch->callback != NULL)
+ quicksearch->callback(quicksearch, quicksearch->callback_data);
+}
+
+/*
+ * 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);
+};
+
+/*
+static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
+ SummaryView *summaryview)
+{
+ if (event != NULL && event->in)
+ gtk_signal_handler_block_by_func(GTK_OBJECT(summaryview->mainwin->window),
+ GTK_SIGNAL_FUNC(mainwindow_key_pressed),
+ summaryview->mainwin);
+ else
+ gtk_signal_handler_unblock_by_func(GTK_OBJECT(summaryview->mainwin->window),
+ GTK_SIGNAL_FUNC(mainwindow_key_pressed),
+ summaryview->mainwin);
+}
+*/
+
+QuickSearch *quicksearch_new()
+{
+ QuickSearch *quicksearch;
+
+ GtkWidget *hbox_search;
+ GtkWidget *search_type_opt;
+ GtkWidget *search_type;
+ GtkWidget *search_string_entry;
+ GtkWidget *search_hbbox;
+ GtkWidget *search_description;
+ GtkWidget *menuitem;
+
+ quicksearch = g_new0(QuickSearch, 1);
+
+ /* quick search */
+ hbox_search = gtk_hbox_new(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"), QUICK_SEARCH_SUBJECT);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(searchtype_changed),
+ quicksearch);
+ MENUITEM_ADD (search_type, menuitem, _("From"), QUICK_SEARCH_FROM);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(searchtype_changed),
+ quicksearch);
+ MENUITEM_ADD (search_type, menuitem, _("To"), QUICK_SEARCH_TO);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(searchtype_changed),
+ quicksearch);
+ MENUITEM_ADD (search_type, menuitem, _("Extended"), QUICK_SEARCH_EXTENDED);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(searchtype_changed),
+ quicksearch);
+
+ 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_entry = gtk_combo_new();
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_string_entry, FALSE, FALSE, 2);
+ gtk_combo_set_value_in_list(GTK_COMBO(search_string_entry), FALSE, TRUE);
+ gtk_combo_set_case_sensitive(GTK_COMBO(search_string_entry), TRUE);
+ if (prefs_common.summary_quicksearch_history)
+ gtk_combo_set_popdown_strings(GTK_COMBO(search_string_entry),
+ prefs_common.summary_quicksearch_history);
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(search_string_entry)->entry), "");
+ gtk_widget_show(search_string_entry);
+
+ gtkut_button_set_create(&search_hbbox, &search_description, _("Extended Symbols"),
+ NULL, NULL, NULL, NULL);
+ gtk_signal_connect(GTK_OBJECT(search_description), "clicked",
+ GTK_SIGNAL_FUNC(search_description_cb), NULL);
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
+ gtk_widget_show(search_hbbox);
+ if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED)
+ gtk_widget_show(search_description);
+ else
+ gtk_widget_hide(search_description);
+
+ gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ "key_press_event",
+ GTK_SIGNAL_FUNC(searchbar_pressed),
+ quicksearch);
+
+ /*
+ gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ "focus_in_event",
+ GTK_SIGNAL_FUNC(searchbar_focus_evt),
+ quicksearch);
+
+ gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ "focus_out_event",
+ GTK_SIGNAL_FUNC(searchbar_focus_evt),
+ quicksearch);
+ */
+
+ quicksearch->hbox_search = hbox_search;
+ quicksearch->search_type = search_type;
+ quicksearch->search_type_opt = search_type_opt;
+ quicksearch->search_string_entry = search_string_entry;
+ quicksearch->search_description = search_description;
+ quicksearch->matcher_list = NULL;
+ quicksearch->active = FALSE;
+
+ return quicksearch;
+}
+
+GtkWidget *quicksearch_get_widget(QuickSearch *quicksearch)
+{
+ return quicksearch->hbox_search;
+}
+
+void quicksearch_show(QuickSearch *quicksearch)
+{
+ prepare_matcher(quicksearch);
+ gtk_widget_show(quicksearch->hbox_search);
+}
+
+void quicksearch_hide(QuickSearch *quicksearch)
+{
+ quicksearch->active = FALSE;
+ gtk_widget_hide(quicksearch->hbox_search);
+}
+
+void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
+ const gchar *matchstring)
+{
+ gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
+ type);
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry),
+ matchstring);
+ prefs_common.summary_quicksearch_type = type;
+
+ prepare_matcher(quicksearch);
+
+ if (quicksearch->callback != NULL)
+ quicksearch->callback(quicksearch, quicksearch->callback_data);
+}
+
+gboolean quicksearch_is_active(QuickSearch *quicksearch)
+{
+ return quicksearch->active;
+}
+
+void quicksearch_set_execute_callback(QuickSearch *quicksearch,
+ QuickSearchExecuteCallback callback,
+ gpointer data)
+{
+ quicksearch->callback = callback;
+ quicksearch->callback_data = data;
+}
+
+gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
+{
+ gchar *searched_header = NULL;
+
+ if (!quicksearch->active)
+ return TRUE;
+
+ switch (prefs_common.summary_quicksearch_type) {
+ case QUICK_SEARCH_SUBJECT:
+ searched_header = msginfo->subject;
+ break;
+ case QUICK_SEARCH_FROM:
+ searched_header = msginfo->from;
+ break;
+ case QUICK_SEARCH_TO:
+ searched_header = msginfo->to;
+ break;
+ case QUICK_SEARCH_EXTENDED:
+ break;
+ default:
+ debug_print("unknown search type (%d)\n", prefs_common.summary_quicksearch_type);
+ break;
+ }
+
+ if (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED && quicksearch->search_string &&
+ searched_header && strcasestr(searched_header, quicksearch->search_string) != NULL)
+ return TRUE;
+ else if ((quicksearch->matcher_list != NULL) && matcherlist_match(quicksearch->matcher_list, msginfo))
+ return TRUE;
+
+ return FALSE;
+}
#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"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
static gint summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static gint summary_searchbar_pressed (GtkWidget *ctree,
- GdkEventKey *event,
- SummaryView *summaryview);
-static void summary_searchbar_focus_evt (GtkWidget *ctree,
- GdkEventFocus *event,
- SummaryView *summaryview);
-static void summary_searchtype_changed (GtkMenuItem *widget,
- gpointer data);
static void summary_open_row (GtkSCTree *sctree,
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_("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_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);
gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
GTK_SIGNAL_FUNC(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);
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);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
- MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
- MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
- MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(summary_searchtype_changed),
- summaryview);
-
- gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
-
- gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
-
- gtk_widget_show(search_type);
-
- search_string = gtk_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);
- gtk_signal_connect(GTK_OBJECT(search_description), "clicked",
- GTK_SIGNAL_FUNC(search_description_cb), NULL);
- gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
- gtk_widget_show(hbox_search);
-
- gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string)->entry),
- "key_press_event",
- GTK_SIGNAL_FUNC(summary_searchbar_pressed),
- summaryview);
-
- gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string)->entry),
- "focus_in_event",
- GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
- summaryview);
-
- gtk_signal_connect(GTK_OBJECT(GTK_COMBO(search_string)->entry),
- "focus_out_event",
- GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
- summaryview);
+ quicksearch = quicksearch_new();
+ gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
+ if (prefs_common.show_searchbar)
+ quicksearch_show(quicksearch);
+ else
+ quicksearch_hide(quicksearch);
+ quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
GTK_SIGNAL_FUNC(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);
- 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);
return summaryview;
}
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(GTK_COMBO(summaryview->search_string)->entry), "");
- }
-
/* STATUSBAR_POP(summaryview->mainwin); */
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
|| 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(gtk_object_get_user_data(
- GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
- GTK_MENU(summaryview->search_type))))));
- 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 (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);
return TRUE;
}
-static gint 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);
- gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
- }
- return TRUE;
-}
-
-static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
- SummaryView *summaryview)
+static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
{
- if (event != NULL && event->in)
- gtk_signal_handler_block_by_func(GTK_OBJECT(summaryview->mainwin->window),
- GTK_SIGNAL_FUNC(mainwindow_key_pressed),
- summaryview->mainwin);
- else
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(summaryview->mainwin->window),
- GTK_SIGNAL_FUNC(mainwindow_key_pressed),
- summaryview->mainwin);
-}
-
-static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
-{
- SummaryView *sw = (SummaryView *)data;
- prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_data(
- GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
- GTK_MENU(sw->search_type))))));
-
- /* Show extended search description button, only when Extended is selected */
- if (prefs_common.summary_quicksearch_type == S_SEARCH_EXTENDED) {
- gtk_widget_show(sw->search_description);
- } else {
- gtk_widget_hide(sw->search_description);
- }
+ 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);
}
}
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);
projects / claws.git / commitdiff