2006-09-25 [wwp] 2.5.0cvs1

	* src/message_search.c
		Added the ability to stop a running search (in message body).

diff --git a/ChangeLog b/ChangeLog
index 8937a0dd6be2227964e653f866b21c9f6acdb1ca..fcd314d00f326fa5662717349f9f1f4464ec91dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-25 [wwp]       2.5.0cvs1
+
+       * src/message_search.c
+               Added the ability to stop a running search (in message body).
+
 2006-09-25 [paul]      2.5.0
 
        * NEWS

diff --git a/PATCHSETS b/PATCHSETS
index 168f9bae0ecf63b81260789f4dd4b5395826d393..be975edc3786a365fece2e4df303f8c2f7843aa5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1906,3 +1906,4 @@
 ( cvs diff -u -r 1.213.2.114 -r 1.213.2.115 src/folder.c;  cvs diff -u -r 1.207.2.122 -r 1.207.2.123 src/folderview.c;  cvs diff -u -r 1.16.2.39 -r 1.16.2.40 src/msgcache.c;  cvs diff -u -r 1.150.2.78 -r 1.150.2.79 src/procmsg.c;  cvs diff -u -r 1.395.2.253 -r 1.395.2.254 src/summaryview.c;  cvs diff -u -r 1.96.2.149 -r 1.96.2.150 src/textview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/timing.h;  cvs diff -u -r 1.2.2.19 -r 1.2.2.20 src/gtk/inputdialog.c;  ) > 2.4.0cvs212.patchset
 ( cvs diff -u -r 1.60.2.34 -r 1.60.2.35 po/es.po;  ) > 2.4.0cvs213.patchset
 ( cvs diff -u -r 1.9.2.7 -r 1.9.2.8 po/cs.po;  cvs diff -u -r 1.58.2.24 -r 1.58.2.25 po/de.po;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 po/fi.po;  cvs diff -u -r 1.42.2.26 -r 1.42.2.27 po/fr.po;  cvs diff -u -r 1.28.2.7 -r 1.28.2.8 po/nl.po;  cvs diff -u -r 1.50.2.20 -r 1.50.2.21 po/pt_BR.po;  cvs diff -u -r 1.2.2.20 -r 1.2.2.21 po/sk.po;  cvs diff -u -r 1.17.2.23 -r 1.17.2.24 po/sr.po;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 po/zh_CN.po;  ) > 2.4.0cvs214.patchset
+( cvs diff -u -r 1.3.12.16 -r 1.3.12.17 src/message_search.c;  ) > 2.5.0cvs1.patchset

diff --git a/configure.ac b/configure.ac
index e6d9ecee07689965902e563a1a2d9c5bd4f4bd7f..17d3f456991f57a7b3a7bcaa4614424caa770882 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/message_search.c b/src/message_search.c
index e1289944246b8b23c5271efd73e1f5b70654a8f1..e4d31f13f67132e50e312fffa390fc680de94ae3 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -59,11 +59,13 @@ static struct MessageSearchWindow {
        GtkWidget *prev_btn;
        GtkWidget *next_btn;
        GtkWidget *close_btn;
+       GtkWidget *stop_btn;
 
        MessageView *messageview;
 
        Compose *compose;
        gboolean search_compose;
+       gboolean is_searching;
 } search_window;
 
 static void message_search_create      (void);
@@ -73,11 +75,39 @@ static void message_search_prev_clicked     (GtkButton      *button,
                                         gpointer        data);
 static void message_search_next_clicked        (GtkButton      *button,
                                         gpointer        data);
+static void message_search_stop_clicked        (GtkButton      *button,
+                                        gpointer        data);
 static void body_activated             (void);
 static gboolean key_pressed            (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
 
+
+#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;                 \
+}
+
+static void message_show_stop_button(void)
+{
+       gtk_widget_hide(search_window.close_btn);
+       gtk_widget_show(search_window.stop_btn);
+       GTK_BUTTON_SET_SENSITIVE(search_window.prev_btn, FALSE)
+       GTK_BUTTON_SET_SENSITIVE(search_window.next_btn, FALSE)
+}
+
+static void message_hide_stop_button(void)
+{
+       gtk_widget_hide(search_window.stop_btn);
+       gtk_widget_show(search_window.close_btn);
+       gtk_widget_set_sensitive(search_window.prev_btn, TRUE);
+       gtk_widget_set_sensitive(search_window.next_btn, TRUE);
+}
+
 void message_search(MessageView *messageview)
 {
        if (!search_window.window)
@@ -125,6 +155,7 @@ static void message_search_create(void)
        GtkWidget *prev_btn;
        GtkWidget *next_btn;
        GtkWidget *close_btn;
+       GtkWidget *stop_btn;
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title (GTK_WINDOW (window),
@@ -166,10 +197,34 @@ static void message_search_create(void)
        gtk_box_pack_start (GTK_BOX (checkbtn_hbox), case_checkbtn,
                            FALSE, FALSE, 0);
 
-       gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
-                       &prev_btn, GTK_STOCK_GO_BACK,
-                       &next_btn, GTK_STOCK_GO_FORWARD,
-                       &close_btn, GTK_STOCK_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);
+
+       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_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);
+
+       /* stop button hidden */
+       stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
+       GTK_WIDGET_SET_FLAGS(stop_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
+
        gtk_widget_show (confirm_area);
        gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(next_btn);
@@ -186,6 +241,8 @@ static void message_search_create(void)
                 g_cclosure_new_swap(G_CALLBACK(gtk_widget_hide),
                                     window, NULL),
                 FALSE);
+       g_signal_connect(G_OBJECT(stop_btn), "clicked",
+                        G_CALLBACK(message_search_stop_clicked), NULL);
 
        search_window.window = window;
        search_window.body_entry = body_entry;
@@ -194,6 +251,7 @@ static void message_search_create(void)
        search_window.prev_btn = prev_btn;
        search_window.next_btn = next_btn;
        search_window.close_btn = close_btn;
+       search_window.stop_btn = stop_btn;
 }
 
 static void message_search_execute(gboolean backward)
@@ -210,7 +268,10 @@ static void message_search_execute(gboolean backward)
        case_sens = gtk_toggle_button_get_active
                (GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
 
-       for (;;) {
+       search_window.is_searching = TRUE;
+       message_show_stop_button();
+
+       for (; search_window.is_searching;) {
                gchar *str;
                AlertValue val;
 
@@ -268,6 +329,9 @@ static void message_search_execute(gboolean backward)
                } else
                        break;
        }
+
+       search_window.is_searching = FALSE;
+       message_hide_stop_button();
 }
 
 static void message_search_prev_clicked(GtkButton *button, gpointer data)
@@ -292,3 +356,8 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                gtk_widget_hide(search_window.window);
        return FALSE;
 }
+
+static void message_search_stop_clicked(GtkButton *button, gpointer data)
+{
+       search_window.is_searching = FALSE;
+}