Apply patch by Herbert Thoma: Bug 580281 – Entering multiple prices with price editor is tedious

Expands the price editor dialog to allow a series of prices to be edited more easily.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18062 57a11ea4-9604-0410-9ed3-97b8803252fd

src/gnome/dialog-price-editor.c

@@ -3,6 +3,7 @@
  * Copyright (C) 2001 Gnumatic, Inc.                                *
  * Author: Dave Peticolas <dave@krondo.com>                         *
  * Copyright (c) 2006 David Hampton <hampton@employees.org>         *
+ * Copyright (c) 2009 Herbert Thoma <herbie@hthoma.de>              *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -29,8 +30,10 @@
 #include <time.h>
 
 #include "dialog-utils.h"
+#include "gnc-gtk-utils.h"
 #include "gnc-amount-edit.h"
 #include "gnc-commodity-edit.h"
+#include "dialog-commodity.h"
 #include "gnc-general-select.h"
 #include "gnc-component-manager.h"
 #include "gnc-currency-edit.h"
@@ -58,13 +61,18 @@ typedef struct
   QofBook *book;
   GNCPriceDB *price_db;
 
-  GtkWidget * commodity_edit;
+  GtkWidget * namespace_cbe;
+  GtkWidget * commodity_cbe;
   GtkWidget * currency_edit;
   GtkWidget * date_edit;
   GtkWidget * source_entry;
   GtkWidget * type_combobox;
   GtkWidget * price_edit;
 
+  GtkWidget * cancel_button;
+  GtkWidget * apply_button;
+  GtkWidget * ok_button;
+
   GNCPrice *price;
   gboolean changed;
   gboolean new;
@@ -73,12 +81,16 @@ typedef struct
 
 void pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data);
 void pedit_data_changed_cb (GtkWidget *w, gpointer data);
+void pedit_commodity_ns_changed_cb (GtkComboBoxEntry *cbe, gpointer data);
+void pedit_commodity_changed_cb (GtkComboBoxEntry *cbe, gpointer data);
 
 
 static void
 gnc_prices_set_changed (PriceEditDialog *pedit_dialog, gboolean changed)
 {
   pedit_dialog->changed = changed;
+
+  gtk_widget_set_sensitive (pedit_dialog->apply_button, changed);
 }
 
 static int
@@ -115,24 +127,33 @@ type_index_to_string (int index)
 static void
 price_to_gui (PriceEditDialog *pedit_dialog)
 {
-  gnc_commodity *commodity;
+  gnc_commodity *commodity = NULL;
-  gnc_commodity *currency;
+  gnc_commodity *currency = NULL;
+  const gchar *namespace, *fullname;
   const char *source;
   const char *type;
   gnc_numeric value;
   Timespec date;
 
-  commodity = gnc_price_get_commodity (pedit_dialog->price);
+  if (pedit_dialog->price) {
-  if (commodity)
+    commodity = gnc_price_get_commodity (pedit_dialog->price);
-  {
+  }
+
+  if (commodity) {
+    namespace = gnc_commodity_get_namespace(commodity);
+    fullname = gnc_commodity_get_printname(commodity);
+    gnc_ui_update_namespace_picker(pedit_dialog->namespace_cbe,
+                                   namespace, DIAG_COMM_NON_CURRENCY);
+    gnc_ui_update_commodity_picker(pedit_dialog->commodity_cbe,
+                                   namespace, fullname);
+
     currency = gnc_price_get_currency (pedit_dialog->price);
     date = gnc_price_get_time (pedit_dialog->price);
     source = gnc_price_get_source (pedit_dialog->price);
     type = gnc_price_get_typestr (pedit_dialog->price);
     value = gnc_price_get_value (pedit_dialog->price);
   }
-  else
+  else {
-  {
     currency = gnc_default_currency ();
     date.tv_sec = time (NULL);
     date.tv_nsec = 0;
@@ -141,13 +162,11 @@ price_to_gui (PriceEditDialog *pedit_dialog)
     value = gnc_numeric_zero ();
   }
 
-  if (commodity)
-    gnc_general_select_set_selected
-      (GNC_GENERAL_SELECT (pedit_dialog->commodity_edit), commodity);
 
-  if (currency)
+  if (currency) {
     gnc_currency_edit_set_currency
       (GNC_CURRENCY_EDIT (pedit_dialog->currency_edit), currency);
+  }
 
   gnc_date_edit_set_time (GNC_DATE_EDIT (pedit_dialog->date_edit), date.tv_sec);
 
@@ -155,6 +174,7 @@ price_to_gui (PriceEditDialog *pedit_dialog)
 
   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);
 }
 
@@ -163,6 +183,7 @@ gui_to_price (PriceEditDialog *pedit_dialog)
 {
   gnc_commodity *commodity;
   gnc_commodity *currency;
+  gchar *namespace, *fullname;
   const char *source;
   const char *type;
   gnc_numeric value;
@@ -171,8 +192,9 @@ gui_to_price (PriceEditDialog *pedit_dialog)
   if (!pedit_dialog->price)
     return NULL;
 
-  commodity = gnc_general_select_get_selected
+  namespace = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbe);
-    (GNC_GENERAL_SELECT (pedit_dialog->commodity_edit));
+  fullname = gtk_combo_box_get_active_text(GTK_COMBO_BOX(pedit_dialog->commodity_cbe));
+  commodity = gnc_commodity_table_find_full(gnc_get_current_commodities(), namespace, fullname);
   if (!commodity)
     return _("You must select a commodity.");
 
@@ -204,6 +226,9 @@ gui_to_price (PriceEditDialog *pedit_dialog)
   gnc_price_set_value (pedit_dialog->price, value);
   gnc_price_commit_edit (pedit_dialog->price);
 
+  g_free(namespace);
+  g_free(fullname);
+
   return NULL;
 }
 
