[Gnucash-changes] r12950 - gnucash/trunk - More HIG changes.

David Hampton hampton at cvs.gnucash.org
Sun Jan 22 23:36:24 EST 2006


Author: hampton
Date: 2006-01-22 23:36:24 -0500 (Sun, 22 Jan 2006)
New Revision: 12950
Trac: http://svn.gnucash.org/trac/changeset/12950

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/gnome-utils/glade/commodity.glade
   gnucash/trunk/src/gnome/dialog-price-edit-db.c
   gnucash/trunk/src/gnome/dialog-price-editor.c
   gnucash/trunk/src/gnome/glade/price.glade
   gnucash/trunk/src/gnome/glade/progress.glade
Log:
More HIG changes.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-23 04:34:58 UTC (rev 12949)
+++ gnucash/trunk/ChangeLog	2006-01-23 04:36:24 UTC (rev 12950)
@@ -1,5 +1,11 @@
 2006-01-22  David Hampton  <hampton at employees.org>
 
+	* src/gnome-utils/glade/commodity.glade:
+	* src/gnome/dialog-price-editor.c:
+	* src/gnome/glade/progress.glade:
+	* src/gnome/glade/price.glade:
+	* src/gnome/dialog-price-edit-db.c: More HIG changes.
+
 	* src/scm/printing/print-check.scm:
 	* src/gnome/glade/print.glade:
 	* src/gnome/schemas/Makefile.am:

Modified: gnucash/trunk/src/gnome/dialog-price-edit-db.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-edit-db.c	2006-01-23 04:34:58 UTC (rev 12949)
+++ gnucash/trunk/src/gnome/dialog-price-edit-db.c	2006-01-23 04:36:24 UTC (rev 12950)
@@ -179,7 +179,7 @@
 {
   PricesDialog *pdb_dialog = data;
   GladeXML *xml;
-  GtkWidget *dialog, *button, *date;
+  GtkWidget *dialog, *button, *date, *label;
   gint result;
   gboolean delete_user, delete_last;
 
@@ -187,6 +187,8 @@
   xml = gnc_glade_xml_new ("price.glade", "Deletion Date");
   dialog = glade_xml_get_widget (xml, "Deletion Date");
   date = glade_xml_get_widget (xml, "date");
+  label = glade_xml_get_widget (xml, "date_label");
+  gnc_date_make_mnemonic_target (GNC_DATE_EDIT(date), label);
   glade_xml_signal_autoconnect_full(xml, gnc_glade_autoconnect_full_func, pdb_dialog);
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (pdb_dialog->dialog));
 

Modified: gnucash/trunk/src/gnome/dialog-price-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-editor.c	2006-01-23 04:34:58 UTC (rev 12949)
+++ gnucash/trunk/src/gnome/dialog-price-editor.c	2006-01-23 04:36:24 UTC (rev 12950)
@@ -56,7 +56,7 @@
   GtkWidget * currency_edit;
   GtkWidget * date_edit;
   GtkWidget * source_entry;
-  GtkWidget * type_option;
+  GtkWidget * type_combobox;
   GtkWidget * price_edit;
 
   GNCPrice *price;
@@ -65,6 +65,8 @@
 
 } PriceEditDialog;
 
+void pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data);
+void pedit_data_changed_cb (GtkWidget *w, gpointer data);
 
 
 static void
@@ -146,9 +148,8 @@
 
   gtk_entry_set_text (GTK_ENTRY (pedit_dialog->source_entry), source);
 
-  gtk_option_menu_set_history (GTK_OPTION_MENU (pedit_dialog->type_option),
-                               type_string_to_index (type));
-
+  gtk_combo_box_set_active (GTK_COMBO_BOX(pedit_dialog->type_combobox),
+			    type_string_to_index (type));
   gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (pedit_dialog->price_edit), value);
 }
 
@@ -178,7 +179,7 @@
   date.tv_nsec = 0;
 
   type = type_index_to_string
-    (gnc_option_menu_get_active (pedit_dialog->type_option));
+    (gtk_combo_box_get_active (GTK_COMBO_BOX (pedit_dialog->type_combobox)));
 
   if (!gnc_amount_edit_evaluate (GNC_AMOUNT_EDIT (pedit_dialog->price_edit)))
     return _("You must enter a valid amount.");
