/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004 Hiroyuki Yamamoto & the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
+ * and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active);
static void quicksearch_reset_folder_items(QuickSearch *quicksearch, FolderItem *folder_item);
+static gchar *expand_search_string(const gchar *str);
gboolean quicksearch_is_fast(QuickSearch *quicksearch)
{
} else {
quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
gtk_widget_grab_focus(
- GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ mainwindow_get_mainwindow()->summaryview->ctree);
}
return TRUE;
}
if (event != NULL && event->keyval == GDK_Return) {
+ if (quicksearch->press_timeout_id != -1) {
+ g_source_remove(quicksearch->press_timeout_id);
+ quicksearch->press_timeout_id = -1;
+ }
quicksearch->in_typing = FALSE;
/* add expression to history list and exec quicksearch */
searchbar_run(quicksearch, FALSE);
GtkWidget *clear_search;
GtkWidget *search_condition_expression;
GtkWidget *menuitem;
- GtkTooltips *search_cond_expr_tip;
+ GtkTooltips *tips = gtk_tooltips_new();
+ gint index;
quicksearch = g_new0(QuickSearch, 1);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(searchtype_changed),
quicksearch);
+ MENUITEM_ADD (search_type, menuitem, _("From, To or Subject"), QUICK_SEARCH_MIXED);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(searchtype_changed),
+ quicksearch);
MENUITEM_ADD (search_type, menuitem, _("Extended"), QUICK_SEARCH_EXTENDED);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(searchtype_changed),
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);
+ index = menu_find_option_menu_index(GTK_OPTION_MENU(search_type_opt),
+ GINT_TO_POINTER(prefs_common.summary_quicksearch_type),
+ NULL);
+ gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), index);
gtk_widget_show(search_type);
FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(clear_search), "clicked",
G_CALLBACK(clear_search_cb), quicksearch);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
+ clear_search,
+ _("Clear the current search"), NULL);
gtk_widget_show(clear_search);
#if GTK_CHECK_VERSION(2, 8, 0)
g_signal_connect(G_OBJECT (search_condition_expression), "clicked",
G_CALLBACK(search_condition_expr),
quicksearch);
- search_cond_expr_tip = gtk_tooltips_new();
- gtk_tooltips_set_tip(GTK_TOOLTIPS(search_cond_expr_tip),
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
search_condition_expression,
_("Edit search criteria"), NULL);
gtk_widget_show(search_condition_expression);
FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(search_description), "clicked",
G_CALLBACK(search_description_cb), NULL);
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
+ search_description,
+ _("Information about extended symbols"), NULL);
gtk_widget_show(search_description);
gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);
return quicksearch;
}
+void quicksearch_relayout(QuickSearch *quicksearch)
+{
+ switch (prefs_common.layout_mode) {
+ case NORMAL_LAYOUT:
+ case WIDE_LAYOUT:
+ case WIDE_MSGLIST_LAYOUT:
+#if GTK_CHECK_VERSION(2, 8, 0)
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO);
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT);
+ gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR);
+#else
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), _(" Extended Symbols... "));
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), " ... ");
+ gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), _(" Clear "));
+#endif
+ break;
+ case VERTICAL_LAYOUT:
+#if GTK_CHECK_VERSION(2, 8, 0)
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), "");
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), "");
+ gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), "");
+
+ gtk_button_set_image(GTK_BUTTON(quicksearch->search_description),
+ gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image(GTK_BUTTON(quicksearch->search_condition_expression),
+ gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image(GTK_BUTTON(quicksearch->clear_search),
+ gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON));
+#else
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), _("Info"));
+ gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), "...");
+ gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), _("Clear"));
+#endif
+ break;
+ }
+}
+
GtkWidget *quicksearch_get_widget(QuickSearch *quicksearch)
{
return quicksearch->hbox_search;
void quicksearch_show(QuickSearch *quicksearch)
{
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+ GtkWidget *ctree = NULL;
prepare_matcher(quicksearch);
gtk_widget_show(quicksearch->hbox_search);
update_extended_buttons(quicksearch);
gtk_widget_grab_focus(
GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
+
+ GTK_EVENTS_FLUSH();
+
+ if (!mainwin || !mainwin->summaryview) {
+ return;
+ }
+
+ ctree = summary_get_main_widget(mainwin->summaryview);
+
+ if (ctree && mainwin->summaryview->selected)
+ gtk_ctree_node_moveto(GTK_CTREE(ctree),
+ mainwin->summaryview->selected,
+ 0, 0.5, 0);
}
void quicksearch_hide(QuickSearch *quicksearch)
{
- quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
- quicksearch_set_active(quicksearch, FALSE);
+ if (quicksearch_is_active(quicksearch)) {
+ quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
+ quicksearch_set_active(quicksearch, FALSE);
+ }
gtk_widget_hide(quicksearch->hbox_search);
}
gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
type);
+ if (!matchstring || !(*matchstring))
+ quicksearch->in_typing = FALSE;
+
g_signal_handlers_block_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
G_CALLBACK(searchbar_changed_cb), quicksearch);
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry),
case QUICK_SEARCH_TO:
searched_header = msginfo->to;
break;
+ case QUICK_SEARCH_MIXED:
+ break;
case QUICK_SEARCH_EXTENDED:
break;
default:
}
quicksearch->matching = TRUE;
if (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED &&
+ prefs_common.summary_quicksearch_type != QUICK_SEARCH_MIXED &&
quicksearch->search_string &&
searched_header && strcasestr(searched_header, quicksearch->search_string) != NULL)
result = TRUE;
+ else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_MIXED &&
+ quicksearch->search_string && (
+ (msginfo->to && strcasestr(msginfo->to, quicksearch->search_string) != NULL) ||
+ (msginfo->from && strcasestr(msginfo->from, quicksearch->search_string) != NULL) ||
+ (msginfo->subject && strcasestr(msginfo->subject, quicksearch->search_string) != NULL) ))
+ result = TRUE;
else if ((quicksearch->matcher_list != NULL) &&
matcherlist_match(quicksearch->matcher_list, msginfo))
result = TRUE;
}
/* allow Mutt-like patterns in quick search */
-gchar *expand_search_string(const gchar *search_string)
+static gchar *expand_search_string(const gchar *search_string)
{
int i = 0;
gchar term_char, save_char;
static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch,
FolderItem *src)
{
- GSList *msglist = folder_item_get_msg_list(src);
+ GSList *msglist = NULL;
GSList *cur;
gboolean result = FALSE;
- gint num = 0, total = src->total_msgs;
+ gint num = 0, total = 0;
gint interval = quicksearch_is_fast(quicksearch) ? 5000:100;
statusbar_print_all(_("Searching in %s... \n"),
src->path ? src->path : "(null)");
+
+ msglist = folder_item_get_msg_list(src);
+ total = src->total_msgs;
folder_item_update_freeze();
for (cur = msglist; cur != NULL; cur = cur->next) {
MsgInfo *msg = (MsgInfo *)cur->data;
statusbar_progress_all(num++,total, interval);
if (quicksearch_match(quicksearch, msg)) {
- procmsg_msginfo_free(msg);
result = TRUE;
break;
}
- procmsg_msginfo_free(msg);
if (num % interval == 0)
GTK_EVENTS_FLUSH();
if (!quicksearch_is_active(quicksearch))
statusbar_progress_all(0,0,0);
statusbar_pop_all();
- g_slist_free(msglist);
+ procmsg_msg_list_free(msglist);
return result;
}
projects / claws.git / blobdiff