@@ -229,39 +254,66 @@ void
 pedit_dialog_response_cb (GtkDialog *dialog, gint response, gpointer data)
 {
   PriceEditDialog *pedit_dialog = data;
+  GNCPrice *new_price = NULL;
   const char *error_str;
 
-  if (response == GTK_RESPONSE_OK) {
+  if ((response == GTK_RESPONSE_OK) || (response == GTK_RESPONSE_APPLY)) {
     error_str = gui_to_price (pedit_dialog);
     if (error_str) {
       gnc_warning_dialog (pedit_dialog->dialog, "%s", error_str);
       return;
     }
 
-    pedit_dialog->changed = FALSE;
+    gnc_prices_set_changed (pedit_dialog, FALSE);
-    if (TRUE == pedit_dialog->new)
+    if (TRUE == pedit_dialog->new) {
       gnc_pricedb_add_price (pedit_dialog->price_db, pedit_dialog->price);
-  
+    }
+
     gnc_gui_refresh_all ();
   }
 
-  gnc_save_window_size(GCONF_SECTION, GTK_WINDOW(pedit_dialog->dialog));
+  if(response == GTK_RESPONSE_APPLY) {
-  gtk_widget_destroy (GTK_WIDGET (pedit_dialog->dialog));
+    new_price = gnc_price_clone (pedit_dialog->price, pedit_dialog->book);
-  pedit_dialog_destroy_cb (NULL, pedit_dialog);
+    pedit_dialog->new = TRUE;
+
+    gnc_price_unref (pedit_dialog->price);
+    pedit_dialog->price = new_price;
+  }
+  else {
+    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
+void
-commodity_changed_cb (GNCGeneralSelect *gsl, gpointer data)
+pedit_commodity_ns_changed_cb (GtkComboBoxEntry *cbe, gpointer data)
+{
+  PriceEditDialog *pedit_dialog = data;
+  gchar *namespace;
+
+  gnc_prices_set_changed (pedit_dialog, TRUE);
+
+  namespace = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbe);
+  gnc_ui_update_commodity_picker (pedit_dialog->commodity_cbe, namespace, NULL);
+
+  g_free(namespace);
+}
+
+void
+pedit_commodity_changed_cb (GtkComboBoxEntry *cbe, gpointer data)
 {
   gnc_commodity *commodity = NULL;
   gnc_commodity *currency = NULL;
+  gchar *namespace, *fullname;
   GList *price_list;
   PriceEditDialog *pedit_dialog = data;
 
   gnc_prices_set_changed (pedit_dialog, TRUE);
 
-  commodity = gnc_general_select_get_selected
+  namespace = gnc_ui_namespace_picker_ns (pedit_dialog->namespace_cbe);
-    (GNC_GENERAL_SELECT (pedit_dialog->commodity_edit));
+  fullname = gtk_combo_box_get_active_text(GTK_COMBO_BOX(pedit_dialog->commodity_cbe));
+  commodity = gnc_commodity_table_find_full(gnc_get_current_commodities(), namespace, fullname);
 
   if(commodity)
   {
@@ -283,6 +335,9 @@ commodity_changed_cb (GNCGeneralSelect *gsl, gpointer data)
 	(GNC_CURRENCY_EDIT (pedit_dialog->currency_edit), gnc_default_currency());
     }
   }
+
+  g_free(namespace);
+  g_free(fullname);
 }
 
 void
@@ -305,6 +360,7 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
   GtkWidget *box;
   GtkWidget *w;
   GtkWidget *label;
+  gchar *namespace;
 
   xml = gnc_glade_xml_new ("price.glade", "Price Dialog");
 
@@ -319,19 +375,19 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
   if (parent != NULL)
 	  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
 
-  box = glade_xml_get_widget (xml, "commodity_box");
+  w = glade_xml_get_widget (xml, "namespace_cbe");
-  w = gnc_general_select_new (GNC_GENERAL_SELECT_TYPE_SELECT,
+  pedit_dialog->namespace_cbe = w;
-			      gnc_commodity_edit_get_string,
+  gtk_combo_box_remove_text(GTK_COMBO_BOX(pedit_dialog->namespace_cbe), 0);
-			      gnc_commodity_edit_new_select,
+  gnc_cbe_require_list_item(GTK_COMBO_BOX_ENTRY(pedit_dialog->namespace_cbe));
-			      NULL);
+  gnc_ui_update_namespace_picker(w, NULL, DIAG_COMM_NON_CURRENCY);
-  pedit_dialog->commodity_edit = w;
-  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
-  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);
 