@@ -198,7 +199,7 @@
 }
 
 static void
-price_window_destroy_cb (GtkWidget *widget, gpointer data)
+pedit_dialog_destroy_cb (GtkWidget *widget, gpointer data)
 {
   PriceEditDialog *pedit_dialog = data;
 
@@ -215,8 +216,8 @@
   g_free (pedit_dialog);
 }
 
-static void
-pedit_dialog_response (GtkDialog *dialog, gint response, gpointer data)
+void
+pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
   PriceEditDialog *pedit_dialog = data;
   GNCBook *book = gnc_get_current_book ();
@@ -237,7 +238,9 @@
     gnc_gui_refresh_all ();
   }
 
+  gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(pedit_dialog->dialog));
   gtk_widget_destroy (GTK_WIDGET (pedit_dialog->dialog));
+  pedit_dialog_destroy_cb (NULL, pedit_dialog);
 }
 
 static void
@@ -279,8 +282,8 @@
   }
 }
 
-static void
-currency_changed_cb (GtkWidget *w, gpointer data)
+void
+pedit_data_changed_cb (GtkWidget *w, gpointer data)
 {
   PriceEditDialog *pedit_dialog = data;
 
@@ -288,54 +291,15 @@
 }
 
 static void
-date_changed_cb (GNCDateEdit *gde, gpointer data)
-{
-  PriceEditDialog *pedit_dialog = data;
-
-  gnc_prices_set_changed (pedit_dialog, TRUE);
-}
-
-static void
-date_entry_changed_cb (GtkWidget *w, gpointer data)
-{
-  PriceEditDialog *pedit_dialog = data;
-
-  gnc_prices_set_changed (pedit_dialog, TRUE);
-}
-
-static void
-type_menu_changed (GtkButton *button, gpointer data)
-{
-  PriceEditDialog *pedit_dialog = data;
-
-  gnc_prices_set_changed (pedit_dialog, TRUE);
-}
-
-static void
-connect_type_menu_item (GtkWidget *item, gpointer data)
-{
-  g_signal_connect (G_OBJECT(item), "activate",
-                      G_CALLBACK (type_menu_changed), data);
-}
-
-static void
-amount_changed_cb (GtkWidget *w, gpointer data)
-{
-  PriceEditDialog *pedit_dialog = data;
-
-  gnc_prices_set_changed (pedit_dialog, TRUE);
-}
-
-static void
 gnc_price_pedit_dialog_create (GtkWidget * parent, PriceEditDialog *pedit_dialog)
 {
   GladeXML *xml;
   GNCPrintAmountInfo print_info;
   GtkWidget *dialog;
   GtkWidget *entry;
-  GtkWidget *menu;
   GtkWidget *box;
   GtkWidget *w;
+  GtkWidget *label;
 
   xml = gnc_glade_xml_new ("price.glade", "Price Dialog");
 
@@ -346,13 +310,6 @@
   if (parent != NULL)
 	  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
 
-  g_signal_connect (G_OBJECT (dialog), "response",
-		    G_CALLBACK (pedit_dialog_response), pedit_dialog);
-
-  g_signal_connect (G_OBJECT (dialog), "destroy",
-		    G_CALLBACK (price_window_destroy_cb),
-		    pedit_dialog);
-
   box = glade_xml_get_widget (xml, "commodity_box");
   w = gnc_general_select_new (GNC_GENERAL_SELECT_TYPE_SELECT,
 			      gnc_commodity_edit_get_string,
@@ -363,6 +320,8 @@
   gtk_widget_show (w);
   g_signal_connect (G_OBJECT (w), "changed",
                     G_CALLBACK (commodity_changed_cb), pedit_dialog);
+  label = glade_xml_get_widget (xml, "commodity_label");
+  gnc_general_select_make_mnemonic_target (GNC_GENERAL_SELECT(w), label);
 
 
   box = glade_xml_get_widget (xml, "currency_box");
@@ -373,7 +332,9 @@
   gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
   gtk_widget_show (w);
   g_signal_connect (G_OBJECT (GTK_COMBO_BOX(w)), "changed",
-                    G_CALLBACK (currency_changed_cb), pedit_dialog);
+                    G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
+  label = glade_xml_get_widget (xml, "currency_label");
+  gtk_label_set_mnemonic_widget (GTK_LABEL(label), w);
 
   box = glade_xml_get_widget (xml, "date_box");
   w = gnc_date_edit_new (time (NULL), FALSE, FALSE);
@@ -381,24 +342,20 @@
   gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
   gtk_widget_show (w);
   g_signal_connect (G_OBJECT (w), "date_changed",
-                    G_CALLBACK (date_changed_cb), pedit_dialog);
+                    G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
   g_signal_connect (G_OBJECT (GNC_DATE_EDIT (w)->date_entry), "changed",
-                    G_CALLBACK (date_entry_changed_cb), pedit_dialog);
+                    G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
   gtk_entry_set_activates_default(GTK_ENTRY(GNC_DATE_EDIT(w)->date_entry), TRUE);
+  label = glade_xml_get_widget (xml, "date_label");
+  gnc_date_make_mnemonic_target (GNC_DATE_EDIT(w), label);
 
 
   w = glade_xml_get_widget (xml, "source_entry");
   pedit_dialog->source_entry = w;
 
-  w = glade_xml_get_widget (xml, "type_option");
-  pedit_dialog->type_option = w;
+  w = glade_xml_get_widget (xml, "type_combobox");
+  pedit_dialog->type_combobox = w;
 
-
-  gnc_option_menu_init (w);
-  menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (w));
-  gtk_container_forall (GTK_CONTAINER (menu),
-                        connect_type_menu_item, pedit_dialog);
-
   box = glade_xml_get_widget (xml, "price_box");
   w = gnc_amount_edit_new ();
   pedit_dialog->price_edit = w;
@@ -409,10 +366,17 @@
   gnc_amount_edit_set_fraction (GNC_AMOUNT_EDIT (w), 1000000);
   gtk_entry_set_activates_default(GTK_ENTRY(w), TRUE);
   gtk_widget_show (w);
+  label = glade_xml_get_widget (xml, "price_label");
+  gtk_label_set_mnemonic_widget (GTK_LABEL(label), w);
 
   entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (w));
   g_signal_connect (G_OBJECT (entry), "changed",
-                      G_CALLBACK (amount_changed_cb), pedit_dialog);
+                      G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
+
+  glade_xml_signal_autoconnect_full( xml,
+                                     gnc_glade_autoconnect_full_func,
+                                     pedit_dialog );
+
 }
 
 static void
