Bug #653109 Change Loan Druid to an Assistant

Patch by Bob

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

src/gnome-utils/gnc-account-sel.c

@@ -200,6 +200,8 @@ gas_populate_list( GNCAccountSel *gas )
     currentSel = gtk_editable_get_chars(
                      GTK_EDITABLE(entry), 0, -1 );
 
+    g_signal_handlers_block_by_func( gas->combo, combo_changed_cb , gas );
+
     root = gnc_book_get_root_account( gnc_get_current_book() );
     accts = gnc_account_get_descendants_sorted( root );
 
@@ -232,6 +234,8 @@ gas_populate_list( GNCAccountSel *gas )
     if (active != -1)
         gtk_combo_box_set_active(GTK_COMBO_BOX(gas->combo), active);
 
+    g_signal_handlers_unblock_by_func( gas->combo, combo_changed_cb , gas );
+
     g_list_free( filteredAccts );
     if ( currentSel )
     {
@@ -313,6 +317,7 @@ gnc_account_sel_find_account (GtkTreeModel *model,
 void
 gnc_account_sel_set_account( GNCAccountSel *gas, Account *acct, gboolean set_default_acct )
 {
+    GtkEntry *entry;
     gas_find_data data;
 
     if (set_default_acct)
@@ -324,8 +329,11 @@ gnc_account_sel_set_account( GNCAccountSel *gas, Account *acct, gboolean set_def
         gtk_combo_box_set_active( GTK_COMBO_BOX(gas->combo), -1 );
     }
     if ( acct == NULL )
+    {
+        entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(gas->combo)));
+        gtk_editable_delete_text(GTK_EDITABLE(entry),0,-1);
         return;
-
+    }
     data.gas = gas;
     data.acct = acct;
     gtk_tree_model_foreach(GTK_TREE_MODEL(gas->store),

src/gnome/Makefile.am

@@ -26,6 +26,7 @@ libgnc_gnome_la_SOURCES = \
   swig-gnome.c \
   assistant-acct-period.c \
   assistant-hierarchy.c \
+  assistant-loan.c \
   assistant-stock-split.c \
   dialog-commodities.c \
   dialog-fincalc.c \
@@ -39,7 +40,6 @@ libgnc_gnome_la_SOURCES = \
   dialog-sx-from-trans.c \
   dialog-sx-since-last-run.c \
   dialog-tax-info.c \
-  druid-loan.c \
   gnc-plugin-account-tree.c \
   gnc-plugin-basic-commands.c \
   gnc-plugin-budget.c \
@@ -66,6 +66,7 @@ appicondir = $(datadir)/pixmaps
 noinst_HEADERS = \
   assistant-acct-period.h \
   assistant-hierarchy.h \
+  assistant-loan.h \
   assistant-stock-split.h \
   dialog-fincalc.h \
   dialog-find-transactions.h \
@@ -75,7 +76,6 @@ noinst_HEADERS = \
   dialog-sx-editor.h \
   dialog-sx-from-trans.h \
   dialog-sx-since-last-run.h \
-  druid-loan.h \
   gnc-plugin-account-tree.h \
   gnc-plugin-basic-commands.h \
   gnc-plugin-budget.h \

src/gnome/assistant-loan.h

@@ -1,7 +1,8 @@
 /********************************************************************\
- * druid-loan.h : A Gnome Druid for setting up loan-repayment       *
+ * assistant-loan.h : An Assistant for setting up loan-repayment    *
  *     scheduled transactions.                                      *
  * Copyright (C) 2002 Joshua Sled <jsled@asynchronous.org>          *
+ * Copyright (C) 2011 Robert Fewell                                 *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -21,4 +22,4 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
 
-struct LoanDruidData_* gnc_ui_sx_loan_druid_create(void);
+void gnc_ui_sx_loan_assistant_create(void);

src/gnome/gnc-plugin-basic-commands.c

@@ -46,7 +46,7 @@
 #include "dialog-sx-since-last-run.h"
 #include "dialog-totd.h"
 #include "assistant-acct-period.h"
-#include "druid-loan.h"
+#include "assistant-loan.h"
 #include "gnc-engine.h"
 #include "gnc-file.h"
 #include "gnc-gui-query.h"
@@ -501,7 +501,7 @@ gnc_main_window_cmd_actions_since_last_run (GtkAction *action, GncMainWindowActi
 static void
 gnc_main_window_cmd_actions_mortgage_loan (GtkAction *action, GncMainWindowActionData *data)
 {
-    gnc_ui_sx_loan_druid_create ();
+    gnc_ui_sx_loan_assistant_create ();
 }
 
 static void

src/gnome/gtkbuilder/Makefile.am

@@ -2,6 +2,7 @@ gtkbuilderdir = $(GNC_GTKBUILDER_DIR)
 gtkbuilder_DATA = \
 	account.glade \
 	acctperiod.glade \
+	assistant-loan.glade \
 	autoclear.glade \
 	budget.glade \
 	commodities.glade \

src/gnome/gtkbuilder/sched-xact.glade

@@ -1764,13 +1764,6 @@
       <action-widget response="-5">ok_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="loan_druid_win">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">Mortgage/Loan Assistant</property>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
   <object class="GtkMenu" id="Since Last Run popup">
     <property name="visible">True</property>
     <child>