+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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)
{
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,
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",
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",
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",
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",
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",