@@ -436,8 +400,7 @@
 {
   PriceEditDialog *pedit_dialog = user_data;
 
-  gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(pedit_dialog->dialog));
-  gtk_widget_destroy (GTK_WIDGET (pedit_dialog->dialog));
+  gtk_dialog_response(GTK_DIALOG(pedit_dialog->dialog), GTK_RESPONSE_CANCEL);
 }
 
 static void

Modified: gnucash/trunk/src/gnome/glade/price.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/price.glade	2006-01-23 04:34:58 UTC (rev 12949)
+++ gnucash/trunk/src/gnome/glade/price.glade	2006-01-23 04:36:24 UTC (rev 12950)
@@ -4,6 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="Prices Dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Price Editor</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -26,7 +27,7 @@
     <widget class="GtkVBox" id="vbox121">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="hbuttonbox4">
@@ -42,7 +43,7 @@
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -55,323 +56,281 @@
       </child>
 
       <child>
-	<widget class="GtkFrame" id="frame50">
+	<widget class="GtkScrolledWindow" id="price_list_window">
 	  <property name="border_width">3</property>
 	  <property name="visible">True</property>
-	  <property name="label_xalign">0</property>
-	  <property name="label_yalign">0.5</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	  <property name="shadow_type">GTK_SHADOW_IN</property>
+	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox122">
+	    <placeholder/>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHButtonBox" id="hbuttonbox5">
+	  <property name="border_width">5</property>
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+	  <property name="spacing">20</property>
+
+	  <child>
+	    <widget class="GtkButton" id="add_button">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
+	      <property name="tooltip" translatable="yes">Add a new price.</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-add</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="gnc_prices_dialog_add_clicked" last_modification_time="Tue, 25 Nov 2003 06:46:11 GMT"/>
+	    </widget>
+	  </child>
 
