2007-02-21 [colin] 2.7.2cvs60
[claws.git] / src / gtk / quicksearch.c
index 0a1b96c577779300bf077e0fad93f72a7e0b8346..4062b77b7de6a0b5e5cc941165e02efb1466fac3 100644 (file)
@@ -1,6 +1,7 @@
 /*
- * 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
@@ -70,6 +71,7 @@ struct _QuickSearch
 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)
 {
@@ -220,7 +222,9 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
 
                /* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
                if (!*str) {
-                       quicksearch_hide(quicksearch);
+                       summaryview_activate_quicksearch(
+                               mainwindow_get_mainwindow()->summaryview, 
+                               FALSE);
                } else {
                        quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
                        gtk_widget_grab_focus(
@@ -461,7 +465,7 @@ QuickSearch *quicksearch_new()
        GtkWidget *clear_search;
        GtkWidget *search_condition_expression;
        GtkWidget *menuitem;
-       GtkTooltips *search_cond_expr_tip;
+       GtkTooltips *tips = gtk_tooltips_new();
 
        quicksearch = g_new0(QuickSearch, 1);
 
@@ -549,6 +553,9 @@ QuickSearch *quicksearch_new()
                           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)
@@ -561,8 +568,7 @@ QuickSearch *quicksearch_new()
        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);
@@ -576,6 +582,9 @@ QuickSearch *quicksearch_new()
                           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);
@@ -618,6 +627,43 @@ QuickSearch *quicksearch_new()
        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;
@@ -625,17 +671,34 @@ GtkWidget *quicksearch_get_widget(QuickSearch *quicksearch)
 
 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);
 }
 
@@ -645,6 +708,9 @@ void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
        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),
@@ -773,7 +839,7 @@ gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
 }
 
 /* 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;
@@ -1024,11 +1090,9 @@ static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch,
                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))
@@ -1038,7 +1102,7 @@ static gboolean quicksearch_match_subfolder(QuickSearch *quicksearch,
        statusbar_progress_all(0,0,0);
        statusbar_pop_all();
 
-       g_slist_free(msglist);
+       procmsg_msg_list_free(msglist);
        return result;
 }