+  w = glade_xml_get_widget (xml, "commodity_cbe");
+  pedit_dialog->commodity_cbe = w;
+  gtk_combo_box_remove_text(GTK_COMBO_BOX(pedit_dialog->commodity_cbe), 0);
+  gnc_cbe_require_list_item(GTK_COMBO_BOX_ENTRY(pedit_dialog->commodity_cbe));
+  namespace = gnc_ui_namespace_picker_ns(pedit_dialog->namespace_cbe);
+  gnc_ui_update_commodity_picker(pedit_dialog->commodity_cbe, namespace, NULL);
+  g_free(namespace);
 
   box = glade_xml_get_widget (xml, "currency_box");
   w = gnc_currency_edit_new ();
@@ -381,6 +437,16 @@ gnc_price_pedit_dialog_create (GtkWidget *parent,
   g_signal_connect (G_OBJECT (entry), "changed",
                       G_CALLBACK (pedit_data_changed_cb), pedit_dialog);
 
+  w = glade_xml_get_widget (xml, "cancel_button");
+  pedit_dialog->cancel_button = w;
+
+  w = glade_xml_get_widget (xml, "apply_button");
+  pedit_dialog->apply_button = w;
+  gnc_prices_set_changed (pedit_dialog, FALSE);
+
+  w = glade_xml_get_widget (xml, "ok_button");
+  pedit_dialog->ok_button = w;
+
   glade_xml_signal_autoconnect_full( xml,
                                      gnc_glade_autoconnect_full_func,
                                      pedit_dialog );
@@ -420,7 +486,7 @@ show_handler (const char *class, gint component_id,
 /********************************************************************\
  * gnc_price_edit_dialog                                            *
  *   opens up a window to edit price information                    *
- *                                                                  * 
+ *                                                                  *
  * Args:   parent  - the parent of the window to be created         *
  * Return: nothing                                                  *
 \********************************************************************/
@@ -462,18 +528,19 @@ gnc_price_edit_dialog (GtkWidget * parent,
 
   pedit_dialog->price = price;
   price_to_gui(pedit_dialog);
+  gnc_prices_set_changed (pedit_dialog, FALSE);
   component_id = gnc_register_gui_component (DIALOG_PRICE_EDIT_CM_CLASS,
                                              refresh_handler, close_handler,
                                              pedit_dialog);
   gnc_gui_component_set_session (component_id, pedit_dialog->session);
-  gtk_widget_grab_focus (pedit_dialog->commodity_edit);
+  gtk_widget_grab_focus (pedit_dialog->commodity_cbe);
   gtk_widget_show (pedit_dialog->dialog);
 }
 
 /********************************************************************\
  * gnc_price_edit_by_guid                                           *
  *   opens up a window to edit price information                    *
- *                                                                  * 
+ *                                                                  *
  * Args:   parent  - the parent of the window to be created         *
  * Return: nothing                                                  *
 \********************************************************************/