/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto 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
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gtk/gtksctree.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
GtkWidget *close_btn;
GtkWidget *stop_btn;
- MessageView *messageview;
+ SearchInterface *interface;
+ void *interface_obj;
- Compose *compose;
- gboolean search_compose;
gboolean is_searching;
gboolean body_entry_has_focus;
} search_window;
+static SearchInterface compose_interface = {
+ .search_string_backward = (SearchStringFunc) compose_search_string_backward,
+ .set_position = (SetPositionFunc) compose_set_position,
+ .search_string = (SearchStringFunc) compose_search_string,
+};
+
+static SearchInterface messageview_interface = {
+ .set_position = (SetPositionFunc) messageview_set_position,
+ .search_string = (SearchStringFunc) messageview_search_string,
+ .search_string_backward = (SearchStringFunc) messageview_search_string_backward,
+};
+
static void message_search_create (void);
static void message_search_execute (gboolean backward);
gpointer data);
-#if !GTK_CHECK_VERSION(2,14,0)
-/* Work around http://bugzilla.gnome.org/show_bug.cgi?id=56070 */
-#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) { \
- gboolean in_btn = FALSE; \
- if (GTK_IS_BUTTON(widget)) \
- in_btn = GTK_BUTTON(widget)->in_button; \
- gtk_widget_set_sensitive(widget, sensitive); \
- if (GTK_IS_BUTTON(widget)) \
- GTK_BUTTON(widget)->in_button = in_btn; \
-}
-#else
#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) { \
gtk_widget_set_sensitive(widget, sensitive); \
}
-#endif
static void message_show_stop_button(void)
{
void message_search(MessageView *messageview)
{
- if (!search_window.window)
- message_search_create();
- else
- gtk_widget_hide(search_window.window);
+ message_search_other(&messageview_interface, (void *)messageview);
+}
- search_window.messageview = messageview;
- search_window.search_compose = FALSE;
+void message_search_compose(Compose *compose)
+{
+ message_search_other(&compose_interface, (void *)compose);
+}
- gtk_widget_grab_focus(search_window.next_btn);
- gtk_widget_grab_focus(search_window.body_entry);
- gtk_widget_show(search_window.window);
+void message_search_close (void *obj)
+{
+ if(!search_window.window) {
+ return;
+ }
+ if (search_window.interface_obj == obj) {
+ gtk_widget_hide(search_window.window);
+ search_window.interface_obj = NULL;
+ }
}
-void message_search_compose(Compose *compose)
+void message_search_other(SearchInterface *interface, void *obj)
{
if (!search_window.window)
message_search_create();
else
gtk_widget_hide(search_window.window);
- search_window.compose = compose;
- search_window.search_compose = TRUE;
+ search_window.interface_obj = obj;
+ search_window.interface = interface;
gtk_widget_grab_focus(search_window.next_btn);
gtk_widget_grab_focus(search_window.body_entry);
gtk_widget_show(search_window.window);
}
+
static void message_search_create(void)
{
GtkWidget *window;
_("Find in current message"));
gtk_widget_set_size_request (window, 450, -1);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
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);
gtk_widget_show (body_label);
gtk_box_pack_start (GTK_BOX (hbox1), body_label, FALSE, FALSE, 0);
- body_entry = gtk_combo_box_entry_new_text ();
+ body_entry = gtk_combo_box_text_new_with_entry ();
gtk_combo_box_set_active(GTK_COMBO_BOX(body_entry), -1);
if (prefs_common.message_search_history)
- combobox_set_popdown_strings(GTK_COMBO_BOX(body_entry),
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(body_entry),
prefs_common.message_search_history);
gtk_widget_show (body_entry);
gtk_box_pack_start (GTK_BOX (hbox1), body_entry, TRUE, TRUE, 0);
gtkut_stock_button_add_help(confirm_area, &help_btn);
prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
- GTK_WIDGET_SET_FLAGS(prev_btn, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(prev_btn, TRUE);
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_widget_set_can_default(next_btn, TRUE);
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_widget_set_can_default(close_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
gtk_widget_show(close_btn);
/* stop button hidden */
stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
- GTK_WIDGET_SET_FLAGS(stop_btn, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(stop_btn, TRUE);
gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
gtk_widget_show (confirm_area);
static void message_search_execute(gboolean backward)
{
- MessageView *messageview = search_window.messageview;
- Compose *compose = search_window.compose;
+ void *interface_obj = search_window.interface_obj;
gboolean case_sens;
gboolean all_searched = FALSE;
gchar *body_str;
- body_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
+ body_str = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(search_window.body_entry));
if (!body_str)
body_str = gtk_editable_get_chars(
GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.body_entry))),0,-1);
if (!body_str || *body_str == '\0') return;
/* add to history */
- combobox_unset_popdown_strings(GTK_COMBO_BOX(search_window.body_entry));
+ combobox_unset_popdown_strings(GTK_COMBO_BOX_TEXT(search_window.body_entry));
prefs_common.message_search_history = add_history(
prefs_common.message_search_history, body_str);
- combobox_set_popdown_strings(GTK_COMBO_BOX(search_window.body_entry),
+ combobox_set_popdown_strings(GTK_COMBO_BOX_TEXT(search_window.body_entry),
prefs_common.message_search_history);
case_sens = gtk_toggle_button_get_active
AlertValue val;
if (backward) {
- if (search_window.search_compose) {
- if (compose_search_string_backward
- (compose, body_str, case_sens) == TRUE)
- break;
- } else {
- if (messageview_search_string_backward
- (messageview, body_str, case_sens) == TRUE)
- break;
- }
+ if (search_window.interface->search_string_backward
+ (interface_obj, body_str, case_sens) == TRUE)
+ break;
} else {
- if (search_window.search_compose) {
- if (compose_search_string
- (compose, body_str, case_sens) == TRUE)
- break;
- } else {
- if (messageview_search_string
- (messageview, body_str, case_sens) == TRUE)
- break;
- }
+ if (search_window.interface->search_string
+ (interface_obj, body_str, case_sens) == TRUE)
+ break;
}
if (all_searched) {
alertpanel_full(_("Search failed"),
_("Search string not found."),
GTK_STOCK_CLOSE, NULL, NULL, FALSE,
- NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ ALERTFOCUS_FIRST, NULL, ALERT_WARNING);
break;
}
"continue from beginning?");
val = alertpanel(_("Search finished"), str,
- GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
+ GTK_STOCK_NO, GTK_STOCK_YES, NULL, ALERTFOCUS_SECOND);
if (G_ALERTALTERNATE == val) {
manage_window_focus_in(search_window.window,
NULL, NULL);
- if (search_window.search_compose) {
- compose_set_position(compose,
- backward ? -1 : 0);
- } else {
- messageview_set_position(messageview,
- backward ? -1 : 0);
- }
+ search_window.interface->set_position(interface_obj,
+ backward ? -1 : 0);
} else
break;
}
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && (event->keyval == GDK_Escape)) {
+ if (event && (event->keyval == GDK_KEY_Escape)) {
gtk_widget_hide(search_window.window);
}
- if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+ if (event && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
message_search_execute(FALSE);
}
- if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+ if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
if (search_window.body_entry_has_focus) {
combobox_set_value_from_arrow_key(
GTK_COMBO_BOX(search_window.body_entry),
projects / claws.git / blobdiff