-	      <child>
-		<widget class="GtkScrolledWindow" id="price_list_window">
-		  <property name="border_width">3</property>
-		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+	  <child>
+	    <widget class="GtkButton" id="remove_button">
+	      <property name="visible">True</property>
+	      <property name="sensitive">False</property>
+	      <property name="tooltip" translatable="yes">Remove the current price</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-remove</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" last_modification_time="Tue, 25 Nov 2003 06:48:02 GMT"/>
+	    </widget>
+	  </child>
 
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
+	  <child>
+	    <widget class="GtkButton" id="edit_button">
+	      <property name="visible">True</property>
+	      <property name="sensitive">False</property>
+	      <property name="tooltip" translatable="yes">Edit the current price.</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" last_modification_time="Tue, 25 Nov 2003 06:48:50 GMT"/>
 
 	      <child>
-		<widget class="GtkHButtonBox" id="hbuttonbox5">
-		  <property name="border_width">5</property>
+		<widget class="GtkAlignment" id="alignment5">
 		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
-		  <property name="spacing">20</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkButton" id="add_button">
+		    <widget class="GtkHBox" id="hbox115">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Add a new price.</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-add</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="gnc_prices_dialog_add_clicked" last_modification_time="Tue, 25 Nov 2003 06:46:11 GMT"/>
-		    </widget>
-		  </child>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
 
-		  <child>
-		    <widget class="GtkButton" id="remove_button">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="tooltip" translatable="yes">Remove the current price</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-remove</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="gnc_prices_dialog_remove_clicked" last_modification_time="Tue, 25 Nov 2003 06:48:02 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="edit_button">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="tooltip" translatable="yes">Edit the current price.</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="gnc_prices_dialog_edit_clicked" last_modification_time="Tue, 25 Nov 2003 06:48:50 GMT"/>
-
 		      <child>
-			<widget class="GtkAlignment" id="alignment5">
+			<widget class="GtkImage" id="image5">
 			  <property name="visible">True</property>
+			  <property name="stock">gtk-properties</property>
+			  <property name="icon_size">4</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 
-			  <child>
-			    <widget class="GtkHBox" id="hbox115">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image5">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-properties</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label8477426">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Edit</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
+		      <child>
+			<widget class="GtkLabel" id="label8477426">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Edit</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
 		      </child>
 		    </widget>
 		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
 
+	  <child>
+	    <widget class="GtkButton" id="remove_old_button">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Remove prices older than a user-entered date</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" last_modification_time="Tue, 25 Nov 2003 06:48:20 GMT"/>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment6">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
+
 		  <child>
-		    <widget class="GtkButton" id="remove_old_button">
+		    <widget class="GtkHBox" id="hbox116">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Remove prices older than a user-entered date</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="gnc_prices_dialog_remove_old_clicked" last_modification_time="Tue, 25 Nov 2003 06:48:20 GMT"/>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
 
 		      <child>
-			<widget class="GtkAlignment" id="alignment6">
+			<widget class="GtkImage" id="image6">
 			  <property name="visible">True</property>
+			  <property name="stock">gtk-remove</property>
+			  <property name="icon_size">4</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 
-			  <child>
-			    <widget class="GtkHBox" id="hbox116">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image6">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-remove</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label8477427">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Remove _Old</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
+		      <child>
+			<widget class="GtkLabel" id="label8477427">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Remove _Old</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
 		      </child>
 		    </widget>
 		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
 
+	  <child>
+	    <widget class="GtkButton" id="get_quotes_button">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Get new online quotes for stock accounts.</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" last_modification_time="Tue, 25 Nov 2003 06:49:09 GMT"/>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment7">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
+
 		  <child>
