r20533 - gnucash/trunk/src/gnome - Replace Account Hierarchy setup druid with gtkbuilder compatible gtkassistant
Geert Janssens
gjanssens at code.gnucash.org
Tue Apr 5 15:55:45 EDT 2011
Author: gjanssens
Date: 2011-04-05 15:55:45 -0400 (Tue, 05 Apr 2011)
New Revision: 20533
Trac: http://svn.gnucash.org/trac/changeset/20533
Added:
gnucash/trunk/src/gnome/assistant-hierarchy.c
gnucash/trunk/src/gnome/assistant-hierarchy.h
Removed:
gnucash/trunk/src/gnome/druid-hierarchy.c
gnucash/trunk/src/gnome/druid-hierarchy.h
Modified:
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/gnome/dialog-new-user.c
gnucash/trunk/src/gnome/glade/account.glade
gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
gnucash/trunk/src/gnome/top-level.c
Log:
Replace Account Hierarchy setup druid with gtkbuilder compatible gtkassistant
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/Makefile.am 2011-04-05 19:55:45 UTC (rev 20533)
@@ -24,6 +24,7 @@
libgnc_gnome_la_SOURCES = \
swig-gnome.c \
+ assistant-hierarchy.c \
dialog-commodities.c \
dialog-fincalc.c \
dialog-find-transactions.c \
@@ -37,7 +38,6 @@
dialog-sx-since-last-run.c \
dialog-tax-info.c \
druid-acct-period.c \
- druid-hierarchy.c \
druid-loan.c \
druid-stock-split.c \
gnc-plugin-account-tree.c \
@@ -64,6 +64,7 @@
appicondir = $(datadir)/pixmaps
noinst_HEADERS = \
+ assistant-hierarchy.h \
dialog-fincalc.h \
dialog-find-transactions.h \
dialog-new-user.h \
@@ -73,7 +74,6 @@
dialog-sx-from-trans.h \
dialog-sx-since-last-run.h \
druid-acct-period.h \
- druid-hierarchy.h \
druid-loan.h \
druid-stock-split.h \
gnc-plugin-account-tree.h \
Copied: gnucash/trunk/src/gnome/assistant-hierarchy.c (from rev 20532, gnucash/trunk/src/gnome/druid-hierarchy.c)
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c (rev 0)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c 2011-04-05 19:55:45 UTC (rev 20533)
@@ -0,0 +1,1151 @@
+/********************************************************************\
+ * assistant-hierarchy.c -- account hierarchy creation functionality*
+ * Copyright (C) 2001 Gnumatic, Inc. *
+ * Copyright (C) 2006 David Hampton <hampton at employees.org> *
+ * Copyright (C) 2010 Geert Janssens *
+ * *
+ * This program is free software; you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation; either version 2 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact: *
+ * *
+ * Free Software Foundation Voice: +1-617-542-5942 *
+ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
+ * Boston, MA 02110-1301, USA gnu at gnu.org *
+\********************************************************************/
+
+#include "config.h"
+
+#include <gnome.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "gnc-account-merge.h"
+#include "dialog-new-user.h"
+#include "dialog-utils.h"
+#include "assistant-hierarchy.h"
+#include "assistant-utils.h"
+#include "gnc-amount-edit.h"
+#include "gnc-currency-edit.h"
+#include "gnc-exp-parser.h"
+#include "gnc-general-select.h"
+#include "gnc-gconf-utils.h"
+#include "gnc-hooks.h"
+#include "gnc-component-manager.h"
+#include "gnc-path.h"
+#include "gnc-gui-query.h"
+#include "gnc-tree-view-account.h"
+#include "gnc-ui-util.h"
+#include "io-example-account.h"
+#include "top-level.h"
+#include "gnc-main-window.h"
+#include "gnc-plugin-page-account-tree.h"
+
+#include "gnc-engine.h"
+static QofLogModule log_module = GNC_MOD_IMPORT;
+
+#define GCONF_SECTION "dialogs/new_hierarchy"
+
+typedef enum
+{
+ COL_CHECKED,
+ COL_TITLE,
+ COL_SHORT_DESCRIPTION,
+ COL_LONG_DESCRIPTION,
+ COL_ACCOUNT,
+ NUM_COLUMNS
+} ColumnNames;
+
+
+typedef struct
+{
+ GtkWidget *dialog;
+ GtkWidget *assistant;
+ gboolean next_ok;
+
+ GtkWidget *currency_selector;
+
+ GtkTreeView *categories_tree;
+ GtkTreeRowReference *initial_category;
+ GtkTextView *category_description;
+ GtkWidget *category_accounts_container;
+ GtkLabel *category_accounts_label;
+ GtkTreeView *category_accounts_tree;
+ gboolean category_set_changed;
+
+ GncTreeViewAccount *final_account_tree;
+ GtkWidget *final_account_tree_container;
+ Account *selected_account;
+ /** Map<Account*,gnc_numeric*> **/
+ GHashTable *balance_hash;
+
+ Account *our_account_tree;
+ QofBook *temporary;
+
+ gboolean account_list_added;
+ gboolean use_defaults;
+
+ GncHierarchyAssistantFinishedCallback when_completed;
+
+} hierarchy_data;
+
+G_MODULE_EXPORT void on_prepare (GtkAssistant *assistant, GtkWidget *page,
+ hierarchy_data *data);
+void on_choose_account_categories_prepare (hierarchy_data *data);
+G_MODULE_EXPORT void select_all_clicked (GtkButton *button,
+ hierarchy_data *data);
+G_MODULE_EXPORT void clear_all_clicked (GtkButton *button,
+ hierarchy_data *data);
+void on_final_account_prepare (hierarchy_data *data);
+G_MODULE_EXPORT void on_cancel (GtkAssistant *gtkassistant, hierarchy_data *data);
+G_MODULE_EXPORT void on_finish (GtkAssistant *gtkassistant, hierarchy_data *data);
+
+// ------------------------------------------------------------
+
+static void
+delete_hierarchy_dialog (hierarchy_data *data)
+{
+ gtk_widget_destroy (data->dialog);
+}
+
+static void
+destroy_hash_helper (gpointer key, gpointer value, gpointer user_data)
+{
+ gnc_numeric *balance = value;
+ g_free (balance);
+}
+
+static void
+gnc_hierarchy_destroy_cb (GtkObject *obj, hierarchy_data *data)
+{
+ GHashTable *hash;
+
+ hash = data->balance_hash;
+ if (hash)
+ {
+ g_hash_table_foreach (hash, destroy_hash_helper, NULL);
+ g_hash_table_destroy (hash);
+ data->balance_hash = NULL;
+ }
+}
+
+static gnc_numeric
+get_final_balance (GHashTable *hash, Account *account)
+{
+ gnc_numeric *balance;
+
+ if (!hash || !account)
+ return gnc_numeric_zero ();
+
+ balance = g_hash_table_lookup(hash, account);
+ if (balance)
+ return *balance;
+ return gnc_numeric_zero ();
+}
+
+static void
+set_final_balance (GHashTable *hash, Account *account, gnc_numeric in_balance)
+{
+ gnc_numeric *balance;
+
+ if (!hash || !account)
+ return;
+
+ balance = g_hash_table_lookup (hash, account);
+ if (balance)
+ {
+ *balance = in_balance;
+ return;
+ }
+
+ balance = g_new (gnc_numeric, 1);
+ *balance = in_balance;
+ g_hash_table_insert (hash, account, balance);
+}
+
+static gchar*
+gnc_get_ea_locale_dir(const char *top_dir)
+{
+ static gchar *default_locale = "C";
+ gchar *ret;
+ gchar *locale;
+ struct stat buf;
+ int i;
+
+#ifdef HAVE_LC_MESSAGES
+ locale = g_strdup(setlocale(LC_MESSAGES, NULL));
+#else
+# ifdef G_OS_WIN32
+ /* On win32, setlocale() doesn't say anything useful. Use
+ glib's function instead. */
+ locale = g_win32_getlocale();
+# else
+ /*
+ * Mac OS X 10.1 and earlier, not only doesn't have LC_MESSAGES
+ * setlocale can sometimes return NULL instead of "C"
+ */
+ locale = g_strdup(setlocale(LC_ALL, NULL) ?
+ setlocale(LC_ALL, NULL) : "C");
+# endif
+#endif
+
+ i = strlen(locale);
+ ret = g_build_filename(top_dir, locale, (char *)NULL);
+
+ while (g_stat(ret, &buf) != 0)
+ {
+ i--;
+ if (i < 1)
+ {
+ g_free(ret);
+ ret = g_build_filename(top_dir, default_locale, (char *)NULL);
+ break;
+ }
+ locale[i] = '\0';
+ g_free(ret);
+ ret = g_build_filename(top_dir, locale, (char *)NULL);
+ }
+
+ g_free(locale);
+
+ return ret;
+}
+
+/************************************************************
+ * Choose Categories Page *
+ ************************************************************/
+
+/** This is a helper function called on each item in the GtkTreeStore
+ * by categories_page_enable_next. The purpose is to determine if an
+ * account set has been selected.
+ *
+ * @param store The GtkListStore containing one line per account set.
+ *
+ * @param path A GtkTreePath for the entry in question.
+ *
+ * @param iter A GtkTreeIter for the entry in question.
+ *
+ * @param result A pointer to the result value passed to/from the
+ * caller. This function sets the result value to TRUE if the entry
+ * in question is checked.
+ *
+ * @return TRUE if the entry in question is checked to cancel the
+ * tree walk. FALSE if unchecked to that the rest of the tree will
+ * be tested. */
+static gboolean
+account_set_checked_helper (GtkListStore *store,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gboolean *result)
+{
+ gboolean checked;
+
+ g_return_val_if_fail(GTK_IS_LIST_STORE(store), FALSE);
+
+ gtk_tree_model_get (GTK_TREE_MODEL(store), iter, COL_CHECKED, &checked, -1);
+ if (checked)
+ {
+ *result = TRUE;
+ return TRUE; /* Stop tree walk. */
+ }
+
+ return FALSE;
+}
+
+/** This function determines if the "Next" button on the account set
+ * selection page should be sensitive. The button should only be
+ * sensitive if one or more account sets has been selected.
+ *
+ * @param data A pointer to the data structure describing the
+ * hierarchy assistant. */
+static void
+categories_page_enable_next (hierarchy_data *data)
+{
+ gint currentpagenum;
+ GtkWidget *currentpage;
+ GtkAssistant *assistant = GTK_ASSISTANT(data->dialog);
+
+ data->next_ok = FALSE;
+ gtk_tree_model_foreach (gtk_tree_view_get_model (data->categories_tree),
+ (GtkTreeModelForeachFunc)account_set_checked_helper,
+ &data->next_ok);
+
+ currentpagenum = gtk_assistant_get_current_page(assistant);
+ currentpage = gtk_assistant_get_nth_page(assistant, currentpagenum);
+
+ gtk_assistant_set_page_complete(assistant, currentpage, data->next_ok);
+}
+
+
+static void
+categories_selection_changed (GtkTreeModel *treemodel,
+ GtkTreePath *arg1,
+ GtkTreeIter *arg2,
+ hierarchy_data *data)
+{
+ data->category_set_changed = TRUE;
+ categories_page_enable_next(data);
+}
+
+
+static void
+add_one_category (GncExampleAccount *acc,
+ hierarchy_data *data)
+{
+ GtkTreeView *view;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ GtkTreePath* path;
+ gboolean use_defaults;
+
+ g_return_if_fail(acc != NULL);
+ g_return_if_fail(data != NULL);
+
+ view = data->categories_tree;
+ store = GTK_LIST_STORE(gtk_tree_view_get_model(view));
+ use_defaults = data->use_defaults && acc->start_selected;
+
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ COL_CHECKED, use_defaults,
+ COL_TITLE, acc->title,
+ COL_SHORT_DESCRIPTION, acc->short_description,
+ COL_LONG_DESCRIPTION, acc->long_description,
+ COL_ACCOUNT, acc,
+ -1);
+
+ if (use_defaults)
+ {
+ data->category_set_changed = TRUE;
+ path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
+ data->initial_category = gtk_tree_row_reference_new(GTK_TREE_MODEL(store), path);
+ gtk_tree_path_free(path);
+ }
+}
+
+static void
+category_checkbox_toggled (GtkCellRendererToggle *toggle,
+ gchar *path,
+ GtkListStore *store)
+{
+ GtkTreeIter iter;
+ gboolean active;
+
+ if (!gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store),
+ &iter, path))
+ return;
+
+ /* Get current state of the category */
+ active = gtk_cell_renderer_toggle_get_active(toggle);
+ gtk_list_store_set(store, &iter, COL_CHECKED, !active, -1);
+}
+
+static void
+account_categories_tree_view_prepare (hierarchy_data *data)
+{
+ GSList *list;
+ gchar *gnc_accounts_dir;
+ gchar *locale_dir;
+ GtkTreeView *tree_view;
+ GtkListStore *model;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+
+ gnc_accounts_dir = gnc_path_get_accountsdir ();
+ locale_dir = gnc_get_ea_locale_dir (gnc_accounts_dir);
+ list = gnc_load_example_account_list (locale_dir);
+ g_free (gnc_accounts_dir);
+ g_free (locale_dir);
+
+ /* Prepare the account_categories GtkTreeView with a model and with some columns */
+ tree_view = data->categories_tree;
+ model = gtk_list_store_new(NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_POINTER);
+ gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL(model));
+ g_object_unref (model);
+
+ g_slist_foreach(list, (GFunc)add_one_category, data);
+
+ g_signal_connect (G_OBJECT (model), "row_changed",
+ G_CALLBACK (categories_selection_changed),
+ data);
+
+ renderer = gtk_cell_renderer_toggle_new ();
+ g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL);
+ column = gtk_tree_view_column_new_with_attributes (_("Selected"),
+ renderer,
+ "active", COL_CHECKED,
+ NULL);
+ gtk_tree_view_append_column (tree_view, column);
+ gtk_tree_view_column_set_sort_column_id (column, COL_CHECKED);
+ g_signal_connect (G_OBJECT (renderer), "toggled",
+ G_CALLBACK (category_checkbox_toggled),
+ model);
+
+
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Account Types"),
+ renderer,
+ "text", COL_TITLE,
+ NULL);
+ gtk_tree_view_append_column (tree_view, column);
+ gtk_tree_view_column_set_sort_column_id (column, COL_TITLE);
+
+// renderer = gtk_cell_renderer_text_new ();
+// column = gtk_tree_view_column_new_with_attributes (_("Description"),
+// renderer,
+// "text", COL_SHORT_DESCRIPTION,
+// NULL);
+// gtk_tree_view_append_column (tree_view, column);
+// gtk_tree_view_column_set_sort_column_id (column, COL_SHORT_DESCRIPTION);
+
+ gtk_tree_view_set_headers_clickable(tree_view, TRUE);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(model),
+ COL_TITLE,
+ GTK_SORT_ASCENDING);
+
+ if (data->initial_category)
+ {
+ path = gtk_tree_row_reference_get_path(data->initial_category);
+ selection = gtk_tree_view_get_selection(tree_view);
+ gtk_tree_view_scroll_to_cell(tree_view, path, NULL, TRUE, 0.5, 0.5);
+ gtk_tree_selection_select_path(selection, path);
+ gtk_tree_path_free(path);
+ }
+}
+
+G_MODULE_EXPORT void on_prepare (GtkAssistant *assistant, GtkWidget *page,
+ hierarchy_data *data)
+{
+ gint currentpage = gtk_assistant_get_current_page(assistant);
+
+ switch (gtk_assistant_get_current_page(assistant))
+ {
+ case 2:
+ /* Current page is account selection */
+ on_choose_account_categories_prepare(data);
+ break;
+ case 3:
+ /* Current page is final account page */
+ on_final_account_prepare (data);
+ break;
+ }
+
+}
+
+void
+on_choose_account_categories_prepare (hierarchy_data *data)
+{
+ GtkTextBuffer* buffer;
+
+ if (!data->account_list_added)
+ {
+ /* clear out the description/tree */
+ if (data->category_accounts_tree)
+ gtk_widget_destroy(GTK_WIDGET(data->category_accounts_tree));
+ data->category_accounts_tree = NULL;
+ buffer = gtk_text_view_get_buffer(data->category_description);
+ gtk_text_buffer_set_text(buffer, "", -1);
+
+ data->account_list_added = TRUE;
+
+ /* Build the categories tree if necessary */
+ gnc_suspend_gui_refresh ();
+ account_categories_tree_view_prepare (data);
+ gnc_resume_gui_refresh ();
+ }
+ categories_page_enable_next(data);
+}
+
+static void
+categories_tree_selection_changed (GtkTreeSelection *selection,
+ hierarchy_data *data)
+{
+ GtkTreeView *tree_view;
+ GtkTreeModel *model;
+ GtkTreeViewColumn *column;
+ GtkTreeIter iter;
+ GncExampleAccount *gea;
+ GtkTextBuffer* buffer;
+ gchar *text;
+
+ /* Remove the old account tree */
+ if (data->category_accounts_tree)
+ gtk_widget_destroy(GTK_WIDGET(data->category_accounts_tree));
+ data->category_accounts_tree = NULL;
+
+ /* Add a new one if something selected */
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gchar *text2;
+ gtk_tree_model_get (model, &iter, COL_ACCOUNT, &gea, -1);
+ /* Translators: '%s' is the name of the selected account hierarchy template. */
+ text2 = g_strdup_printf(_("Accounts in '%s'"), gea->title);
+ text = g_strdup_printf("<b>%s</b>", text2);
+ gtk_label_set_markup(data->category_accounts_label, text);
+ g_free(text2);
+ g_free(text);
+ buffer = gtk_text_view_get_buffer(data->category_description);
+ gtk_text_buffer_set_text(buffer, gea->long_description, -1);
+
+ tree_view = gnc_tree_view_account_new_with_root (gea->root, FALSE);
+ /* Override the normal fixed (user settable) sizing */
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(tree_view), 0);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+ data->category_accounts_tree = tree_view;
+ gtk_tree_view_expand_all (tree_view);
+ gtk_container_add(GTK_CONTAINER(data->category_accounts_container), GTK_WIDGET(tree_view));
+ gtk_widget_show(GTK_WIDGET(tree_view));
+ }
+ else
+ {
+ gchar *text;
+ text = g_strdup_printf ("<b>%s</b>", _("Accounts in Category"));
+ gtk_label_set_markup(data->category_accounts_label, text);
+ g_free (text);
+ buffer = gtk_text_view_get_buffer(data->category_description);
+ gtk_text_buffer_set_text(buffer, "", -1);
+ }
+}
+
+static gboolean
+select_helper (GtkListStore *store,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ GncExampleAccount *gea;
+
+ g_return_val_if_fail(GTK_IS_LIST_STORE(store), FALSE);
+
+ gtk_tree_model_get (GTK_TREE_MODEL(store), iter, COL_ACCOUNT, &gea, -1);
+ if ((gea != NULL) && !gea->exclude_from_select_all)
+ {
+ gtk_list_store_set(store, iter,
+ COL_CHECKED, GPOINTER_TO_INT(data),
+ -1);
+ }
+
+ return FALSE; /* Run entire tree */
+}
+
+G_MODULE_EXPORT void
+select_all_clicked (GtkButton *button,
+ hierarchy_data *data)
+{
+ gtk_tree_model_foreach (gtk_tree_view_get_model (data->categories_tree),
+ (GtkTreeModelForeachFunc)select_helper,
+ GINT_TO_POINTER(TRUE));
+}
+
+G_MODULE_EXPORT void
+clear_all_clicked (GtkButton *button,
+ hierarchy_data *data)
+{
+ gtk_tree_model_foreach (gtk_tree_view_get_model (data->categories_tree),
+ (GtkTreeModelForeachFunc)select_helper,
+ GINT_TO_POINTER(FALSE));
+}
+
+/************************************************************
+ * Opening Balances Page *
+ ************************************************************/
+
+static void
+delete_our_account_tree (hierarchy_data *data)
+{
+ if (data->our_account_tree != NULL)
+ {
+ xaccAccountBeginEdit (data->our_account_tree);
+ xaccAccountDestroy (data->our_account_tree);
+ data->our_account_tree = NULL;
+ }
+}
+
+static Account*
+clone_account (const Account* from, gnc_commodity *com)
+{
+ Account *ret;
+
+ ret = xaccCloneAccountSimple (from, gnc_get_current_book ());
+
+ xaccAccountSetCommodity (ret, com);
+
+ return ret;
+}
+
+struct add_group_data_struct
+{
+ Account *to;
+ Account *parent;
+ gnc_commodity *com;
+};
+
+static void
+add_groups_for_each (Account *toadd, gpointer data)
+{
+ struct add_group_data_struct *dadata = data;
+ Account *foundact;
+
+ foundact = gnc_account_lookup_by_name(dadata->to, xaccAccountGetName(toadd));
+
+ if (!foundact)
+ {
+ foundact = clone_account (toadd, dadata->com);
+
+ if (dadata->to)
+ gnc_account_append_child (dadata->to, foundact);
+ else if (dadata->parent)
+ gnc_account_append_child (dadata->parent, foundact);
+ else
+ {
+ g_warning ("add_groups_for_each: no valid parent");
+ }
+ }
+
+ {
+ if (gnc_account_n_children(toadd) > 0)
+ {
+ struct add_group_data_struct downdata;
+
+ downdata.to = foundact;
+ downdata.parent = foundact;
+ downdata.com = dadata->com;
+
+ gnc_account_foreach_child (toadd, add_groups_for_each, &downdata);
+ }
+ }
+}
+
+static void
+add_new_accounts_with_random_guids (Account *into, Account *from,
+ gnc_commodity *com)
+{
+ struct add_group_data_struct data;
+ data.to = into;
+ data.parent = NULL;
+ data.com = com;
+
+ gnc_account_foreach_child (from, add_groups_for_each, &data);
+}
+
+static Account *
+hierarchy_merge_accounts (GSList *dalist, gnc_commodity *com)
+{
+ GSList *mark;
+ Account *ret = xaccMallocAccount (gnc_get_current_book ());
+
+ for (mark = dalist; mark; mark = mark->next)
+ {
+ GncExampleAccount *xea = mark->data;
+
+ add_new_accounts_with_random_guids (ret, xea->root, com);
+ }
+
+ return ret;
+}
+
+static gboolean
+accumulate_accounts (GtkListStore *store,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ GSList **list)
+{
+ GncExampleAccount *gea;
+ gboolean active;
+
+ g_return_val_if_fail(GTK_IS_LIST_STORE(store), FALSE);
+
+ gtk_tree_model_get (GTK_TREE_MODEL(store), iter,
+ COL_CHECKED, &active,
+ COL_ACCOUNT, &gea,
+ -1);
+ if (active && gea)
+ *list = g_slist_prepend(*list, gea);
+
+ return FALSE; /* Run entire list */
+}
+
+
+static GSList *
+get_selected_account_list (GtkTreeView *tree_view)
+{
+ GSList *actlist = NULL;
+ GtkTreeModel *model;
+
+ model = gtk_tree_view_get_model (tree_view);
+ gtk_tree_model_foreach (model,
+ (GtkTreeModelForeachFunc)accumulate_accounts,
+ &actlist);
+ return actlist;
+}
+
+static void
+balance_cell_data_func (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ Account *account;
+ gnc_numeric balance;
+ const gchar *string;
+ GNCPrintAmountInfo print_info;
+ hierarchy_data *data = (hierarchy_data *)user_data;
+ gboolean allow_value;
+
+ g_return_if_fail (GTK_TREE_MODEL (model));
+ account = gnc_tree_view_account_get_account_from_iter (model, iter);
+
+ balance = get_final_balance (data->balance_hash, account);
+ if (gnc_numeric_zero_p (balance))
+ {
+ string = "";
+ }
+ else
+ {
+ print_info = gnc_account_print_info (account, FALSE);
+ string = xaccPrintAmount (balance, print_info);
+ }
+
+ if (xaccAccountGetType(account) == ACCT_TYPE_EQUITY ||
+ xaccAccountGetType(account) == ACCT_TYPE_TRADING)
+ {
+ allow_value = FALSE;
+ string = _("zero");
+ }
+ else
+ {
+ GncAccountMergeDisposition disp;
+ disp = determine_merge_disposition(gnc_book_get_root_account(gnc_get_current_book()), account);
+ if (disp == GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW)
+ {
+ allow_value = !xaccAccountGetPlaceholder(account);
+ }
+ else
+ {
+ allow_value = FALSE;
+ string = _("existing account");
+ }
+ }
+ g_object_set (G_OBJECT (cell),
+ "text", string,
+ "editable", allow_value,
+ "sensitive", allow_value,
+ NULL);
+}
+
+static void
+balance_cell_edited (GtkCellRendererText *cell,
+ gchar *path,
+ gchar *new_text,
+ gpointer user_data)
+{
+ Account *account;
+ char *error_loc;
+ gnc_numeric amount;
+ hierarchy_data *data = (hierarchy_data *)user_data;
+
+ g_return_if_fail(data != NULL);
+
+ account = gnc_tree_view_account_get_selected_account(data->final_account_tree);
+ if (account == NULL)
+ {
+ g_critical("account is null");
+ return;
+ }
+
+ error_loc = NULL;
+ if (!gnc_exp_parser_parse (new_text, &amount, &error_loc))
+ {
+ amount = gnc_numeric_zero();
+ g_object_set (G_OBJECT(cell), "text", "", NULL);
+ }
+ /* Bug#348364: Emulating price-cell, we need to ensure the denominator of
+ * the amount is in the SCU of the account's commodity (so
+ * gnc-ui-util.c:is_decimal_fraction() on the remainder denom for
+ * fractional values will be a "decimal").
+ */
+ {
+ int account_cmdty_fraction = xaccAccountGetCommoditySCU(account);
+ amount = gnc_numeric_convert(amount, account_cmdty_fraction, GNC_HOW_RND_ROUND_HALF_UP);
+ }
+ set_final_balance (data->balance_hash, account, amount);
+ qof_event_gen (QOF_INSTANCE(account), QOF_EVENT_MODIFY, NULL);
+}
+
+static void
+placeholder_cell_data_func (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ Account *account, *root;
+ gboolean willbe_placeholder = FALSE;
+ GncAccountMergeDisposition disp;
+
+ g_return_if_fail (GTK_TREE_MODEL (model));
+ account = gnc_tree_view_account_get_account_from_iter (model, iter);
+ root = gnc_book_get_root_account(gnc_get_current_book());
+ disp = determine_merge_disposition(root, account);
+ switch (disp)
+ {
+ case GNC_ACCOUNT_MERGE_DISPOSITION_USE_EXISTING:
+ {
+ /* find the existing account, do whatever it is. */
+ gchar *full_name;
+ Account *existing_acct;
+ full_name = gnc_account_get_full_name(account);
+ existing_acct = gnc_account_lookup_by_full_name(root, full_name);
+ willbe_placeholder = xaccAccountGetPlaceholder(existing_acct);
+ g_free(full_name);
+ }
+ break;
+ case GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW:
+ willbe_placeholder = xaccAccountGetPlaceholder(account);
+ break;
+ }
+
+ gtk_cell_renderer_toggle_set_active(GTK_CELL_RENDERER_TOGGLE(cell), willbe_placeholder);
+}
+
+
+static void
+use_existing_account_data_func(GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ Account *new_acct;
+ Account *real_root;
+ GncAccountMergeDisposition disposition;
+ char *to_user = "(error; unknown condition)";
+
+ g_return_if_fail (GTK_TREE_MODEL (tree_model));
+ new_acct = gnc_tree_view_account_get_account_from_iter(tree_model, iter);
+ if (new_acct == NULL)
+ {
+ g_object_set (G_OBJECT(cell), "text", "(null account)", NULL);
+ return;
+ }
+
+ real_root = gnc_book_get_root_account(gnc_get_current_book());
+ disposition = determine_merge_disposition(real_root, new_acct);
+ switch (disposition)
+ {
+ case GNC_ACCOUNT_MERGE_DISPOSITION_USE_EXISTING:
+ to_user = _("Yes");
+ break;
+ case GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW:
+ to_user = _("No");
+ break;
+ }
+
+ g_object_set(G_OBJECT(cell), "text", to_user, NULL);
+}
+
+void
+on_final_account_prepare (hierarchy_data *data)
+{
+ GSList *actlist;
+ GtkTreeView *tree_view;
+ GtkTreeSelection *selection;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+ gnc_commodity *com;
+
+ /* Anything to do? */
+ if (!data->category_set_changed)
+ return;
+ data->category_set_changed = FALSE;
+
+ gnc_suspend_gui_refresh ();
+
+ /* Delete any existing account tree */
+ if (data->final_account_tree)
+ {
+ gtk_widget_destroy(GTK_WIDGET(data->final_account_tree));
+ data->final_account_tree = NULL;
+ }
+ delete_our_account_tree (data);
+
+
+ /* Build a new account list */
+ actlist = get_selected_account_list (data->categories_tree);
+ com = gnc_currency_edit_get_currency (GNC_CURRENCY_EDIT(data->currency_selector));
+ data->our_account_tree = hierarchy_merge_accounts (actlist, com);
+
+
+ /* Now build a new account tree */
+ data->final_account_tree
+ = GNC_TREE_VIEW_ACCOUNT(gnc_tree_view_account_new_with_root (data->our_account_tree, FALSE));
+ tree_view = GTK_TREE_VIEW(data->final_account_tree);
+ gnc_tree_view_account_set_name_edited(data->final_account_tree,
+ gnc_tree_view_account_name_edited_cb);
+ gnc_tree_view_account_set_code_edited(data->final_account_tree,
+ gnc_tree_view_account_code_edited_cb);
+ gnc_tree_view_account_set_description_edited(data->final_account_tree,
+ gnc_tree_view_account_description_edited_cb);
+ gnc_tree_view_account_set_notes_edited(data->final_account_tree,
+ gnc_tree_view_account_notes_edited_cb);
+
+ gtk_tree_view_set_headers_visible (tree_view, TRUE);
+ column = gnc_tree_view_find_column_by_name (
+ GNC_TREE_VIEW(data->final_account_tree), "type");
+ g_object_set_data(G_OBJECT(column), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
+ gnc_tree_view_configure_columns (GNC_TREE_VIEW(data->final_account_tree));
+ gnc_tree_view_set_show_column_menu (GNC_TREE_VIEW(data->final_account_tree),
+ FALSE);
+
+ selection = gtk_tree_view_get_selection (tree_view);
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+
+ // This is a re-definition of the placeholder that the account-tree model
+ // provides, reflecting the to-be-created state of the account tree
+ // post-merge.
+ {
+ renderer = gtk_cell_renderer_toggle_new();
+ g_object_set(G_OBJECT (renderer),
+ "activatable", FALSE,
+ "sensitive", FALSE,
+ NULL);
+ column = gtk_tree_view_column_new_with_attributes(_("Placeholder"),
+ renderer, NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ placeholder_cell_data_func,
+ (gpointer)data, NULL);
+ gnc_tree_view_append_column (GNC_TREE_VIEW(tree_view), column);
+ }
+
+
+ {
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT (renderer),
+ "xalign", 1.0,
+ (char *)NULL);
+ g_signal_connect (G_OBJECT (renderer), "edited",
+ G_CALLBACK (balance_cell_edited),
+ data);
+ column = gtk_tree_view_column_new_with_attributes (_("Opening Balance"),
+ renderer,
+ NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ balance_cell_data_func,
+ (gpointer)data, NULL);
+ gnc_tree_view_append_column (GNC_TREE_VIEW(tree_view), column);
+ }
+
+ // only in the case where there *are* existing accounts...
+ if (gnc_account_n_descendants(gnc_book_get_root_account(gnc_get_current_book())) > 0)
+ {
+ GList *renderers;
+ column = gnc_tree_view_add_text_column(GNC_TREE_VIEW(tree_view),
+ _("Use Existing"),
+ NULL,
+ NULL,
+ "yes",
+ GNC_TREE_VIEW_COLUMN_DATA_NONE,
+ GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
+ NULL);
+ renderers = gtk_tree_view_column_get_cell_renderers(column);
+ g_object_set(G_OBJECT(renderer), "xalign", 1.0, (char*)NULL);
+ gtk_tree_view_column_set_cell_data_func(column, GTK_CELL_RENDERER(renderers->data),
+ use_existing_account_data_func, (gpointer)data, NULL);
+ g_list_free(renderers);
+ }
+
+ gtk_container_add(GTK_CONTAINER(data->final_account_tree_container),
+ GTK_WIDGET(data->final_account_tree));
+
+ /* Expand the entire tree */
+ gtk_tree_view_expand_all (tree_view);
+ gtk_widget_show(GTK_WIDGET(data->final_account_tree));
+ gnc_resume_gui_refresh ();
+}
+
+G_MODULE_EXPORT void
+on_cancel (GtkAssistant *gtkassistant,
+ hierarchy_data *data)
+{
+ gnc_suspend_gui_refresh ();
+ delete_hierarchy_dialog (data);
+ delete_our_account_tree (data);
+ gncp_new_user_finish ();
+ g_free(data);
+ gnc_resume_gui_refresh ();
+}
+
+static void
+starting_balance_helper (Account *account, hierarchy_data *data)
+{
+ gnc_numeric balance;
+
+ balance = get_final_balance (data->balance_hash, account);
+ if (gnc_reverse_balance(account))
+ balance = gnc_numeric_neg(balance);
+ if (!gnc_numeric_zero_p (balance))
+ gnc_account_create_opening_balance (account, balance, time (NULL),
+ gnc_get_current_book ());
+}
+
+G_MODULE_EXPORT void
+on_finish (GtkAssistant *gtkassistant,
+ hierarchy_data *data)
+{
+ GncHierarchyAssistantFinishedCallback when_completed;
+ ENTER (" ");
+
+ if (data->our_account_tree)
+ {
+ gnc_account_foreach_descendant (data->our_account_tree,
+ (AccountCb)starting_balance_helper,
+ data);
+ }
+
+ // delete before we suspend GUI events, and then muck with the model,
+ // because the model doesn't seem to handle this correctly.
+ if (data->initial_category)
+ gtk_tree_row_reference_free(data->initial_category);
+ delete_hierarchy_dialog (data);
+
+ gnc_suspend_gui_refresh ();
+
+ account_trees_merge(gnc_get_current_root_account(), data->our_account_tree);
+
+ delete_our_account_tree (data);
+
+ when_completed = data->when_completed;
+ g_free(data);
+ gnc_resume_gui_refresh ();
+ if (when_completed)
+ {
+ (*when_completed)();
+ }
+
+ LEAVE (" ");
+}
+
+static GtkWidget *
+gnc_create_hierarchy_assistant (gboolean use_defaults, GncHierarchyAssistantFinishedCallback when_completed)
+{
+ hierarchy_data *data;
+ GtkWidget *dialog;
+ GtkTreeView *tree_view;
+ GtkWidget *box, *start_page;
+ GtkBuilder *builder;
+ GdkColor *color;
+
+ data = g_new0 (hierarchy_data, 1);
+ builder = gnc_builder_add_from_file ("account.glade", "Hierarchy Assistant");
+
+ dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Hierarchy Assistant"));
+ data->dialog = dialog;
+
+ gnc_assistant_set_colors (GTK_ASSISTANT (data->dialog));
+
+ /* Enable buttons on first and last page. */
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (dialog),
+ GTK_WIDGET(gtk_builder_get_object(builder, "intro_page_label")),
+ TRUE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (dialog),
+ GTK_WIDGET(gtk_builder_get_object(builder, "currency_page_vbox")),
+ TRUE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (dialog),
+ GTK_WIDGET(gtk_builder_get_object(builder, "final_account_vbox")),
+ TRUE);
+ gtk_assistant_set_page_complete (GTK_ASSISTANT (dialog),
+ GTK_WIDGET(gtk_builder_get_object(builder, "finish_page_label")),
+ TRUE);
+
+ /* Currency Page */
+ data->currency_selector = gnc_currency_edit_new();
+ gnc_currency_edit_set_currency (GNC_CURRENCY_EDIT(data->currency_selector), gnc_default_currency());
+ gtk_widget_show (data->currency_selector);
+ box = GTK_WIDGET(gtk_builder_get_object (builder, "currency_chooser_vbox"));
+ gtk_box_pack_start(GTK_BOX(box), data->currency_selector, FALSE, FALSE, 0);
+
+ /* Categories Page */
+ tree_view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "account_categories_tree_view"));
+ g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (tree_view)), "changed",
+ G_CALLBACK (categories_tree_selection_changed), data);
+ gtk_tree_selection_set_mode (gtk_tree_view_get_selection (tree_view), GTK_SELECTION_SINGLE);
+ data->categories_tree = tree_view;
+
+ data->category_accounts_label = GTK_LABEL(gtk_builder_get_object (builder, "accounts_in_category_label"));
+ data->category_accounts_container = GTK_WIDGET(gtk_builder_get_object (builder, "accounts_in_category"));
+ data->category_description = GTK_TEXT_VIEW(gtk_builder_get_object (builder, "account_types_description"));
+ data->account_list_added = FALSE;
+
+/* FIXME -- what is this ?
+ color = &GNOME_DRUID_PAGE_EDGE(start_page)->textbox_color;
+ gtk_widget_modify_base(GTK_WIDGET(data->category_description), GTK_STATE_INSENSITIVE, color);
+ */
+
+ /* Final Accounts Page */
+ data->final_account_tree_container = GTK_WIDGET(gtk_builder_get_object (builder, "final_account_tree_box"));
+ data->final_account_tree = NULL;
+
+ data->balance_hash = g_hash_table_new(NULL, NULL);
+
+ g_signal_connect (G_OBJECT(dialog), "destroy",
+ G_CALLBACK (gnc_hierarchy_destroy_cb), data);
+
+ gtk_builder_connect_signals(builder, data);
+
+ data->when_completed = when_completed;
+ data->use_defaults = use_defaults;
+ return dialog;
+}
+
+GtkWidget*
+gnc_ui_hierarchy_assistant(gboolean use_defaults)
+{
+ return gnc_create_hierarchy_assistant(use_defaults, NULL);
+}
+
+GtkWidget*
+gnc_ui_hierarchy_assistant_with_callback(gboolean use_defaults,
+ GncHierarchyAssistantFinishedCallback when_finished)
+{
+ return gnc_create_hierarchy_assistant(use_defaults, when_finished);
+}
+
+static void
+create_account_page(void)
+{
+ GncPluginPage *page;
+ page = gnc_plugin_page_account_tree_new();
+ gnc_main_window_open_page(NULL, page);
+}
+
+static void
+gnc_ui_hierarchy_assistant_hook (void)
+{
+ if (gnc_gconf_get_bool(GCONF_SECTION, "show_on_new_file", NULL))
+ {
+ gnc_ui_hierarchy_assistant_with_callback(TRUE, create_account_page);
+ }
+}
+
+void
+gnc_ui_hierarchy_assistant_initialize (void)
+{
+ gnc_hook_add_dangler(HOOK_NEW_BOOK,
+ (GFunc)gnc_ui_hierarchy_assistant_hook, NULL);
+}
Copied: gnucash/trunk/src/gnome/assistant-hierarchy.h (from rev 20532, gnucash/trunk/src/gnome/druid-hierarchy.h)
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.h (rev 0)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.h 2011-04-05 19:55:45 UTC (rev 20533)
@@ -0,0 +1,40 @@
+/********************************************************************\
+ * assistant-hierarchy.h -- account hierarchy creation functionality*
+ * Copyright (C) 2001 Gnumatic, Inc. *
+ * Copyright (C) 2010 Geert Janssens *
+ * *
+ * This program is free software; you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation; either version 2 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact: *
+ * *
+ * Free Software Foundation Voice: +1-617-542-5942 *
+ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
+ * Boston, MA 02110-1301, USA gnu at gnu.org *
+\********************************************************************/
+
+#ifndef ASSISTANT_HIERARCHY_H
+#define ASSISTANT_HIERARCHY_H
+
+/**
+ * A callback (provided by the caller) to be invoked when the assistant
+ * completes successfully. I.e., the new-user assistant can finish the GnuCash
+ * New-User Experience, create an account plugin-page, &c.
+ **/
+
+typedef void (*GncHierarchyAssistantFinishedCallback)(void);
+
+GtkWidget* gnc_ui_hierarchy_assistant (gboolean use_defaults);
+GtkWidget* gnc_ui_hierarchy_assistant_with_callback(gboolean use_defaults, GncHierarchyAssistantFinishedCallback when_finished);
+
+void gnc_ui_hierarchy_assistant_initialize (void);
+
+#endif
Modified: gnucash/trunk/src/gnome/dialog-new-user.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-new-user.c 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/dialog-new-user.c 2011-04-05 19:55:45 UTC (rev 20533)
@@ -28,7 +28,7 @@
#include "dialog-new-user.h"
#include "dialog-utils.h"
-#include "druid-hierarchy.h"
+#include "assistant-hierarchy.h"
#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
#include "gnc-hooks.h"
@@ -62,7 +62,7 @@
}
static void
-after_hierarchy_druid(void)
+after_hierarchy_assistant(void)
{
GncPluginPage *page;
@@ -107,7 +107,7 @@
case GTK_RESPONSE_OK:
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (new_accounts_button)))
{
- gnc_ui_hierarchy_druid_with_callback(TRUE, after_hierarchy_druid);
+ gnc_ui_hierarchy_assistant_with_callback(TRUE, after_hierarchy_assistant);
break;
}
else if ((qifImportDruidFcn != NULL)
Deleted: gnucash/trunk/src/gnome/druid-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/druid-hierarchy.c 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/druid-hierarchy.c 2011-04-05 19:55:45 UTC (rev 20533)
@@ -1,1139 +0,0 @@
-/********************************************************************\
- * druid-hierarchy.c -- account hierarchy creation functionality *
- * Copyright (C) 2001 Gnumatic, Inc. *
- * Copyright (C) 2006 David Hampton <hampton at employees.org> *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
-\********************************************************************/
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "gnc-account-merge.h"
-#include "dialog-new-user.h"
-#include "dialog-utils.h"
-#include "dialog-file-access.h"
-#include "druid-hierarchy.h"
-#include "druid-utils.h"
-#include "gnc-amount-edit.h"
-#include "gnc-currency-edit.h"
-#include "gnc-exp-parser.h"
-#include "gnc-general-select.h"
-#include "gnc-gconf-utils.h"
-#include "gnc-hooks.h"
-#include "gnc-component-manager.h"
-#include "gnc-path.h"
-#include "gnc-gui-query.h"
-#include "gnc-tree-view-account.h"
-#include "gnc-ui-util.h"
-#include "io-example-account.h"
-#include "top-level.h"
-#include "gnc-main-window.h"
-#include "gnc-plugin-page-account-tree.h"
-
-#include "gnc-engine.h"
-static QofLogModule log_module = GNC_MOD_IMPORT;
-
-#define GCONF_SECTION "dialogs/new_hierarchy"
-
-typedef enum
-{
- COL_CHECKED,
- COL_TITLE,
- COL_SHORT_DESCRIPTION,
- COL_LONG_DESCRIPTION,
- COL_ACCOUNT,
- NUM_COLUMNS
-} ColumnNames;
-
-
-typedef struct
-{
- GtkWidget *dialog;
- GtkWidget *druid;
- gboolean next_ok;
-
- GtkWidget *currency_selector;
-
- GtkTreeView *categories_tree;
- GtkTreeRowReference *initial_category;
- GtkTextView *category_description;
- GtkWidget *category_accounts_container;
- GtkLabel *category_accounts_label;
- GtkTreeView *category_accounts_tree;
- gboolean category_set_changed;
-
- GncTreeViewAccount *final_account_tree;
- GtkWidget *final_account_tree_container;
- Account *selected_account;
- /** Map<Account*,gnc_numeric*> **/
- GHashTable *balance_hash;
-
- Account *our_account_tree;
- QofBook *temporary;
-
- gboolean account_list_added;
- gboolean use_defaults;
-
- GncHierarchyDruidFinishedCallback when_completed;
-
-} hierarchy_data;
-
-void on_choose_account_categories_prepare (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- hierarchy_data *data);
-void select_all_clicked (GtkButton *button,
- hierarchy_data *data);
-void clear_all_clicked (GtkButton *button,
- hierarchy_data *data);
-void on_final_account_prepare (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- hierarchy_data *data);
-void on_cancel (GnomeDruid *gnomedruid, hierarchy_data *data);
-void on_finish (GnomeDruidPage *gnomedruidpage, gpointer arg1, hierarchy_data *data);
-
-// ------------------------------------------------------------
-
-static void
-delete_hierarchy_dialog (hierarchy_data *data)
-{
- gtk_widget_destroy (data->dialog);
-}
-
-static void
-destroy_hash_helper (gpointer key, gpointer value, gpointer user_data)
-{
- gnc_numeric *balance = value;
- g_free (balance);
-}
-
-static void
-gnc_hierarchy_destroy_cb (GtkObject *obj, hierarchy_data *data)
-{
- GHashTable *hash;
-
- hash = data->balance_hash;
- if (hash)
- {
- g_hash_table_foreach (hash, destroy_hash_helper, NULL);
- g_hash_table_destroy (hash);
- data->balance_hash = NULL;
- }
-}
-
-static gnc_numeric
-get_final_balance (GHashTable *hash, Account *account)
-{
- gnc_numeric *balance;
-
- if (!hash || !account)
- return gnc_numeric_zero ();
-
- balance = g_hash_table_lookup(hash, account);
- if (balance)
- return *balance;
- return gnc_numeric_zero ();
-}
-
-static void
-set_final_balance (GHashTable *hash, Account *account, gnc_numeric in_balance)
-{
- gnc_numeric *balance;
-
- if (!hash || !account)
- return;
-
- balance = g_hash_table_lookup (hash, account);
- if (balance)
- {
- *balance = in_balance;
- return;
- }
-
- balance = g_new (gnc_numeric, 1);
- *balance = in_balance;
- g_hash_table_insert (hash, account, balance);
-}
-
-static gchar*
-gnc_get_ea_locale_dir(const char *top_dir)
-{
- static gchar *default_locale = "C";
- gchar *ret;
- gchar *locale;
- struct stat buf;
- int i;
-
-#ifdef HAVE_LC_MESSAGES
- locale = g_strdup(setlocale(LC_MESSAGES, NULL));
-#else
-# ifdef G_OS_WIN32
- /* On win32, setlocale() doesn't say anything useful. Use
- glib's function instead. */
- locale = g_win32_getlocale();
-# else
- /*
- * Mac OS X 10.1 and earlier, not only doesn't have LC_MESSAGES
- * setlocale can sometimes return NULL instead of "C"
- */
- locale = g_strdup(setlocale(LC_ALL, NULL) ?
- setlocale(LC_ALL, NULL) : "C");
-# endif
-#endif
-
- i = strlen(locale);
- ret = g_build_filename(top_dir, locale, (char *)NULL);
-
- while (g_stat(ret, &buf) != 0)
- {
- i--;
- if (i < 1)
- {
- g_free(ret);
- ret = g_build_filename(top_dir, default_locale, (char *)NULL);
- break;
- }
- locale[i] = '\0';
- g_free(ret);
- ret = g_build_filename(top_dir, locale, (char *)NULL);
- }
-
- g_free(locale);
-
- return ret;
-}
-
-/************************************************************
- * Choose Categories Page *
- ************************************************************/
-
-/** This is a helper function to get around a gtk issue (probably and
- * ordering issue) where you cannot set this button as sensitive
- * during the initial creation of the druid page. Using a delayed
- * idle function works correctly for both the initial page creation
- * and the subsequent changes when account sets are
- * selected/deselected.
- *
- * @param data A pointer to the data structure describing the
- * hierarchy druid.
- *
- * @return Always returns FALSE to remove this function from the idle
- * loop. */
-static gboolean
-delayed_enable_next_button (hierarchy_data *data)
-{
- gnome_druid_set_buttons_sensitive(GNOME_DRUID(data->druid),
- TRUE, data->next_ok, TRUE, TRUE);
- return FALSE;
-}
-
-/** This is a helper function called on each item in the GtkTreeStore
- * by categories_page_enable_next. The purpose is to determine is an
- * account set has been selected.
- *
- * @param store The GtkListStore containing one line per account set.
- *
- * @param path A GtkTreePath for the entry in question.
- *
- * @param iter A GtkTreeIter for the entry in question.
- *
- * @param result A pointer to the result value passed to/from the
- * caller. This function sets the result value to TRUE if the entry
- * in question is checked.
- *
- * @return TRUE if the entry in question is checked to cancel the
- * tree walk. FALSE if unchecked to that the rest of the tree will
- * be tested. */
-static gboolean
-account_set_checked_helper (GtkListStore *store,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gboolean *result)
-{
- gboolean checked;
-
- g_return_val_if_fail(GTK_IS_LIST_STORE(store), FALSE);
-
- gtk_tree_model_get (GTK_TREE_MODEL(store), iter, COL_CHECKED, &checked, -1);
- if (checked)
- {
- *result = TRUE;
- return TRUE; /* Stop tree walk. */
- }
-
- return FALSE;
-}
-
-/** This function determines if the "Next" button on the account set
- * selection page should be sensitive. The button should only be
- * sensitive if one or more account sets has been selected.
- *
- * @param data A pointer to the data structure describing the
- * hierarchy druid. */
-static void
-categories_page_enable_next (hierarchy_data *data)
-{
- data->next_ok = FALSE;
- gtk_tree_model_foreach (gtk_tree_view_get_model (data->categories_tree),
- (GtkTreeModelForeachFunc)account_set_checked_helper,
- &data->next_ok);
- g_idle_add((GSourceFunc)delayed_enable_next_button, data);
-}
-
-
-static void
-categories_selection_changed (GtkTreeModel *treemodel,
- GtkTreePath *arg1,
- GtkTreeIter *arg2,
- hierarchy_data *data)
-{
- data->category_set_changed = TRUE;
- categories_page_enable_next(data);
-}
-
-
-static void
-add_one_category (GncExampleAccount *acc,
- hierarchy_data *data)
-{
- GtkTreeView *view;
- GtkListStore *store;
- GtkTreeIter iter;
- GtkTreePath* path;
- gboolean use_defaults;
-
- g_return_if_fail(acc != NULL);
- g_return_if_fail(data != NULL);
-
- view = data->categories_tree;
- store = GTK_LIST_STORE(gtk_tree_view_get_model(view));
- use_defaults = data->use_defaults && acc->start_selected;
-
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- COL_CHECKED, use_defaults,
- COL_TITLE, acc->title,
- COL_SHORT_DESCRIPTION, acc->short_description,
- COL_LONG_DESCRIPTION, acc->long_description,
- COL_ACCOUNT, acc,
- -1);
-
- if (use_defaults)
- {
- data->category_set_changed = TRUE;
- path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
- data->initial_category = gtk_tree_row_reference_new(GTK_TREE_MODEL(store), path);
- gtk_tree_path_free(path);
- }
-}
-
-static void
-category_checkbox_toggled (GtkCellRendererToggle *toggle,
- gchar *path,
- GtkListStore *store)
-{
- GtkTreeIter iter;
- gboolean active;
-
- if (!gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(store),
- &iter, path))
- return;
-
- /* Get current state of the category */
- active = gtk_cell_renderer_toggle_get_active(toggle);
- gtk_list_store_set(store, &iter, COL_CHECKED, !active, -1);
-}
-
-static void
-account_categories_tree_view_prepare (hierarchy_data *data)
-{
- GSList *list;
- gchar *gnc_accounts_dir;
- gchar *locale_dir;
- GtkTreeView *tree_view;
- GtkListStore *model;
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
- GtkTreeSelection *selection;
- GtkTreePath *path;
-
- gnc_accounts_dir = gnc_path_get_accountsdir ();
- locale_dir = gnc_get_ea_locale_dir (gnc_accounts_dir);
- list = gnc_load_example_account_list (locale_dir);
- g_free (gnc_accounts_dir);
- g_free (locale_dir);
-
- /* Prepare the account_categories GtkTreeView with a model and with some columns */
- tree_view = data->categories_tree;
- model = gtk_list_store_new(NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_POINTER);
- gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL(model));
- g_object_unref (model);
-
- g_slist_foreach(list, (GFunc)add_one_category, data);
-
- g_signal_connect (G_OBJECT (model), "row_changed",
- G_CALLBACK (categories_selection_changed),
- data);
-
- renderer = gtk_cell_renderer_toggle_new ();
- g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL);
- column = gtk_tree_view_column_new_with_attributes (_("Selected"),
- renderer,
- "active", COL_CHECKED,
- NULL);
- gtk_tree_view_append_column (tree_view, column);
- gtk_tree_view_column_set_sort_column_id (column, COL_CHECKED);
- g_signal_connect (G_OBJECT (renderer), "toggled",
- G_CALLBACK (category_checkbox_toggled),
- model);
-
-
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Account Types"),
- renderer,
- "text", COL_TITLE,
- NULL);
- gtk_tree_view_append_column (tree_view, column);
- gtk_tree_view_column_set_sort_column_id (column, COL_TITLE);
-
-// renderer = gtk_cell_renderer_text_new ();
-// column = gtk_tree_view_column_new_with_attributes (_("Description"),
-// renderer,
-// "text", COL_SHORT_DESCRIPTION,
-// NULL);
-// gtk_tree_view_append_column (tree_view, column);
-// gtk_tree_view_column_set_sort_column_id (column, COL_SHORT_DESCRIPTION);
-
- gtk_tree_view_set_headers_clickable(tree_view, TRUE);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(model),
- COL_TITLE,
- GTK_SORT_ASCENDING);
-
- if (data->initial_category)
- {
- path = gtk_tree_row_reference_get_path(data->initial_category);
- selection = gtk_tree_view_get_selection(tree_view);
- gtk_tree_view_scroll_to_cell(tree_view, path, NULL, TRUE, 0.5, 0.5);
- gtk_tree_selection_select_path(selection, path);
- gtk_tree_path_free(path);
- }
-}
-
-void
-on_choose_account_categories_prepare (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- hierarchy_data *data)
-{
- GtkTextBuffer* buffer;
-
- if (!data->account_list_added)
- {
- /* clear out the description/tree */
- if (data->category_accounts_tree)
- gtk_widget_destroy(GTK_WIDGET(data->category_accounts_tree));
- data->category_accounts_tree = NULL;
- buffer = gtk_text_view_get_buffer(data->category_description);
- gtk_text_buffer_set_text(buffer, "", -1);
-
- data->account_list_added = TRUE;
-
- /* Build the categories tree if necessary */
- gnc_suspend_gui_refresh ();
- account_categories_tree_view_prepare (data);
- gnc_resume_gui_refresh ();
- }
- categories_page_enable_next(data);
-}
-
-static void
-categories_tree_selection_changed (GtkTreeSelection *selection,
- hierarchy_data *data)
-{
- GtkTreeView *tree_view;
- GtkTreeModel *model;
- GtkTreeViewColumn *column;
- GtkTreeIter iter;
- GncExampleAccount *gea;
- GtkTextBuffer* buffer;
- gchar *text;
-
- /* Remove the old account tree */
- if (data->category_accounts_tree)
- gtk_widget_destroy(GTK_WIDGET(data->category_accounts_tree));
- data->category_accounts_tree = NULL;
-
- /* Add a new one if something selected */
- if (gtk_tree_selection_get_selected (selection, &model, &iter))
- {
- gchar *text2;
- gtk_tree_model_get (model, &iter, COL_ACCOUNT, &gea, -1);
- /* Translators: '%s' is the name of the selected account hierarchy template. */
- text2 = g_strdup_printf(_("Accounts in '%s'"), gea->title);
- text = g_strdup_printf("<b>%s</b>", text2);
- gtk_label_set_markup(data->category_accounts_label, text);
- g_free(text2);
- g_free(text);
- buffer = gtk_text_view_get_buffer(data->category_description);
- gtk_text_buffer_set_text(buffer, gea->long_description, -1);
-
- tree_view = gnc_tree_view_account_new_with_root (gea->root, FALSE);
- /* Override the normal fixed (user settable) sizing */
- column = gtk_tree_view_get_column(GTK_TREE_VIEW(tree_view), 0);
- gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
- data->category_accounts_tree = tree_view;
- gtk_tree_view_expand_all (tree_view);
- gtk_container_add(GTK_CONTAINER(data->category_accounts_container), GTK_WIDGET(tree_view));
- gtk_widget_show(GTK_WIDGET(tree_view));
- }
- else
- {
- gchar *text;
- text = g_strdup_printf ("<b>%s</b>", _("Accounts in Category"));
- gtk_label_set_markup(data->category_accounts_label, text);
- g_free (text);
- buffer = gtk_text_view_get_buffer(data->category_description);
- gtk_text_buffer_set_text(buffer, "", -1);
- }
-}
-
-static gboolean
-select_helper (GtkListStore *store,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
-{
- GncExampleAccount *gea;
-
- g_return_val_if_fail(GTK_IS_LIST_STORE(store), FALSE);
-
- gtk_tree_model_get (GTK_TREE_MODEL(store), iter, COL_ACCOUNT, &gea, -1);
- if ((gea != NULL) && !gea->exclude_from_select_all)
- {
- gtk_list_store_set(store, iter,
- COL_CHECKED, GPOINTER_TO_INT(data),
- -1);
- }
-
- return FALSE; /* Run entire tree */
-}
-
-void
-select_all_clicked (GtkButton *button,
- hierarchy_data *data)
-{
- gtk_tree_model_foreach (gtk_tree_view_get_model (data->categories_tree),
- (GtkTreeModelForeachFunc)select_helper,
- GINT_TO_POINTER(TRUE));
-}
-
-void
-clear_all_clicked (GtkButton *button,
- hierarchy_data *data)
-{
- gtk_tree_model_foreach (gtk_tree_view_get_model (data->categories_tree),
- (GtkTreeModelForeachFunc)select_helper,
- GINT_TO_POINTER(FALSE));
-}
-
-/************************************************************
- * Opening Balances Page *
- ************************************************************/
-
-static void
-delete_our_account_tree (hierarchy_data *data)
-{
- if (data->our_account_tree != NULL)
- {
- xaccAccountBeginEdit (data->our_account_tree);
- xaccAccountDestroy (data->our_account_tree);
- data->our_account_tree = NULL;
- }
-}
-
-static Account*
-clone_account (const Account* from, gnc_commodity *com)
-{
- Account *ret;
-
- ret = xaccCloneAccountSimple (from, gnc_get_current_book ());
-
- xaccAccountSetCommodity (ret, com);
-
- return ret;
-}
-
-struct add_group_data_struct
-{
- Account *to;
- Account *parent;
- gnc_commodity *com;
-};
-
-static void
-add_groups_for_each (Account *toadd, gpointer data)
-{
- struct add_group_data_struct *dadata = data;
- Account *foundact;
-
- foundact = gnc_account_lookup_by_name(dadata->to, xaccAccountGetName(toadd));
-
- if (!foundact)
- {
- foundact = clone_account (toadd, dadata->com);
-
- if (dadata->to)
- gnc_account_append_child (dadata->to, foundact);
- else if (dadata->parent)
- gnc_account_append_child (dadata->parent, foundact);
- else
- {
- g_warning ("add_groups_for_each: no valid parent");
- }
- }
-
- {
- if (gnc_account_n_children(toadd) > 0)
- {
- struct add_group_data_struct downdata;
-
- downdata.to = foundact;
- downdata.parent = foundact;
- downdata.com = dadata->com;
-
- gnc_account_foreach_child (toadd, add_groups_for_each, &downdata);
- }
- }
-}
-
-static void
-add_new_accounts_with_random_guids (Account *into, Account *from,
- gnc_commodity *com)
-{
- struct add_group_data_struct data;
- data.to = into;
- data.parent = NULL;
- data.com = com;
-
- gnc_account_foreach_child (from, add_groups_for_each, &data);
-}
-
-static Account *
-hierarchy_merge_accounts (GSList *dalist, gnc_commodity *com)
-{
- GSList *mark;
- Account *ret = xaccMallocAccount (gnc_get_current_book ());
-
- for (mark = dalist; mark; mark = mark->next)
- {
- GncExampleAccount *xea = mark->data;
-
- add_new_accounts_with_random_guids (ret, xea->root, com);
- }
-
- return ret;
-}
-
-static gboolean
-accumulate_accounts (GtkListStore *store,
- GtkTreePath *path,
- GtkTreeIter *iter,
- GSList **list)
-{
- GncExampleAccount *gea;
- gboolean active;
-
- g_return_val_if_fail(GTK_IS_LIST_STORE(store), FALSE);
-
- gtk_tree_model_get (GTK_TREE_MODEL(store), iter,
- COL_CHECKED, &active,
- COL_ACCOUNT, &gea,
- -1);
- if (active && gea)
- *list = g_slist_prepend(*list, gea);
-
- return FALSE; /* Run entire list */
-}
-
-
-static GSList *
-get_selected_account_list (GtkTreeView *tree_view)
-{
- GSList *actlist = NULL;
- GtkTreeModel *model;
-
- model = gtk_tree_view_get_model (tree_view);
- gtk_tree_model_foreach (model,
- (GtkTreeModelForeachFunc)accumulate_accounts,
- &actlist);
- return actlist;
-}
-
-static void
-balance_cell_data_func (GtkTreeViewColumn *tree_column,
- GtkCellRenderer *cell,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer user_data)
-{
- Account *account;
- gnc_numeric balance;
- const gchar *string;
- GNCPrintAmountInfo print_info;
- hierarchy_data *data = (hierarchy_data *)user_data;
- gboolean allow_value;
-
- g_return_if_fail (GTK_TREE_MODEL (model));
- account = gnc_tree_view_account_get_account_from_iter (model, iter);
-
- balance = get_final_balance (data->balance_hash, account);
- if (gnc_numeric_zero_p (balance))
- {
- string = "";
- }
- else
- {
- print_info = gnc_account_print_info (account, FALSE);
- string = xaccPrintAmount (balance, print_info);
- }
-
- if (xaccAccountGetType(account) == ACCT_TYPE_EQUITY ||
- xaccAccountGetType(account) == ACCT_TYPE_TRADING)
- {
- allow_value = FALSE;
- string = _("zero");
- }
- else
- {
- GncAccountMergeDisposition disp;
- disp = determine_merge_disposition(gnc_book_get_root_account(gnc_get_current_book()), account);
- if (disp == GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW)
- {
- allow_value = !xaccAccountGetPlaceholder(account);
- }
- else
- {
- allow_value = FALSE;
- string = _("existing account");
- }
- }
- g_object_set (G_OBJECT (cell),
- "text", string,
- "editable", allow_value,
- "sensitive", allow_value,
- NULL);
-}
-
-static void
-balance_cell_edited (GtkCellRendererText *cell,
- gchar *path,
- gchar *new_text,
- gpointer user_data)
-{
- Account *account;
- char *error_loc;
- gnc_numeric amount;
- hierarchy_data *data = (hierarchy_data *)user_data;
-
- g_return_if_fail(data != NULL);
-
- account = gnc_tree_view_account_get_selected_account(data->final_account_tree);
- if (account == NULL)
- {
- g_critical("account is null");
- return;
- }
-
- error_loc = NULL;
- if (!gnc_exp_parser_parse (new_text, &amount, &error_loc))
- {
- amount = gnc_numeric_zero();
- g_object_set (G_OBJECT(cell), "text", "", NULL);
- }
- /* Bug#348364: Emulating price-cell, we need to ensure the denominator of
- * the amount is in the SCU of the account's commodity (so
- * gnc-ui-util.c:is_decimal_fraction() on the remainder denom for
- * fractional values will be a "decimal").
- */
- {
- int account_cmdty_fraction = xaccAccountGetCommoditySCU(account);
- amount = gnc_numeric_convert(amount, account_cmdty_fraction, GNC_HOW_RND_ROUND_HALF_UP);
- }
- set_final_balance (data->balance_hash, account, amount);
- qof_event_gen (QOF_INSTANCE(account), QOF_EVENT_MODIFY, NULL);
-}
-
-static void
-placeholder_cell_data_func (GtkTreeViewColumn *tree_column,
- GtkCellRenderer *cell,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer user_data)
-{
- Account *account, *root;
- gboolean willbe_placeholder = FALSE;
- GncAccountMergeDisposition disp;
-
- g_return_if_fail (GTK_TREE_MODEL (model));
- account = gnc_tree_view_account_get_account_from_iter (model, iter);
- root = gnc_book_get_root_account(gnc_get_current_book());
- disp = determine_merge_disposition(root, account);
- switch (disp)
- {
- case GNC_ACCOUNT_MERGE_DISPOSITION_USE_EXISTING:
- {
- /* find the existing account, do whatever it is. */
- gchar *full_name;
- Account *existing_acct;
- full_name = gnc_account_get_full_name(account);
- existing_acct = gnc_account_lookup_by_full_name(root, full_name);
- willbe_placeholder = xaccAccountGetPlaceholder(existing_acct);
- g_free(full_name);
- }
- break;
- case GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW:
- willbe_placeholder = xaccAccountGetPlaceholder(account);
- break;
- }
-
- gtk_cell_renderer_toggle_set_active(GTK_CELL_RENDERER_TOGGLE(cell), willbe_placeholder);
-}
-
-
-static void
-use_existing_account_data_func(GtkTreeViewColumn *tree_column,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer user_data)
-{
- Account *new_acct;
- Account *real_root;
- GncAccountMergeDisposition disposition;
- char *to_user = "(error; unknown condition)";
-
- g_return_if_fail (GTK_TREE_MODEL (tree_model));
- new_acct = gnc_tree_view_account_get_account_from_iter(tree_model, iter);
- if (new_acct == NULL)
- {
- g_object_set (G_OBJECT(cell), "text", "(null account)", NULL);
- return;
- }
-
- real_root = gnc_book_get_root_account(gnc_get_current_book());
- disposition = determine_merge_disposition(real_root, new_acct);
- switch (disposition)
- {
- case GNC_ACCOUNT_MERGE_DISPOSITION_USE_EXISTING:
- to_user = _("Yes");
- break;
- case GNC_ACCOUNT_MERGE_DISPOSITION_CREATE_NEW:
- to_user = _("No");
- break;
- }
-
- g_object_set(G_OBJECT(cell), "text", to_user, NULL);
-}
-
-void
-on_final_account_prepare (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- hierarchy_data *data)
-{
- GSList *actlist;
- GtkTreeView *tree_view;
- GtkTreeSelection *selection;
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
- gnc_commodity *com;
-
- /* Anything to do? */
- if (!data->category_set_changed)
- return;
- data->category_set_changed = FALSE;
-
- gnc_suspend_gui_refresh ();
-
- /* Delete any existing account tree */
- if (data->final_account_tree)
- {
- gtk_widget_destroy(GTK_WIDGET(data->final_account_tree));
- data->final_account_tree = NULL;
- }
- delete_our_account_tree (data);
-
-
- /* Build a new account list */
- actlist = get_selected_account_list (data->categories_tree);
- com = gnc_currency_edit_get_currency (GNC_CURRENCY_EDIT(data->currency_selector));
- data->our_account_tree = hierarchy_merge_accounts (actlist, com);
-
-
- /* Now build a new account tree */
- data->final_account_tree
- = GNC_TREE_VIEW_ACCOUNT(gnc_tree_view_account_new_with_root (data->our_account_tree, FALSE));
- tree_view = GTK_TREE_VIEW(data->final_account_tree);
- gnc_tree_view_account_set_name_edited(data->final_account_tree,
- gnc_tree_view_account_name_edited_cb);
- gnc_tree_view_account_set_code_edited(data->final_account_tree,
- gnc_tree_view_account_code_edited_cb);
- gnc_tree_view_account_set_description_edited(data->final_account_tree,
- gnc_tree_view_account_description_edited_cb);
- gnc_tree_view_account_set_notes_edited(data->final_account_tree,
- gnc_tree_view_account_notes_edited_cb);
-
- gtk_tree_view_set_headers_visible (tree_view, TRUE);
- column = gnc_tree_view_find_column_by_name (
- GNC_TREE_VIEW(data->final_account_tree), "type");
- g_object_set_data(G_OBJECT(column), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
- gnc_tree_view_configure_columns (GNC_TREE_VIEW(data->final_account_tree));
- gnc_tree_view_set_show_column_menu (GNC_TREE_VIEW(data->final_account_tree),
- FALSE);
-
- selection = gtk_tree_view_get_selection (tree_view);
- gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-
- // This is a re-definition of the placeholder that the account-tree model
- // provides, reflecting the to-be-created state of the account tree
- // post-merge.
- {
- renderer = gtk_cell_renderer_toggle_new();
- g_object_set(G_OBJECT (renderer),
- "activatable", FALSE,
- "sensitive", FALSE,
- NULL);
- column = gtk_tree_view_column_new_with_attributes(_("Placeholder"),
- renderer, NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- placeholder_cell_data_func,
- (gpointer)data, NULL);
- gnc_tree_view_append_column (GNC_TREE_VIEW(tree_view), column);
- }
-
-
- {
- renderer = gtk_cell_renderer_text_new ();
- g_object_set (G_OBJECT (renderer),
- "xalign", 1.0,
- (char *)NULL);
- g_signal_connect (G_OBJECT (renderer), "edited",
- G_CALLBACK (balance_cell_edited),
- data);
- column = gtk_tree_view_column_new_with_attributes (_("Opening Balance"),
- renderer,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- balance_cell_data_func,
- (gpointer)data, NULL);
- gnc_tree_view_append_column (GNC_TREE_VIEW(tree_view), column);
- }
-
- // only in the case where there *are* existing accounts...
- if (gnc_account_n_descendants(gnc_book_get_root_account(gnc_get_current_book())) > 0)
- {
- GList *renderers;
- column = gnc_tree_view_add_text_column(GNC_TREE_VIEW(tree_view),
- _("Use Existing"),
- NULL,
- NULL,
- "yes",
- GNC_TREE_VIEW_COLUMN_DATA_NONE,
- GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
- NULL);
- renderers = gtk_tree_view_column_get_cell_renderers(column);
- g_object_set(G_OBJECT(renderer), "xalign", 1.0, (char*)NULL);
- gtk_tree_view_column_set_cell_data_func(column, GTK_CELL_RENDERER(renderers->data),
- use_existing_account_data_func, (gpointer)data, NULL);
- g_list_free(renderers);
- }
-
- gtk_container_add(GTK_CONTAINER(data->final_account_tree_container),
- GTK_WIDGET(data->final_account_tree));
-
- /* Expand the entire tree */
- gtk_tree_view_expand_all (tree_view);
- gtk_widget_show(GTK_WIDGET(data->final_account_tree));
- gnc_resume_gui_refresh ();
-}
-
-void
-on_cancel (GnomeDruid *gnomedruid,
- hierarchy_data *data)
-{
- gnc_suspend_gui_refresh ();
- delete_hierarchy_dialog (data);
- delete_our_account_tree (data);
- gncp_new_user_finish ();
- g_free(data);
- gnc_resume_gui_refresh ();
-}
-
-static void
-starting_balance_helper (Account *account, hierarchy_data *data)
-{
- gnc_numeric balance;
-
- balance = get_final_balance (data->balance_hash, account);
- if (gnc_reverse_balance(account))
- balance = gnc_numeric_neg(balance);
- if (!gnc_numeric_zero_p (balance))
- gnc_account_create_opening_balance (account, balance, time (NULL),
- gnc_get_current_book ());
-}
-
-void
-on_finish (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- hierarchy_data *data)
-{
- GncHierarchyDruidFinishedCallback when_completed;
- ENTER (" ");
-
- if (data->our_account_tree)
- {
- gnc_account_foreach_descendant (data->our_account_tree,
- (AccountCb)starting_balance_helper,
- data);
- }
-
- // delete before we suspend GUI events, and then muck with the model,
- // because the model doesn't seem to handle this correctly.
- if (data->initial_category)
- gtk_tree_row_reference_free(data->initial_category);
- delete_hierarchy_dialog (data);
-
- gnc_suspend_gui_refresh ();
-
- account_trees_merge(gnc_get_current_root_account(), data->our_account_tree);
-
- delete_our_account_tree (data);
-
- when_completed = data->when_completed;
- g_free(data);
- gnc_resume_gui_refresh ();
- if (when_completed)
- {
- (*when_completed)();
- }
-
- LEAVE (" ");
-}
-
-static GtkWidget *
-gnc_create_hierarchy_druid (gboolean use_defaults, GncHierarchyDruidFinishedCallback when_completed)
-{
- hierarchy_data *data;
- GtkWidget *dialog;
- GtkTreeView *tree_view;
- GtkWidget *box, *start_page;
- GladeXML *xml;
- GdkColor *color;
-
- data = g_new0 (hierarchy_data, 1);
- xml = gnc_glade_xml_new ("account.glade", "Hierarchy Druid");
-
- dialog = glade_xml_get_widget (xml, "Hierarchy Druid");
- data->dialog = dialog;
-
- data->druid = glade_xml_get_widget (xml, "hierarchy_druid");
- gnc_druid_set_colors (GNOME_DRUID (data->druid));
-
- start_page = glade_xml_get_widget (xml, "start_page");
- gtk_widget_show (start_page);
- gtk_widget_show (glade_xml_get_widget (xml, "newUserDruidFinishPage"));
-
- /* Currency Page */
- data->currency_selector = gnc_currency_edit_new();
- gnc_currency_edit_set_currency (GNC_CURRENCY_EDIT(data->currency_selector), gnc_default_currency());
- gtk_widget_show (data->currency_selector);
- box = glade_xml_get_widget (xml, "currency_chooser_vbox");
- gtk_box_pack_start(GTK_BOX(box), data->currency_selector, FALSE, FALSE, 0);
-
- /* Categories Page */
- tree_view = GTK_TREE_VIEW(glade_xml_get_widget (xml, "account_categories_tree_view"));
- g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (tree_view)), "changed",
- G_CALLBACK (categories_tree_selection_changed), data);
- gtk_tree_selection_set_mode (gtk_tree_view_get_selection (tree_view), GTK_SELECTION_SINGLE);
- data->categories_tree = tree_view;
-
- data->category_accounts_label = GTK_LABEL(glade_xml_get_widget (xml, "accounts_in_category_label"));
- data->category_accounts_container = glade_xml_get_widget (xml, "accounts_in_category");
- data->category_description = GTK_TEXT_VIEW(glade_xml_get_widget (xml, "account_types_description"));
- color = &GNOME_DRUID_PAGE_EDGE(start_page)->textbox_color;
- gtk_widget_modify_base(GTK_WIDGET(data->category_description), GTK_STATE_INSENSITIVE, color);
-
- /* Final Accounts Page */
- data->final_account_tree_container = glade_xml_get_widget (xml, "final_account_tree_box");
- data->final_account_tree = NULL;
-
- data->balance_hash = g_hash_table_new(NULL, NULL);
-
- g_signal_connect (G_OBJECT(dialog), "destroy",
- G_CALLBACK (gnc_hierarchy_destroy_cb), data);
-
- glade_xml_signal_autoconnect_full(xml, gnc_glade_autoconnect_full_func, data);
-
- data->when_completed = when_completed;
- data->use_defaults = use_defaults;
- return dialog;
-}
-
-GtkWidget*
-gnc_ui_hierarchy_druid(gboolean use_defaults)
-{
- return gnc_create_hierarchy_druid(use_defaults, NULL);
-}
-
-GtkWidget*
-gnc_ui_hierarchy_druid_with_callback(gboolean use_defaults,
- GncHierarchyDruidFinishedCallback when_finished)
-{
- return gnc_create_hierarchy_druid(use_defaults, when_finished);
-}
-
-static void
-create_account_page(void)
-{
- GncPluginPage *page;
- page = gnc_plugin_page_account_tree_new();
- gnc_main_window_open_page(NULL, page);
- gnc_ui_file_access_for_save_as();
-}
-
-static void
-gnc_ui_hierarchy_druid_hook (void)
-{
- if (gnc_gconf_get_bool(GCONF_SECTION, "show_on_new_file", NULL))
- {
- gnc_ui_hierarchy_druid_with_callback(TRUE, create_account_page);
- }
-}
-
-void
-gnc_ui_hierarchy_druid_initialize (void)
-{
- gnc_hook_add_dangler(HOOK_NEW_BOOK,
- (GFunc)gnc_ui_hierarchy_druid_hook, NULL);
-}
Deleted: gnucash/trunk/src/gnome/druid-hierarchy.h
===================================================================
--- gnucash/trunk/src/gnome/druid-hierarchy.h 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/druid-hierarchy.h 2011-04-05 19:55:45 UTC (rev 20533)
@@ -1,39 +0,0 @@
-/********************************************************************\
- * druid-hierarchy.h -- account hierarchy creation functionality *
- * Copyright (C) 2001 Gnumatic, Inc. *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
-\********************************************************************/
-
-#ifndef DRUID_HIERARCHY_H
-#define DRUID_HIERARCHY_H
-
-/**
- * A callback (provided by the caller) to be invoked when the druid
- * completes successfully. I.e., the new-user druid can finish the GnuCash
- * New-User Experience, create an account plugin-page, &c.
- **/
-
-typedef void (*GncHierarchyDruidFinishedCallback)(void);
-
-GtkWidget* gnc_ui_hierarchy_druid (gboolean use_defaults);
-GtkWidget* gnc_ui_hierarchy_druid_with_callback(gboolean use_defaults, GncHierarchyDruidFinishedCallback when_finished);
-
-void gnc_ui_hierarchy_druid_initialize (void);
-
-#endif
Modified: gnucash/trunk/src/gnome/glade/account.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/account.glade 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/glade/account.glade 2011-04-05 19:55:45 UTC (rev 20533)
@@ -9,7 +9,6 @@
<property name="title" translatable="yes">New Account</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox12">
<property name="visible">True</property>
@@ -819,414 +818,6 @@
</widget>
</child>
</widget>
- <widget class="GtkWindow" id="Hierarchy Druid">
- <property name="visible">True</property>
- <property name="border_width">1</property>
- <property name="title" translatable="yes">New Account Hierarchy Setup</property>
- <property name="window_position">center-on-parent</property>
- <property name="default_width">640</property>
- <property name="default_height">550</property>
- <property name="type_hint">dialog</property>
- <child>
- <widget class="GnomeDruid" id="hierarchy_druid">
- <property name="visible">True</property>
- <property name="border_width">4</property>
- <property name="show_finish">True</property>
- <signal name="cancel" handler="on_cancel"/>
- <child>
- <widget class="GnomeDruidPageEdge" id="start_page">
- <property name="visible">True</property>
- <property name="position">Edge Start</property>
- <property name="title" translatable="yes">New Account Hierarchy Setup</property>
- <property name="text" translatable="yes">This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have.
-
-Click 'Cancel' if you do not wish to create any new accounts now.</property>
- </widget>
- </child>
- <child>
- <widget class="GnomeDruidPageStandard" id="currency_choose_page">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Choose Currency</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="border_width">20</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="newUserChooseCurrencyDescrip">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please choose the currency to use for new accounts.</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label8477440">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="currency_chooser_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label8477441">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GnomeDruidPageStandard" id="choose_account_types_page">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Choose accounts to create</property>
- <signal name="prepare" handler="on_choose_account_categories_prepare"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox1">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="pickAccountsDescriptionLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select categories that correspond to the ways that you will use GnuCash. Each category you select will cause several accounts to be created. Select the categories that are relevant to you. You can always create additional accounts by hand later.</property>
- <property name="wrap">True</property>
- <property name="width_chars">75</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHPaned" id="hpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">336</property>
- <child>
- <widget class="GtkVPaned" id="vpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="orientation">vertical</property>
- <property name="position">200</property>
- <child>
- <widget class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label8477431">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Categories</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="account_categories_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="reorderable">True</property>
- <property name="rules_hint">True</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="select_all_button">
- <property name="label" translatable="yes">_Select All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="select_all_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="clear_all_button">
- <property name="label" translatable="yes">C_lear All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="clear_all_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox130">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label8477397">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Category Description</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment10">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow31">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="account_types_description">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox131">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="accounts_in_category_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"><b>Accounts in %s</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="accounts_in_category">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GnomeDruidPageStandard" id="final_account_page">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Setup selected accounts</property>
- <signal name="prepare" handler="on_final_account_prepare"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox3">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="orientation">vertical</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkLabel" id="finalAccountLabel">
- <property name="visible">True</property>
- <property name="xpad">1</property>
- <property name="ypad">1</property>
- <property name="label" translatable="yes">If you would like to change an account's name, click on the row containing the account, then click on the account name and change it.
-
-Some accounts are marked as "Placeholder". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account.
-
-If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance.
-
-Note: all accounts except Equity and placeholder accounts may have an opening balance.
-</property>
- <property name="wrap">True</property>
- <property name="width_chars">75</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="final_account_tree_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GnomeDruidPageEdge" id="newUserDruidFinishPage">
- <property name="visible">True</property>
- <property name="position">GNOME_EDGE_FINISH</property>
- <property name="title" translatable="yes">Finish Account Setup</property>
- <property name="text" translatable="yes">Press `Apply' to create your new accounts. You will then be able to save them to a file or database.
-
-Press `Back' to review your selections.
-
-Press `Cancel' to close this dialog without creating any new accounts.</property>
- <signal name="finish" handler="on_finish"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkDialog" id="Account Picker">
<property name="visible">True</property>
<property name="title" translatable="yes">Select Account</property>
@@ -2199,380 +1790,4 @@
</widget>
</child>
</widget>
- <widget class="GtkAssistant" id="Hierarchy Assistant">
- <property name="border_width">12</property>
- <signal name="cancel" handler="on_cancel"/>
- <signal name="close" handler="on_finish"/>
- <child>
- <widget class="GtkLabel" id="intro_page_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have.
-
-Click 'Cancel' if you do not wish to create any new accounts now.</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="page_type">intro</property>
- <property name="title" translatable="yes">New Account Hierarchy Setup</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="currency_page_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="choose_currency_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please choose the currency to use for new accounts.</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkVBox" id="currency_chooser_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="title" translatable="yes">Choose Currency</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="choose_account_types_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="pickAccountsDescriptionLabel">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select categories that correspond to the ways that you will use GnuCash. Each category you select will cause several accounts to be created. Select the categories that are relevant to you. You can always create additional accounts by hand later.</property>
- <property name="wrap">True</property>
- <property name="width_chars">75</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHPaned" id="hpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">336</property>
- <property name="position_set">True</property>
- <child>
- <widget class="GtkVPaned" id="vpaned2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="orientation">vertical</property>
- <property name="position">150</property>
- <property name="position_set">True</property>
- <child>
- <widget class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label8477431">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Categories</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="account_categories_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="reorderable">True</property>
- <property name="rules_hint">True</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="select_all_button">
- <property name="label" translatable="yes">_Select All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="clear_all_button">
- <property name="label" translatable="yes">C_lear All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="clear_all_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox130">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label8477397">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Category Description</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment10">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow31">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="account_types_description">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox131">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="accounts_in_category_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"><b>Accounts in %s</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkScrolledWindow" id="accounts_in_category">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="page_type">progress</property>
- <property name="title" translatable="yes">Choose accounts to create</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="final_account_vbox">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="finalAccountLabel">
- <property name="visible">True</property>
- <property name="xpad">1</property>
- <property name="ypad">1</property>
- <property name="label" translatable="yes">If you would like to change an account's name, click on the row containing the account, then click on the account name and change it.
-
-Some accounts are marked as "Placeholder". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account.
-
-If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance.
-
-Note: all accounts except Equity and placeholder accounts may have an opening balance.
-</property>
- <property name="wrap">True</property>
- <property name="width_chars">75</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="final_account_tree_box">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="title" translatable="yes">Setup selected accounts</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="finish_page_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Press `Apply' to create your new accounts. You will then be able to save them to a file or database.
-
-Press `Back' to review your selections.
-
-Press `Cancel' to close this dialog without creating any new accounts.</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="page_type">confirm</property>
- <property name="title" translatable="yes">Finish Account Setup</property>
- </packing>
- </child>
- </widget>
</glade-interface>
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2011-04-05 19:55:45 UTC (rev 20533)
@@ -45,7 +45,7 @@
#include "dialog-account.h"
#include "dialog-transfer.h"
#include "dialog-utils.h"
-#include "druid-hierarchy.h"
+#include "assistant-hierarchy.h"
#include "gnc-account-sel.h"
#include "gnc-component-manager.h"
#include "gnc-engine.h"
@@ -790,7 +790,7 @@
static void
gnc_plugin_page_account_tree_cmd_file_new_hierarchy (GtkAction *action, GncPluginPageAccountTree *page)
{
- gnc_ui_hierarchy_druid(FALSE);
+ gnc_ui_hierarchy_assistant(FALSE);
}
static void
Modified: gnucash/trunk/src/gnome/top-level.c
===================================================================
--- gnucash/trunk/src/gnome/top-level.c 2011-04-05 19:55:37 UTC (rev 20532)
+++ gnucash/trunk/src/gnome/top-level.c 2011-04-05 19:55:45 UTC (rev 20533)
@@ -36,7 +36,7 @@
#include "dialog-sx-editor.h"
#include "dialog-transfer.h"
#include "dialog-totd.h"
-#include "druid-hierarchy.h"
+#include "assistant-hierarchy.h"
#include "file-utils.h"
#include "gnc-component-manager.h"
#include "gnc-engine.h"
@@ -424,7 +424,7 @@
Anyway... Oh, maybe... nah */
gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (),
gnc_plugin_budget_new ());
- gnc_ui_hierarchy_druid_initialize();
+ gnc_ui_hierarchy_assistant_initialize();
/* Run the ui startup hooks. */
gnc_hook_run(HOOK_UI_STARTUP, NULL);
More information about the gnucash-changes
mailing list