+2005-10-15 [wwp] 1.9.15cvs48
+
+ * src/editjpilot.c
+ * src/editldap.c
+ * src/editvcard.c
+ * src/exphtmldlg.c
+ * src/expldifdlg.c
+ * src/export.c
+ * src/import.c
+ * src/importldif.c
+ * src/importmutt.c
+ * src/importpine.c
+ * src/prefs_account.c
+ * src/prefs_spelling.c
+ * src/gtk/gtkutils.c
+ * src/gtk/gtkutils.h
+ * src/plugins/clamav/clamav_plugin_gtk.c
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ use nicer browse-for-file/dir buttons than the "..." ones,
+ code factorizing more.
+
2005-10-14 [colin] 1.9.15cvs47
* src/mainwindow.c
( cvs diff -u -r 1.60.2.24 -r 1.60.2.25 src/prefs_actions.c; cvs diff -u -r 1.204.2.61 -r 1.204.2.62 src/prefs_common.c; cvs diff -u -r 1.103.2.31 -r 1.103.2.32 src/prefs_common.h; cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.26 -r 1.43.2.27 src/prefs_matcher.c; cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/prefs_template.c; ) > 1.9.15cvs45.patchset
( cvs diff -u -r 1.207.2.72 -r 1.207.2.73 src/folderview.c; ) > 1.9.15cvs46.patchset
( cvs diff -u -r 1.274.2.73 -r 1.274.2.74 src/mainwindow.c; cvs diff -u -r 1.59.2.24 -r 1.59.2.25 src/prefs_filtering.c; cvs diff -u -r 1.43.2.27 -r 1.43.2.28 src/prefs_matcher.c; cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/passphrase.c; ) > 1.9.15cvs47.patchset
+( cvs diff -u -r 1.5.12.6 -r 1.5.12.7 src/editjpilot.c; cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/editldap.c; cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/editvcard.c; cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/exphtmldlg.c; cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/expldifdlg.c; cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/export.c; cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/import.c; cvs diff -u -r 1.14.2.6 -r 1.14.2.7 src/importldif.c; cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/importmutt.c; cvs diff -u -r 1.1.14.8 -r 1.1.14.9 src/importpine.c; cvs diff -u -r 1.105.2.38 -r 1.105.2.39 src/prefs_account.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/prefs_spelling.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/gtk/gtkutils.h; cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.23.2.12 -r 1.23.2.13 src/plugins/spamassassin/spamassassin_gtk.c; ) > 1.9.15cvs48.patchset
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
file_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- file_btn = gtk_button_new_with_label( _(" ... "));
+ file_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Third row */
),
NULL );
- lookdn_btn = gtk_button_new_with_label( _(" ... "));
+ lookdn_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), lookdn_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
toolTip = gtk_tooltips_new();
file_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- file_btn = gtk_button_new_with_label( _(" ... "));
+ file_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
gtk_table_attach(GTK_TABLE(table), entryHtml, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- btnFile = gtk_button_new_with_label( _(" ... "));
+ btnFile = gtkut_get_browse_file_btn(_("B_rowse"));
gtk_table_attach(GTK_TABLE(table), btnFile, 2, 3, top, (top + 1),
GTK_FILL, 0, 3, 0);
gtk_table_attach(GTK_TABLE(table), entryLdif, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- btnFile = gtk_button_new_with_label( _(" ... "));
+ btnFile = gtkut_get_browse_file_btn(_("B_rowse"));
gtk_table_attach(GTK_TABLE(table), btnFile, 2, 3, top, (top + 1),
GTK_FILL, 0, 3, 0);
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
-#if GTK_CHECK_VERSION(2, 6, 0)
- src_button = gtk_button_new_with_mnemonic(_("_Browse"));
- gtk_button_set_image((GtkButton*)src_button,
- gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
-#else
- src_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-#endif
+ src_button = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), src_button, 2, 3, 0, 1,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(src_button), "clicked",
G_CALLBACK(export_srcsel_cb), NULL);
-#if GTK_CHECK_VERSION(2, 6, 0)
- file_button = gtk_button_new_with_mnemonic(_("B_rowse"));
- gtk_button_set_image((GtkButton*)file_button,
- gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
-#else
- file_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-#endif
+ file_button = gtkut_get_browse_file_btn(_("B_rowse"));
gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 1, 2,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(file_button), "clicked",
return result;
}
+
+/*!
+ *\brief Create a Browse (file) button based on GTK+ stock
+ */
+GtkWidget *gtkut_get_browse_file_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((GtkButton*)button,
+ gtk_image_new_from_stock(GTK_STOCK_OPEN, 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_OPEN, 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((GtkBox*)box, image, FALSE, FALSE, 1);
+ gtk_box_pack_end((GtkBox*)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;
+}
+
+/*!
+ *\brief Create a Browse (directory) button based on GTK+ stock
+ */
+GtkWidget *gtkut_get_browse_directory_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((GtkButton*)button,
+ gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, 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_OPEN, 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((GtkBox*)box, image, FALSE, FALSE, 1);
+ gtk_box_pack_end((GtkBox*)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;
+}
void gtkut_widget_set_small_font_size(GtkWidget *widget);
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);
+
#endif /* __GTKUTILS_H__ */
gtk_table_attach(GTK_TABLE(table), dest_entry, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
-#if GTK_CHECK_VERSION(2, 6, 0)
- file_button = gtk_button_new_with_mnemonic(_("_Browse"));
- gtk_button_set_image((GtkButton*)file_button,
- gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
-#else
- file_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-#endif
+ file_button = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 0, 1,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(file_button), "clicked",
G_CALLBACK(import_filesel_cb), NULL);
-#if GTK_CHECK_VERSION(2, 6, 0)
- dest_button = gtk_button_new_with_mnemonic(_("B_rowse"));
- gtk_button_set_image((GtkButton*)dest_button,
- gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));
-#else
- dest_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-#endif
+ dest_button = gtkut_get_browse_directory_btn(_("B_rowse"));
gtk_table_attach(GTK_TABLE(table), dest_button, 2, 3, 1, 2,
0, 0, 0, 0);
g_signal_connect(G_OBJECT(dest_button), "clicked",
_( "The full file specification of the LDIF file to import." ),
NULL );
- btnFile = gtk_button_new_with_label( _(" ... "));
+ btnFile = gtkut_get_browse_file_btn(_("B_rowse"));
gtk_table_attach(GTK_TABLE(table), btnFile, 2, 3, top, (top + 1),
GTK_FILL, 0, 3, 0);
file_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- file_btn = gtk_button_new_with_label( _(" ... "));
+ file_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
file_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- file_btn = gtk_button_new_with_label( _(" ... "));
+ file_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
/* Status line */
_("Leave empty to use the default trash folder"),
NULL);
- save_folder_select = gtk_button_new_with_label (" ... ");
+ save_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_folder_select);
gtk_table_attach (GTK_TABLE (table), save_folder_select, 2, 3, 6, 7,
(GtkAttachOptions) (0),
("Folder that will be used to save spam. Leave empty to use the default trash folder"),
NULL);
- button4 = gtk_button_new_with_label(_("..."));
+ button4 = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show(button4);
gtk_table_attach(GTK_TABLE(table), button4, 2, 3, 3, 4,
(GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
gtk_widget_show (entry_sigpath);
gtk_box_pack_start (GTK_BOX (hbox2), entry_sigpath, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION(2, 6, 0)
- signature_browse_button = gtk_button_new_with_mnemonic(_("_Browse"));
- gtk_button_set_image((GtkButton*)signature_browse_button,
- gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
-#else
- signature_browse_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-#endif
+ signature_browse_button = gtkut_get_browse_file_btn(_("_Browse"));
gtk_widget_show (signature_browse_button);
gtk_box_pack_start (GTK_BOX (hbox2), signature_browse_button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(signature_browse_button), "clicked",
gtk_label_set_justify(GTK_LABEL(label5), GTK_JUSTIFY_RIGHT);
gtk_misc_set_alignment(GTK_MISC(label5), 1, 0.5);
- btn_aspell_path = gtk_button_new_with_label(_(" ... "));
+ btn_aspell_path = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show(btn_aspell_path);
gtk_table_attach(GTK_TABLE(table), btn_aspell_path, 2, 3, 4, 5,
(GtkAttachOptions) (GTK_FILL),