-		    <widget class="GtkButton" id="get_quotes_button">
+		    <widget class="GtkHBox" id="hbox117">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Get new online quotes for stock accounts.</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="gnc_prices_dialog_get_quotes_clicked" last_modification_time="Tue, 25 Nov 2003 06:49:09 GMT"/>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
 
 		      <child>
-			<widget class="GtkAlignment" id="alignment7">
+			<widget class="GtkImage" id="image7">
 			  <property name="visible">True</property>
+			  <property name="stock">gtk-execute</property>
+			  <property name="icon_size">4</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
 
-			  <child>
-			    <widget class="GtkHBox" id="hbox117">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image7">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-execute</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label8477428">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Get _Quotes</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
+		      <child>
+			<widget class="GtkLabel" id="label8477428">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Get _Quotes</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
 		      </child>
 		    </widget>
 		  </child>
 		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
 	      </child>
 	    </widget>
 	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Prices</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">label_item</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-	  <property name="expand">True</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
@@ -380,11 +339,12 @@
 </widget>
 
 <widget class="GtkDialog" id="Price Dialog">
+  <property name="border_width">6</property>
   <property name="title" translatable="yes">Price Editor</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -392,12 +352,13 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
+  <signal name="response" handler="pedit_dialog_response_cb" last_modification_time="Sun, 22 Jan 2006 20:18:04 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox18">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area18">
@@ -449,15 +410,15 @@
 	  <property name="column_spacing">12</property>
 
 	  <child>
-	    <widget class="GtkLabel" id="label8477399">
+	    <widget class="GtkLabel" id="commodity_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Commodity:</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">Co_mmodity:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -473,15 +434,15 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label8477400">
+	    <widget class="GtkLabel" id="currency_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Currency:</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">Cu_rrency:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -497,15 +458,15 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label8477401">
+	    <widget class="GtkLabel" id="date_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Date:</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">_Date:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -521,17 +482,18 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label8477402">
-	      <property name="label" translatable="yes">Source:</property>
-	      <property name="use_underline">False</property>
+	    <widget class="GtkLabel" id="source_label">
+	      <property name="label" translatable="yes">_Source:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">source_entry</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -544,18 +506,19 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label8477403">
+	    <widget class="GtkLabel" id="type_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Type:</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">_Type:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="mnemonic_widget">type_combobox</property>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">0</property>
@@ -568,15 +531,15 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label8477404">
+	    <widget class="GtkLabel" id="price_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Price:</property>
-	      <property name="use_underline">False</property>
+	      <property name="label" translatable="yes">_Price:</property>
+	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_CENTER</property>
 	      <property name="wrap">False</property>
 	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
+	      <property name="xalign">0</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
@@ -660,6 +623,7 @@
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
+	      <signal name="changed" handler="pedit_data_changed_cb" last_modification_time="Sun, 22 Jan 2006 20:04:22 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -671,82 +635,42 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkOptionMenu" id="type_option">
+	    <widget class="GtkHBox" id="price_box">
 	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="history">0</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
 
-	      <child internal-child="menu">
-		<widget class="GtkMenu" id="convertwidget3">
-		  <property name="visible">True</property>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="convertwidget4">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Bid</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="convertwidget5">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Ask</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="convertwidget6">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Last</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="convertwidget7">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Net Asset Value</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="convertwidget8">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Unknown</property>
-		      <property name="use_underline">True</property>
-		    </widget>
-		  </child>
-		</widget>
+	      <child>
+		<placeholder/>
 	      </child>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
+	      <property name="top_attach">5</property>
+	      <property name="bottom_attach">6</property>
 	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
+	      <property name="y_options">fill</property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="GtkHBox" id="price_box">
+	    <widget class="GtkComboBox" id="type_combobox">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
+	      <property name="items" translatable="yes">Bid
+Ask
+Last
+Net Asset Value
+Unknown</property>
+	      <property name="add_tearoffs">False</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="changed" handler="pedit_data_changed_cb" last_modification_time="Sun, 22 Jan 2006 20:04:30 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
 	      <property name="x_options">fill</property>
 	      <property name="y_options">fill</property>
 	    </packing>
