[Gnucash-changes] r12305 - gnucash/trunk - Add a button to clear the name of the currently selected file in a

[David Hampton]

Author: hampton
Date: 2006-01-08 17:39:47 -0500 (Sun, 08 Jan 2006)
New Revision: 12305
Trac: http://svn.gnucash.org/trac/changeset/12305

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/dialog-options.c
Log:
Add a button to clear the name of the currently selected file in a
file chooser.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-08 22:34:04 UTC (rev 12304)
+++ gnucash/trunk/ChangeLog	2006-01-08 22:39:47 UTC (rev 12305)
@@ -1,3 +1,15 @@
+2006-01-08  David Hampton  <hampton at employees.org>
+
+	* src/gnome-utils/dialog-options.c: Add a button to clear the name
+	of the currently selected file in a file chooser.
+
+	* src/register/register-gnome/gnucash-item-list.c:
+	* src/import-export/hbci/dialog-hbcitrans.c: The GTK2.4 headers
+	are missing a named constant.
+
+	* lib/goffice-0.0.4/goffice/glib24_26-compat.c: Fix a couple of
+	compiler version issues.
+
 2006-01-08  Derek Atkins  <derek at ihtfp.com>
 
 	* Makefile.am: fix the dist-hook macro for po/POTFILES.in

Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c	2006-01-08 22:34:04 UTC (rev 12304)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c	2006-01-08 22:39:47 UTC (rev 12305)
@@ -266,6 +266,13 @@
     return;
   g_object_set_data_full(G_OBJECT(chooser), LAST_SELECTION, filename, g_free);
 }
+#else
+static void
+gnc_image_option_clear_selection_cb (GtkButton *button,
+				     GtkEntry *entry)
+{
+   gtk_entry_set_text(entry, "");
+}
 #endif
 
 /********************************************************************\
@@ -1896,6 +1903,7 @@
 {
   GtkWidget *value;
   GtkWidget *label;
+  GtkWidget *button;
 #ifndef HAVE_GLIB26
   GtkWidget *entry;
 #endif
@@ -1908,6 +1916,9 @@
   g_free(colon_name);
 
   *enclosing = gtk_hbox_new(FALSE, 5);
+
+  button = gtk_button_new_with_label(_("Clear"));
+
 #ifdef HAVE_GLIB26
   value = gtk_file_chooser_button_new(_("Select image"),
 				      GTK_FILE_CHOOSER_ACTION_OPEN);
@@ -1922,6 +1933,8 @@
 		   G_CALLBACK(gnc_image_option_selection_changed_cb), option);
   g_signal_connect(G_OBJECT (value), "update-preview",
 		   G_CALLBACK(gnc_image_option_update_preview_cb), option);
+  g_signal_connect_swapped(G_OBJECT (button), "clicked",
+		   G_CALLBACK(gtk_file_chooser_unselect_all), value);
 #else
   value = gnome_pixmap_entry_new(NULL, _("Select pixmap"),
 				 FALSE);
@@ -1931,13 +1944,16 @@
   entry = gnome_pixmap_entry_gtk_entry (GNOME_PIXMAP_ENTRY(value));
   g_signal_connect(G_OBJECT (entry), "changed",
 		   G_CALLBACK(gnc_option_changed_widget_cb), option);
+  g_signal_connect(G_OBJECT (button), "clicked",
+		   G_CALLBACK(gnc_image_option_clear_selection_cb), entry);
 #endif
     
   gnc_option_set_widget (option, value);
   gnc_option_set_ui_value(option, FALSE);
 
   gtk_box_pack_start(GTK_BOX(*enclosing), label, FALSE, FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(*enclosing), button, FALSE, FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
 
   gtk_widget_show(value);
   gtk_widget_show(label);