/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtktable.h>
+#include <gtk/gtkoptionmenu.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkhbox.h>
#include <stdlib.h>
#include <string.h>
-#include "intl.h"
#include "main.h"
#include "summary_search.h"
#include "summaryview.h"
#include "messageview.h"
#include "mainwindow.h"
+#include "menu.h"
#include "utils.h"
#include "gtkutils.h"
#include "manage_window.h"
#include "alertpanel.h"
-static GtkWidget *window;
-static GtkWidget *from_entry;
-static GtkWidget *to_entry;
-static GtkWidget *subject_entry;
-static GtkWidget *body_entry;
-static GtkWidget *case_checkbtn;
-static GtkWidget *backward_checkbtn;
-static GtkWidget *all_checkbtn;
-static GtkWidget *and_checkbtn;
-static GtkWidget *search_btn;
-static GtkWidget *clear_btn;
-static GtkWidget *close_btn;
-
-static void summary_search_create(SummaryView *summaryview);
-static void summary_search_execute(GtkButton *button, gpointer data);
-static void summary_search_clear(GtkButton *button, gpointer data);
-static void from_activated(void);
-static void to_activated(void);
-static void subject_activated(void);
-static void body_activated(void);
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
+static struct SummarySearchWindow {
+ GtkWidget *window;
+
+ GtkWidget *bool_optmenu;
+
+ GtkWidget *from_entry;
+ GtkWidget *to_entry;
+ GtkWidget *subject_entry;
+ GtkWidget *body_entry;
+
+ GtkWidget *case_checkbtn;
+
+ GtkWidget *clear_btn;
+ GtkWidget *all_btn;
+ GtkWidget *prev_btn;
+ GtkWidget *next_btn;
+ GtkWidget *close_btn;
+
+ SummaryView *summaryview;
+} search_window;
+
+static void summary_search_create (void);
+
+static void summary_search_execute (gboolean backward,
+ gboolean search_all);
+
+static void summary_search_clear (GtkButton *button,
+ gpointer data);
+static void summary_search_prev_clicked (GtkButton *button,
+ gpointer data);
+static void summary_search_next_clicked (GtkButton *button,
+ gpointer data);
+static void summary_search_all_clicked (GtkButton *button,
+ gpointer data);
+
+static void from_activated (void);
+static void to_activated (void);
+static void subject_activated (void);
+static void body_activated (void);
+
+static gboolean key_pressed (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
+
void summary_search(SummaryView *summaryview)
{
- if (!window)
- summary_search_create(summaryview);
+ if (!search_window.window)
+ summary_search_create();
else
- gtk_widget_hide(window);
+ gtk_widget_hide(search_window.window);
+
+ search_window.summaryview = summaryview;
- gtk_widget_grab_focus(search_btn);
- gtk_widget_grab_focus(subject_entry);
- gtk_widget_show(window);
+ gtk_widget_grab_focus(search_window.next_btn);
+ gtk_widget_grab_focus(search_window.subject_entry);
+ gtk_widget_show(search_window.window);
}
-static void summary_search_create(SummaryView *summaryview)
+static void summary_search_create(void)
{
+ GtkWidget *window;
GtkWidget *vbox1;
+ GtkWidget *bool_hbox;
+ GtkWidget *bool_optmenu;
+ GtkWidget *bool_menu;
+ GtkWidget *menuitem;
+ GtkWidget *clear_btn;
+
GtkWidget *table1;
GtkWidget *from_label;
+ GtkWidget *from_entry;
GtkWidget *to_label;
+ GtkWidget *to_entry;
GtkWidget *subject_label;
+ GtkWidget *subject_entry;
GtkWidget *body_label;
+ GtkWidget *body_entry;
+
GtkWidget *checkbtn_hbox;
+ GtkWidget *case_checkbtn;
+
GtkWidget *confirm_area;
+ GtkWidget *all_btn;
+ GtkWidget *prev_btn;
+ GtkWidget *next_btn;
+ GtkWidget *close_btn;
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (window), _("Search messages"));
- gtk_widget_set_size_request (window, 450, -1);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW (window), _("Search messages"));
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
- gtk_container_set_border_width (GTK_CONTAINER (window), 8);
+ gtk_container_set_border_width(GTK_CONTAINER (window), 8);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(gtk_widget_hide_on_delete), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
gtk_widget_show (vbox1);
gtk_container_add (GTK_CONTAINER (window), vbox1);
+ bool_hbox = gtk_hbox_new(FALSE, 4);
+ gtk_widget_show(bool_hbox);
+ gtk_box_pack_start(GTK_BOX(vbox1), bool_hbox, FALSE, FALSE, 0);
+
+ bool_optmenu = gtk_option_menu_new();
+ gtk_widget_show(bool_optmenu);
+ gtk_box_pack_start(GTK_BOX(bool_hbox), bool_optmenu, FALSE, FALSE, 0);
+
+ bool_menu = gtk_menu_new();
+ MENUITEM_ADD(bool_menu, menuitem, _("Match any of the following"), 0);
+ MENUITEM_ADD(bool_menu, menuitem, _("Match all of the following"), 1);
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(bool_optmenu), bool_menu);
+
+ clear_btn = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ gtk_widget_show(clear_btn);
+ gtk_box_pack_end(GTK_BOX(bool_hbox), clear_btn, FALSE, FALSE, 0);
+
table1 = gtk_table_new (4, 3, FALSE);
gtk_widget_show (table1);
gtk_box_pack_start (GTK_BOX (vbox1), table1, TRUE, TRUE, 0);
gtk_table_attach (GTK_TABLE (table1), from_entry, 1, 3, 0, 1,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect(G_OBJECT(from_entry), "activate",
- G_CALLBACK(from_activated), summaryview);
+ G_CALLBACK(from_activated), NULL);
to_entry = gtk_entry_new ();
gtk_widget_show (to_entry);
gtk_table_attach (GTK_TABLE (table1), to_entry, 1, 3, 1, 2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect(G_OBJECT(to_entry), "activate",
- G_CALLBACK(to_activated), summaryview);
+ G_CALLBACK(to_activated), NULL);
subject_entry = gtk_entry_new ();
gtk_widget_show (subject_entry);
gtk_table_attach (GTK_TABLE (table1), subject_entry, 1, 3, 2, 3,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect(G_OBJECT(subject_entry), "activate",
- G_CALLBACK(subject_activated), summaryview);
+ G_CALLBACK(subject_activated), NULL);
body_entry = gtk_entry_new ();
gtk_widget_show (body_entry);
gtk_table_attach (GTK_TABLE (table1), body_entry, 1, 3, 3, 4,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect(G_OBJECT(body_entry), "activate",
- G_CALLBACK(body_activated), summaryview);
+ G_CALLBACK(body_activated), NULL);
from_label = gtk_label_new (_("From:"));
gtk_widget_show (from_label);
gtk_box_pack_start (GTK_BOX (checkbtn_hbox), case_checkbtn,
FALSE, FALSE, 0);
- backward_checkbtn =
- gtk_check_button_new_with_label (_("Backward search"));
- gtk_widget_show (backward_checkbtn);
- gtk_box_pack_start (GTK_BOX (checkbtn_hbox), backward_checkbtn,
- FALSE, FALSE, 0);
-
- all_checkbtn =
- gtk_check_button_new_with_label (_("Select all matched"));
- gtk_widget_show (all_checkbtn);
- gtk_box_pack_start (GTK_BOX (checkbtn_hbox), all_checkbtn,
- FALSE, FALSE, 0);
-
- and_checkbtn =
- gtk_check_button_new_with_label (_("AND search"));
- gtk_widget_show (and_checkbtn);
- gtk_box_pack_start (GTK_BOX (checkbtn_hbox), and_checkbtn,
- FALSE, FALSE, 0);
-
- gtkut_button_set_create(&confirm_area,
- &search_btn, _("Search"),
- &clear_btn, _("Clear"),
- &close_btn, _("Close"));
+ confirm_area = gtk_hbutton_box_new();
gtk_widget_show (confirm_area);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(confirm_area),
+ GTK_BUTTONBOX_END);
+ gtk_box_set_spacing(GTK_BOX(confirm_area), 5);
+
+ all_btn = gtk_button_new_with_mnemonic(_("Find _all"));
+ GTK_WIDGET_SET_FLAGS(all_btn, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
+ gtk_widget_show(all_btn);
+
+ prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
+ GTK_WIDGET_SET_FLAGS(prev_btn, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
+ gtk_widget_show(prev_btn);
+
+ next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+ GTK_WIDGET_SET_FLAGS(next_btn, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
+ gtk_widget_show(next_btn);
+
+ close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
+ gtk_widget_show(close_btn);
+
gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
- gtk_widget_grab_default(search_btn);
+ gtk_widget_grab_default(next_btn);
- g_signal_connect(G_OBJECT(search_btn), "clicked",
- G_CALLBACK(summary_search_execute),
- summaryview);
g_signal_connect(G_OBJECT(clear_btn), "clicked",
- G_CALLBACK(summary_search_clear),
- summaryview);
+ G_CALLBACK(summary_search_clear), NULL);
+ g_signal_connect(G_OBJECT(all_btn), "clicked",
+ G_CALLBACK(summary_search_all_clicked), NULL);
+ g_signal_connect(G_OBJECT(prev_btn), "clicked",
+ G_CALLBACK(summary_search_prev_clicked), NULL);
+ g_signal_connect(G_OBJECT(next_btn), "clicked",
+ G_CALLBACK(summary_search_next_clicked), NULL);
g_signal_connect_closure
(G_OBJECT(close_btn), "clicked",
g_cclosure_new_swap(G_CALLBACK(gtk_widget_hide),
window, NULL),
FALSE);
-}
-#define GET_ENTRY(entry) gtk_entry_get_text(GTK_ENTRY(entry))
-
-#define SHOW_ERROR_MESSAGE(error) \
-{ \
- if (error != NULL) { \
- g_warning("%s\n", error->message); \
- g_error_free(error); \
- } \
+ search_window.window = window;
+ search_window.bool_optmenu = bool_optmenu;
+ search_window.from_entry = from_entry;
+ search_window.to_entry = to_entry;
+ search_window.subject_entry = subject_entry;
+ search_window.body_entry = body_entry;
+ search_window.case_checkbtn = case_checkbtn;
+ search_window.clear_btn = clear_btn;
+ search_window.all_btn = all_btn;
+ search_window.prev_btn = prev_btn;
+ search_window.next_btn = next_btn;
+ search_window.close_btn = close_btn;
}
-#warning FIXME_GTK2
-static void summary_search_execute(GtkButton *button, gpointer data)
+static void summary_search_execute(gboolean backward, gboolean search_all)
{
- SummaryView *summaryview = data;
+ SummaryView *summaryview = search_window.summaryview;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
MsgInfo *msginfo;
+ gboolean bool_and;
gboolean case_sens;
- gboolean backward;
- gboolean search_all;
- gboolean search_and;
gboolean all_searched = FALSE;
- gboolean all_matched = FALSE;
- gboolean from_matched;
- gboolean to_matched;
- gboolean subj_matched;
+ gboolean matched;
gboolean body_matched;
- const gchar *body_str;
- wchar_t *wcs_hs, *fromwcs, *towcs, *subjwcs;
- wchar_t *(* WCSFindFunc) (const wchar_t *haystack,
- const wchar_t *needle);
- glong items_read, items_written;
- GError *error = NULL;
+ const gchar *from_str, *to_str, *subject_str, *body_str;
+ StrFindFunc str_find_func;
if (summary_is_locked(summaryview)) return;
summary_lock(summaryview);
+ bool_and = GPOINTER_TO_INT
+ (menu_get_option_menu_active_user_data
+ (GTK_OPTION_MENU(search_window.bool_optmenu)));
case_sens = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(case_checkbtn));
- backward = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(backward_checkbtn));
- search_all = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(all_checkbtn));
- search_and = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(and_checkbtn));
-
+ (GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
+
if (case_sens)
-#if HAVE_WCSSTR
- WCSFindFunc = wcsstr;
-#else
-#if HAVE_WCSWCS
- WCSFindFunc = wcswcs;
-#else
- WCSFindFunc = wcscasestr;
-#endif
-#endif /* HAVE_WCSSTR */
+ str_find_func = str_find;
else
- WCSFindFunc = wcscasestr;
-
- fromwcs = (wchar_t *)g_utf8_to_ucs4(GET_ENTRY(from_entry),
- -1, &items_read, &items_written,
- &error);
- SHOW_ERROR_MESSAGE(error);
- towcs = (wchar_t *)g_utf8_to_ucs4(GET_ENTRY(to_entry),
- -1, &items_read, &items_written,
- &error);
- SHOW_ERROR_MESSAGE(error);
- subjwcs = (wchar_t *)g_utf8_to_ucs4(GET_ENTRY(subject_entry),
- -1, &items_read, &items_written,
- &error);
- SHOW_ERROR_MESSAGE(error);
- body_str = GET_ENTRY(body_entry);
+ str_find_func = str_case_find;
+
+ from_str = gtk_entry_get_text(GTK_ENTRY(search_window.from_entry));
+ to_str = gtk_entry_get_text(GTK_ENTRY(search_window.to_entry));
+ subject_str = gtk_entry_get_text(GTK_ENTRY(search_window.subject_entry));
+ body_str = gtk_entry_get_text(GTK_ENTRY(search_window.body_entry));
if (search_all) {
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_unselect_all(GTK_CLIST(ctree));
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ backward = FALSE;
} else if (!summaryview->selected) {
if (backward)
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
}
if (all_searched) {
- alertpanel_message
- (_("Search failed"),
- _("Search string not found."));
+ alertpanel_full(_("Search failed"),
+ _("Search string not found."),
+ GTK_STOCK_CLOSE, NULL, NULL, FALSE,
+ NULL, ALERT_WARNING, G_ALERTDEFAULT);
break;
}
str = _("End of list reached; continue from beginning?");
val = alertpanel(_("Search finished"), str,
- _("Yes"), _("No"), NULL);
- if (G_ALERTDEFAULT == val) {
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+ if (G_ALERTALTERNATE == val) {
if (backward)
node = GTK_CTREE_NODE
(GTK_CLIST(ctree)->row_list_end);
all_searched = TRUE;
- manage_window_focus_in(window, NULL, NULL);
+ manage_window_focus_in(search_window.window, NULL, NULL);
} else
break;
}
- from_matched = to_matched = subj_matched = body_matched = FALSE;
- all_matched = search_and;
-
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (fromwcs && *fromwcs && msginfo->from) {
- wcs_hs = (wchar_t *)g_utf8_to_ucs4(msginfo->from,
- -1, &items_read, &items_written,
- &error);
- SHOW_ERROR_MESSAGE(error);
- if (wcs_hs && WCSFindFunc(wcs_hs, fromwcs) != NULL)
- from_matched = TRUE;
- else
- all_matched = FALSE;
- g_free(wcs_hs);
- }
- if (towcs && *towcs && msginfo->to) {
- wcs_hs = (wchar_t *)g_utf8_to_ucs4(msginfo->to,
- -1, &items_read, &items_written,
- &error);
- SHOW_ERROR_MESSAGE(error);
- if (wcs_hs && WCSFindFunc(wcs_hs, towcs) != NULL)
- to_matched = TRUE;
- else
- all_matched = FALSE;
- g_free(wcs_hs);
- }
- if (subjwcs && *subjwcs && msginfo->subject) {
- wcs_hs = (wchar_t *)g_utf8_to_ucs4(msginfo->subject,
- -1, &items_read, &items_written,
- &error);
- SHOW_ERROR_MESSAGE(error);
- if (wcs_hs && WCSFindFunc(wcs_hs, subjwcs) != NULL)
- subj_matched = TRUE;
- else
- all_matched = FALSE;
- g_free(wcs_hs);
- }
- if (body_str && *body_str) {
- if (procmime_find_string(msginfo, body_str, case_sens))
- body_matched = TRUE;
- else
- all_matched = FALSE;
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ body_matched = FALSE;
+
+ if (bool_and) {
+ matched = TRUE;
+ if (*from_str) {
+ if (!msginfo->from ||
+ !str_find_func(msginfo->from, from_str))
+ matched = FALSE;
+ }
+ if (matched && *to_str) {
+ if (!msginfo->to ||
+ !str_find_func(msginfo->to, to_str))
+ matched = FALSE;
+ }
+ if (matched && *subject_str) {
+ if (!msginfo->subject ||
+ !str_find_func(msginfo->subject, subject_str))
+ matched = FALSE;
+ }
+ if (matched && *body_str) {
+ if (procmime_find_string(msginfo, body_str,
+ str_find_func))
+ body_matched = TRUE;
+ else
+ matched = FALSE;
+ }
+ if (matched && !*from_str && !*to_str &&
+ !*subject_str && !*body_str)
+ matched = FALSE;
+ } else {
+ matched = FALSE;
+ if (*from_str && msginfo->from) {
+ if (str_find_func(msginfo->from, from_str))
+ matched = TRUE;
+ }
+ if (!matched && *to_str && msginfo->to) {
+ if (str_find_func(msginfo->to, to_str))
+ matched = TRUE;
+ }
+ if (!matched && *subject_str && msginfo->subject) {
+ if (str_find_func(msginfo->subject, subject_str))
+ matched = TRUE;
+ }
+ if (!matched && *body_str) {
+ if (procmime_find_string(msginfo, body_str,
+ str_find_func)) {
+ matched = TRUE;
+ body_matched = TRUE;
+ }
+ }
}
- if ((from_matched || to_matched || subj_matched || body_matched)
- && (!search_and || all_matched)) {
+ if (matched) {
if (search_all)
gtk_ctree_select(ctree, node);
else {
if (*body_str)
main_window_cursor_normal(summaryview->mainwin);
- g_free(fromwcs);
- g_free(towcs);
- g_free(subjwcs);
-
summary_unlock(summaryview);
}
-#undef GET_ENTRY
-
static void summary_search_clear(GtkButton *button, gpointer data)
{
- gtk_editable_delete_text(GTK_EDITABLE(from_entry), 0, -1);
- gtk_editable_delete_text(GTK_EDITABLE(to_entry), 0, -1);
- gtk_editable_delete_text(GTK_EDITABLE(subject_entry), 0, -1);
- gtk_editable_delete_text(GTK_EDITABLE(body_entry), 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(search_window.from_entry),
+ 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(search_window.to_entry),
+ 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(search_window.subject_entry),
+ 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(search_window.body_entry),
+ 0, -1);
+}
+
+static void summary_search_prev_clicked(GtkButton *button, gpointer data)
+{
+ summary_search_execute(TRUE, FALSE);
+}
+
+static void summary_search_next_clicked(GtkButton *button, gpointer data)
+{
+ summary_search_execute(FALSE, FALSE);
+}
+
+static void summary_search_all_clicked(GtkButton *button, gpointer data)
+{
+ summary_search_execute(FALSE, TRUE);
}
static void from_activated(void)
{
- gtk_widget_grab_focus(to_entry);
+ gtk_widget_grab_focus(search_window.to_entry);
}
static void to_activated(void)
{
- gtk_widget_grab_focus(subject_entry);
+ gtk_widget_grab_focus(search_window.subject_entry);
}
static void subject_activated(void)
{
- gtk_button_clicked(GTK_BUTTON(search_btn));
+ gtk_button_clicked(GTK_BUTTON(search_window.next_btn));
}
static void body_activated(void)
{
- gtk_button_clicked(GTK_BUTTON(search_btn));
+ gtk_button_clicked(GTK_BUTTON(search_window.next_btn));
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
- gtk_widget_hide(window);
+ gtk_widget_hide(search_window.window);
return FALSE;
}
projects / claws.git / blobdiff