2006-04-06 [mones] 2.1.0cvs6

	* src/prefs_actions.c
	* src/prefs_filtering.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
	* src/prefs_template.c
	* src/gtk/gtkutils.c
	* src/gtk/gtkutils.h
		Have a nice replace button. Patch by Pawel Pekala

diff --git a/ChangeLog b/ChangeLog
index cfac1eddad7d758f9ba034d634b64441c3a080a5..931383ecc11aeb1ac6b058503110c35e4a773671 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-06 [mones]     2.1.0cvs6
+
+       * src/prefs_actions.c
+       * src/prefs_filtering.c
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+       * src/prefs_template.c
+       * src/gtk/gtkutils.c
+       * src/gtk/gtkutils.h
+               Have a nice replace button. Patch by Pawel Pekala
+
 2006-04-06 [colin]     2.1.0cvs5
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 0f0bdb70da5315cf999f7079178487522a681853..45f1b4a85a7902a73aebc03d4514c9dfe24b1da9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1377,3 +1377,4 @@
 ( cvs diff -u -r 1.96.2.105 -r 1.96.2.106 src/textview.c;  cvs diff -u -r 1.83.2.65 -r 1.83.2.66 src/mimeview.c;  cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/mimeview.h;  ) > 2.1.0cvs3.patchset
 ( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/wizard.c;  cvs diff -u -r 1.10.2.17 -r 1.10.2.18 src/prefs_gtk.c;  ) > 2.1.0cvs4.patchset
 ( cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/addressbook.c;  ) > 2.1.0cvs5.patchset
+( cvs diff -u -r 1.60.2.32 -r 1.60.2.33 src/prefs_actions.c;  cvs diff -u -r 1.59.2.32 -r 1.59.2.33 src/prefs_filtering.c;  cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.36 -r 1.43.2.37 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/prefs_template.c;  cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/gtk/gtkutils.h;  ) > 2.1.0cvs6.patchset

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

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index d0e81729e2fd646b1739f977fb97585362cb4114..9231a9bcc6585faba0a2777a6f48bdb05c8151cb 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -972,6 +972,37 @@ GtkWidget *gtkut_get_browse_directory_btn(const gchar *button_label)
        return button;
 }
 
+GtkWidget *gtkut_get_replace_btn(const gchar *button_label)
+{
+       GtkWidget *button;
+
+#if GTK_CHECK_VERSION(2, 6, 0)
+       button = gtk_button_new_with_mnemonic(button_label);
+       gtk_button_set_image(GTK_BUTTON(button),
+               gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON));
+#else
+       GtkWidget* image;
+       GtkWidget* box;
+       GtkWidget* label;
+
+       button = gtk_button_new();
+       box = gtk_hbox_new(FALSE, 0);
+
+       image = gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
+       label = gtk_label_new(NULL);
+       gtk_label_set_text_with_mnemonic(GTK_LABEL(label), button_label);
+       gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
+
+       gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 1);
+       gtk_box_pack_end(GTK_BOX(box), label, FALSE, FALSE, 1);
+       gtk_widget_show(label);
+       gtk_widget_show(image);
+       gtk_widget_show(box);
+       gtk_container_add(GTK_CONTAINER(button), box);
+#endif
+       return button;
+}
+
 #if HAVE_LIBCOMPFACE
 gint create_xpm_from_xface(gchar *xpm[], const gchar *xface)
 {

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 154d5b090e1c583b077cf9ff2a34a574ad0bec8d..136f7f1733953f7b8bfa57421e38346cc827485e 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -190,6 +190,7 @@ GtkWidget *gtkut_get_focused_child  (GtkContainer   *parent);
 
 GtkWidget *gtkut_get_browse_file_btn(const gchar *label);
 GtkWidget *gtkut_get_browse_directory_btn(const gchar *label);
+GtkWidget *gtkut_get_replace_btn(const gchar *label);
 #if HAVE_LIBCOMPFACE
 gint create_xpm_from_xface(gchar *xpm[], const gchar *xface);
 GtkWidget *xface_get_from_header(const gchar *o_xface, GdkColor *background,

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 71a79c465ff0eb87dab9fe3927a6d6926c2ff028..fc434d8dda546c45c3ca865abadfeead999ed969 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -258,7 +258,7 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
                         G_CALLBACK(prefs_actions_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label(_(" Replace "));
+       subst_btn = gtkut_get_replace_btn(_("Replace"));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(subst_btn), "clicked",

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 96aab212b74da907a66d630bf56bd35f24441504..406ba3bde49dd542d44ac975680a74c12cd7fd74 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -340,7 +340,7 @@ static void prefs_filtering_create(void)
        g_signal_connect(G_OBJECT (reg_btn), "clicked",
                         G_CALLBACK(prefs_filtering_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label (_("  Replace  "));
+       subst_btn = gtkut_get_replace_btn (_("Replace"));
        gtk_widget_show (subst_btn);
        gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT (subst_btn), "clicked",

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 92ce188f3beafb0aa7d0deeac5a2ca21fec37a88..6dd1826a8eddd99fc9c0e78657c76775b7a0b837 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -486,7 +486,7 @@ static void prefs_filtering_action_create(void)
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
                         G_CALLBACK(prefs_filtering_action_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label(_("  Replace  "));
+       subst_btn = gtkut_get_replace_btn(_("Replace"));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(subst_btn), "clicked",

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 55cbbd1ca14f8bccbe2460344a4bdf5d123744eb..601507c72f364718233d57118146fb3488433abb 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -595,7 +595,7 @@ static void prefs_matcher_create(void)
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
                         G_CALLBACK(prefs_matcher_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label(_("  Replace  "));
+       subst_btn = gtkut_get_replace_btn(_("Replace"));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(subst_btn), "clicked",

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 4046dcef5c5d03d47cd39d01eea4f62600417fe4..b8f498531dd9caf182cfc2b36748c250a5deb39b 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -255,7 +255,7 @@ static void prefs_template_window_create(void)
        g_signal_connect(G_OBJECT (reg_btn), "clicked",
                         G_CALLBACK (prefs_template_register_cb), NULL);
 
-       subst_btn = gtk_button_new_with_label(_("  Replace  "));
+       subst_btn = gtkut_get_replace_btn(_("Replace"));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(hbox3), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(subst_btn), "clicked",