@@ -763,12 +687,13 @@
 </widget>
 
 <widget class="GtkDialog" id="Deletion Date">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -781,7 +706,7 @@
     <widget class="GtkVBox" id="dialog-vbox19">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area19">
@@ -823,16 +748,18 @@
       </child>
 
       <child>
-	<widget class="GtkVBox" id="vbox123">
+	<widget class="GtkTable" id="table2">
 	  <property name="visible">True</property>
+	  <property name="n_rows">5</property>
+	  <property name="n_columns">2</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
+	  <property name="row_spacing">6</property>
+	  <property name="column_spacing">12</property>
 
 	  <child>
 	    <widget class="GtkLabel" id="label8477429">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Delete all downloaded prices
-dated earlier than this date.</property>
+	      <property name="label" translatable="yes">Delete all stock prices based upon the critera below:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -844,32 +771,21 @@
 	      <property name="ypad">0</property>
 	    </widget>
 	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <widget class="Custom" id="date">
-	      <property name="visible">True</property>
-	      <property name="creation_function">gnc_date_edit_new_glade</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Fri, 25 Nov 2005 22:13:25 GMT</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkCheckButton" id="delete_manual">
 	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Delete manually entered stock prices dated earlier than the specified date. By default, only stock prices added by Finance::Quote will be deleted.</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Delete _manually entered prices too</property>
+	      <property name="label" translatable="yes">Delete _manually entered prices</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -878,15 +794,19 @@
 	      <property name="draw_indicator">True</property>
 	    </widget>
 	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">3</property>
+	      <property name="bottom_attach">4</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 
 	  <child>
 	    <widget class="GtkCheckButton" id="delete_last">
 	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Delete all prices before the specified date.  By default, the last stock price dated before the date will be kept and all earlier quotes deleted.</property>
 	      <property name="can_focus">True</property>
 	      <property name="label" translatable="yes">Delete _last price for a stock</property>
 	      <property name="use_underline">True</property>
@@ -897,15 +817,79 @@
 	      <property name="draw_indicator">True</property>
 	    </widget>
 	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 
 	  <child>
-	    <placeholder/>
+	    <widget class="GtkLabel" id="label8477431">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="date_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_Date:</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_options"></property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="Custom" id="date">
+	      <property name="visible">True</property>
+	      <property name="creation_function">gnc_date_edit_new_glade</property>
+	      <property name="int1">0</property>
+	      <property name="int2">0</property>
+	      <property name="last_modification_time">Fri, 25 Nov 2005 22:13:25 GMT</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>

Modified: gnucash/trunk/src/gnome/glade/progress.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/progress.glade	2006-01-23 04:34:58 UTC (rev 12949)
+++ gnucash/trunk/src/gnome/glade/progress.glade	2006-01-23 04:36:24 UTC (rev 12950)
@@ -5,12 +5,13 @@
 <requires lib="gnome"/>
 
 <widget class="GtkWindow" id="Progress Dialog">
+  <property name="border_width">6</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Working...</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">True</property>
-  <property name="resizable">True</property>
+  <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
@@ -23,7 +24,7 @@
       <property name="border_width">5</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">5</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkLabel" id="heading_label">
@@ -51,7 +52,7 @@
 	  <property name="visible">True</property>
 	  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
 	  <property name="fraction">0</property>
-	  <property name="pulse_step">0.1</property>
+	  <property name="pulse_step">0.10000000149</property>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -64,7 +65,7 @@
 	<widget class="GtkHButtonBox" id="hbuttonbox3">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">30</property>
+	  <property name="spacing">6</property>
 
 	  <child>
 	    <widget class="GtkButton" id="cancel_button">

Modified: gnucash/trunk/src/gnome-utils/glade/commodity.glade
===================================================================
--- gnucash/trunk/src/gnome-utils/glade/commodity.glade	2006-01-23 04:34:58 UTC (rev 12949)
+++ gnucash/trunk/src/gnome-utils/glade/commodity.glade	2006-01-23 04:36:24 UTC (rev 12950)
@@ -28,7 +28,7 @@
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area12">
 	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
 	    <widget class="GtkButton" id="new_button">



More information about the gnucash-changes mailing list