r19099 - gnucash/trunk - Remove QSF
Geert Janssens
gjanssens at code.gnucash.org
Tue May 4 10:15:39 EDT 2010
Author: gjanssens
Date: 2010-05-04 10:15:38 -0400 (Tue, 04 May 2010)
New Revision: 19099
Trac: http://svn.gnucash.org/trac/changeset/19099
Removed:
gnucash/trunk/src/gnome/dialog-chart-export.c
gnucash/trunk/src/gnome/dialog-chart-export.h
gnucash/trunk/src/gnome/druid-merge.c
gnucash/trunk/src/gnome/druid-merge.h
gnucash/trunk/src/gnome/glade/chart-export.glade
gnucash/trunk/src/gnome/glade/merge.glade
gnucash/trunk/src/libqof/backend/
gnucash/trunk/src/optional/xsl/
Modified:
gnucash/trunk/configure.ac
gnucash/trunk/src/backend/dbi/test/Makefile.am
gnucash/trunk/src/backend/xml/gnc-backend-xml.c
gnucash/trunk/src/backend/xml/test/Makefile.am
gnucash/trunk/src/business/business-core/sql/test/Makefile.am
gnucash/trunk/src/business/business-core/test/Makefile.am
gnucash/trunk/src/business/business-core/test/test-customer.c
gnucash/trunk/src/business/business-core/test/test-employee.c
gnucash/trunk/src/business/business-core/test/test-job.c
gnucash/trunk/src/business/business-core/test/test-vendor.c
gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
gnucash/trunk/src/engine/test/test-recursive.c
gnucash/trunk/src/gnome-utils/gnc-file.c
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/gnome/druid-hierarchy.c
gnucash/trunk/src/gnome/glade/Makefile.am
gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
gnucash/trunk/src/libqof/Makefile.am
gnucash/trunk/src/libqof/qof/qof.h
gnucash/trunk/src/libqof/qof/qofbackend.h
gnucash/trunk/src/libqof/qof/qofchoice.h
gnucash/trunk/src/libqof/qof/qofsession.c
gnucash/trunk/src/libqof/qof/qofsession.h
gnucash/trunk/src/libqof/qof/qofsql.c
gnucash/trunk/src/libqof/qof/qofutil.c
gnucash/trunk/src/optional/Makefile.am
Log:
Remove QSF
Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/configure.ac 2010-05-04 14:15:38 UTC (rev 19099)
@@ -550,11 +550,8 @@
QOF_LIBS='${top_builddir}/src/libqof/qof/libgnc-qof.la'
QOF_VERSION="internal"
QOF_PREFIX="internal"
- QOF_XML_DIR='${pkgdatadir}/xml/qsf'
LIBQOF_LIBRARY_VERSION=1:4:0
- LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:3:0
AC_SUBST(LIBQOF_LIBRARY_VERSION)
- AC_SUBST(LIBQOF_BACKEND_QSF_LIBRARY_VERSION)
AC_DEFINE(HAVE_LIBQOF,,[We will use the internal QOF code])
HAVE_LIBQOF="use_internal"
fi
@@ -566,7 +563,6 @@
AS_SCRUB_INCLUDE(QOF_PREFIX)
AC_SUBST(QOF_PREFIX)
AC_SUBST(QOF_LIB_DIR)
-AC_SUBST(QOF_XML_DIR)
AC_DEFINE(QOF_DISABLE_DEPRECATED,1, [Don't use deprecated qof functions])
@@ -1449,12 +1445,9 @@
src/import-export/hbci/test/Makefile
src/libqof/Makefile
src/libqof/qof/Makefile
- src/libqof/backend/Makefile
- src/libqof/backend/file/Makefile
src/optional/Makefile
src/optional/python-bindings/Makefile
src/optional/python-bindings/tests/Makefile
- src/optional/xsl/Makefile
src/pixmaps/Makefile
src/quotes/Makefile
src/register/Makefile
Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -56,7 +56,6 @@
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/engine/test-core \
- -I${top_srcdir}/src/backend/qsf \
-I${top_srcdir}/src/libqof/qof \
-DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \
-DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \
Modified: gnucash/trunk/src/backend/xml/gnc-backend-xml.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/backend/xml/gnc-backend-xml.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -92,9 +92,6 @@
GNC_BOOK_XML1_FILE,
GNC_BOOK_XML2_FILE,
GNC_BOOK_XML2_FILE_NO_ENCODING,
- QSF_GNC_OBJECT,
- QSF_OBJECT,
- QSF_MAP,
} QofBookFileType;
/* ================================================================= */
Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -237,7 +237,6 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/engine/test-core \
-I${top_srcdir}/src/backend/xml \
- -I${top_srcdir}/src/backend/qsf \
-I${top_srcdir}/src/libqof/qof \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS} \
Modified: gnucash/trunk/src/business/business-core/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/sql/test/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-core/sql/test/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -14,7 +14,7 @@
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/src/backend\sql
+ --library-dir ${top_builddir}/src/backend/sql
TESTS_ENVIRONMENT = \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
Modified: gnucash/trunk/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/test/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-core/test/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -6,6 +6,7 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/business/business-core \
-I${top_srcdir}/src/libqof/qof \
+ -I${top_srcdir}/src/backend/xml \
${GUILE_INCS} \
${GLIB_CFLAGS}
@@ -15,6 +16,7 @@
${top_builddir}/src/engine/libgncmod-engine.la \
../libgncmod-business-core.la \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
+ ${top_builddir}/src/backend/xml/libgncmod-backend-xml.la \
${GLIB_LIBS}
TESTS = \
@@ -36,7 +38,8 @@
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/engine \
- --library-dir ${top_builddir}/src/business/business-core
+ --library-dir ${top_builddir}/src/business/business-core \
+ --library-dir ${top_builddir}/src/backend/xml
TESTS_ENVIRONMENT = \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/trunk/src/business/business-core/test/test-customer.c
===================================================================
--- gnucash/trunk/src/business/business-core/test/test-customer.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-core/test/test-customer.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -33,6 +33,11 @@
#include "gncJobP.h"
#include "test-stuff.h"
+#include "gnc-backend-xml.h"
+
+#define FILE_NAME "xml:///tmp/testbook.gnucash"
+#define GNC_LIB_NAME "gncmod-backend-xml"
+
static int count = 0;
static void
@@ -60,14 +65,14 @@
session = qof_session_new();
be = NULL;
- qof_session_begin(session, QOF_STDOUT, FALSE, FALSE);
+ qof_session_begin(session, FILE_NAME, FALSE, FALSE);
book = qof_session_get_book(session);
be = qof_book_get_backend(book);
/* The book *must* have a backend to pass the test of the 'dirty' flag
- so use a session to use the default QSF. However, until the SQL backend can be used,
+ so use a session to use the default XML. However, until the SQL backend can be used,
entities remain dirty until the session is saved or closed. */
- do_test (be != NULL, "qsf backend could not be set");
+ do_test (be != NULL, "xml backend could not be set");
/* Test creation/destruction */
{
@@ -210,6 +215,7 @@
main (int argc, char **argv)
{
qof_init();
+ qof_load_backend_library ("../../../backend/xml/.libs/", GNC_LIB_NAME);
do_test (cashobjects_register(), "Cannot register cash objects");
do_test (gncInvoiceRegister(), "Cannot register GncInvoice");
do_test (gncJobRegister (), "Cannot register GncJob");
Modified: gnucash/trunk/src/business/business-core/test/test-employee.c
===================================================================
--- gnucash/trunk/src/business/business-core/test/test-employee.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-core/test/test-employee.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -33,6 +33,11 @@
#include "gncInvoiceP.h"
#include "test-stuff.h"
+#include "gnc-backend-xml.h"
+
+#define FILE_NAME "xml:///tmp/testbook.gnucash"
+#define GNC_LIB_NAME "gncmod-backend-xml"
+
static int count = 0;
static void
@@ -66,13 +71,14 @@
GncEmployee *employee;
session = qof_session_new();
- qof_session_begin(session, QOF_STDOUT, FALSE, FALSE);
+ qof_session_begin(session, FILE_NAME, FALSE, FALSE);
book = qof_session_get_book(session);
+ be = qof_book_get_backend (book);
+
/* The book *must* have a backend to pass the test of the 'dirty' flag */
/* See the README file for details */
+ do_test (be != NULL, "xml backend could not be set");
- be = qof_book_get_backend (book);
-
/* Test creation/destruction */
{
do_test (gncEmployeeCreate (NULL) == NULL, "employee create NULL");
@@ -220,6 +226,7 @@
main (int argc, char **argv)
{
qof_init();
+ qof_load_backend_library ("../../../backend/xml/.libs/", GNC_LIB_NAME);
do_test (gncInvoiceRegister(), "Cannot register GncInvoice");
do_test (gncJobRegister (), "Cannot register GncJob");
do_test (gncCustomerRegister(), "Cannot register GncCustomer");
Modified: gnucash/trunk/src/business/business-core/test/test-job.c
===================================================================
--- gnucash/trunk/src/business/business-core/test/test-job.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-core/test/test-job.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -33,6 +33,11 @@
#include "gncOwner.h"
#include "test-stuff.h"
+#include "gnc-backend-xml.h"
+
+#define FILE_NAME "xml:///tmp/testbook.gnucash"
+#define GNC_LIB_NAME "gncmod-backend-xml"
+
static int count = 0;
static void
@@ -69,13 +74,13 @@
session = qof_session_new();
be = NULL;
- qof_session_begin(session, QOF_STDOUT, FALSE, FALSE);
+ qof_session_begin(session, FILE_NAME, FALSE, FALSE);
book = qof_session_get_book (session);
be = qof_book_get_backend(book);
/* The book *must* have a backend to pass the test of the 'dirty' flag */
/* See the README file for details */
- do_test (be != NULL, "qsf backend could not be set");
+ do_test (be != NULL, "xml backend could not be set");
/* Test creation/destruction */
{
@@ -241,6 +246,7 @@
main (int argc, char **argv)
{
qof_init();
+ qof_load_backend_library ("../../../backend/xml/.libs/", GNC_LIB_NAME);
do_test (gncInvoiceRegister(), "Cannot register GncInvoice");
do_test (gncJobRegister (), "Cannot register GncJob");
do_test (gncCustomerRegister(), "Cannot register GncCustomer");
Modified: gnucash/trunk/src/business/business-core/test/test-vendor.c
===================================================================
--- gnucash/trunk/src/business/business-core/test/test-vendor.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-core/test/test-vendor.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -32,6 +32,11 @@
#include "gncVendorP.h"
#include "test-stuff.h"
+#include "gnc-backend-xml.h"
+
+#define FILE_NAME "xml:///tmp/testbook.gnucash"
+#define GNC_LIB_NAME "gncmod-backend-xml"
+
static int count = 0;
static void
@@ -68,13 +73,13 @@
session = qof_session_new();
be = NULL;
- qof_session_begin(session, QOF_STDOUT, FALSE, FALSE);
+ qof_session_begin(session, FILE_NAME, FALSE, FALSE);
book = qof_session_get_book (session);
be = qof_book_get_backend(book);
/* The book *must* have a backend to pass the test of the 'dirty' flag */
/* See the README file for details */
- do_test (be != NULL, "qsf backend could not be set");
+ do_test (be != NULL, "xml backend could not be set");
/* Test creation/destruction */
{
@@ -222,6 +227,7 @@
main (int argc, char **argv)
{
qof_init();
+ qof_load_backend_library ("../../../backend/xml/.libs/", GNC_LIB_NAME);
do_test (gncInvoiceRegister(), "Cannot register GncInvoice");
do_test (gncJobRegister (), "Cannot register GncJob");
do_test (gncCustomerRegister(), "Cannot register GncCustomer");
Modified: gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/business/business-gnome/gnc-plugin-business.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -101,18 +101,6 @@
static void gnc_plugin_business_cmd_bills_due_reminder (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_export_invoice (GtkAction *action,
- GncMainWindowActionData *data);
-
-static void gnc_plugin_business_cmd_export_customer (GtkAction *action,
- GncMainWindowActionData *data);
-
-static void gnc_plugin_business_cmd_export_vendor (GtkAction *action,
- GncMainWindowActionData *data);
-
-static void gnc_plugin_business_cmd_export_employee (GtkAction *action,
- GncMainWindowActionData *data);
-
static void gnc_plugin_business_cmd_test_search (GtkAction *action,
GncMainWindowActionData *data);
@@ -128,8 +116,6 @@
static void gnc_plugin_business_cmd_test_init_data (GtkAction *action,
GncMainWindowActionData *data);
-/*static void gnc_plugin_business_cmd_export_report (GtkAction *action,
- GncMainWindowActionData *data);*/
#define PLUGIN_ACTIONS_NAME "gnc-plugin-business-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-business-ui.xml"
@@ -268,26 +254,6 @@
G_CALLBACK (gnc_plugin_business_cmd_bills_due_reminder)
},
{ "ExportMenuAction", NULL, N_("E_xport"), NULL, NULL, NULL },
- {
- "QSFInvoiceAction", NULL, N_("QSF _Invoice..."), NULL,
- N_("Export one or more invoices to QSF"),
- G_CALLBACK (gnc_plugin_business_cmd_export_invoice)
- },
- {
- "QSFCustomerAction", NULL, N_("QSF _Customer..."), NULL,
- N_("Export one or more customers to QSF"),
- G_CALLBACK (gnc_plugin_business_cmd_export_customer)
- },
- {
- "QSFVendorAction", NULL, N_("QSF _Vendor..."), NULL,
- N_("Export one or more vendors to QSF"),
- G_CALLBACK (gnc_plugin_business_cmd_export_vendor)
- },
- {
- "QSFEmployeeAction", NULL, N_("QSF _Employee..."), NULL,
- N_("Export one or more employees to QSF"),
- G_CALLBACK (gnc_plugin_business_cmd_export_employee)
- },
/* Extensions Menu */
{ "BusinessTestAction", NULL, N_("_Business"), NULL, NULL, NULL },
@@ -768,150 +734,7 @@
gnc_invoice_remind_bills_due();
}
-/**************************************************************
- * QSF export routines
- **************************************************************/
-
static void
-gnc_plugin_business_cmd_export_invoice (GtkAction *action, GncMainWindowActionData *mw)
-{
- QofSession *current_session, *chart_session;
- QofBook *book;
- QofCollection *coll;
- gchar *filename;
- gboolean success;
-
- current_session = gnc_get_current_session();
- book = qof_session_get_book(current_session);
- chart_session = qof_session_new();
- success = FALSE;
- filename = gnc_file_dialog(_("Export Invoices to XML"), NULL,
- NULL, GNC_FILE_DIALOG_EXPORT);
- if (filename)
- {
- gchar* url = g_strdup_printf( "qsf:%s", filename );
- qof_session_begin(chart_session, url, TRUE, TRUE);
- coll = qof_book_get_collection(book, GNC_ID_INVOICE);
- success = qof_instance_copy_coll_r(chart_session, coll);
- /* Need to get the GList of GncEntry's - KVP */
- coll = qof_book_get_collection(book, GNC_ID_CUSTOMER);
- success = qof_instance_copy_coll_r(chart_session, coll);
- if (success)
- {
- qof_session_save(chart_session, NULL);
- }
- g_free(url);
- }
- show_session_error(qof_session_get_error(chart_session), filename,
- GNC_FILE_DIALOG_EXPORT);
- g_free(filename);
- qof_session_end(chart_session);
- gnc_set_current_session(current_session);
-}
-
-static void
-gnc_plugin_business_cmd_export_customer (GtkAction *action, GncMainWindowActionData *mw)
-{
- QofSession *current_session, *chart_session;
- QofBook *book;
- QofCollection *coll;
- gchar *filename;
- gboolean success;
-
- current_session = gnc_get_current_session();
- book = qof_session_get_book(current_session);
- chart_session = qof_session_new();
- success = FALSE;
- filename = gnc_file_dialog(_("Export Customers to XML"), NULL,
- NULL, GNC_FILE_DIALOG_EXPORT);
- if (filename)
- {
- gchar* url = g_strdup_printf( "qsf:%s", filename );
- qof_session_begin(chart_session, url, TRUE, TRUE);
- coll = qof_book_get_collection(book, GNC_ID_CUSTOMER);
- success = qof_instance_copy_coll_r(chart_session, coll);
- if (success)
- {
- qof_session_save(chart_session, NULL);
- }
- g_free(url);
- }
- show_session_error(qof_session_get_error(chart_session), filename,
- GNC_FILE_DIALOG_EXPORT);
- qof_session_end(chart_session);
- g_free(filename);
- gnc_set_current_session(current_session);
-}
-
-static void
-gnc_plugin_business_cmd_export_vendor (GtkAction *action, GncMainWindowActionData *mw)
-{
- QofSession *current_session, *chart_session;
- QofBook *book;
- QofCollection *coll;
- gchar *filename;
- gboolean success;
-
- current_session = gnc_get_current_session();
- book = qof_session_get_book(current_session);
- chart_session = qof_session_new();
- success = FALSE;
- filename = gnc_file_dialog(_("Export Vendors to XML"), NULL,
- NULL, GNC_FILE_DIALOG_EXPORT);
- if (filename)
- {
- gchar* url = g_strdup_printf( "qsf:%s", filename );
- qof_session_begin(chart_session, url, TRUE, TRUE);
- coll = qof_book_get_collection(book, GNC_ID_VENDOR);
- success = qof_instance_copy_coll_r(chart_session, coll);
- if (success)
- {
- qof_session_save(chart_session, NULL);
- }
- g_free(url);
- }
- show_session_error(qof_session_get_error(chart_session), filename,
- GNC_FILE_DIALOG_EXPORT);
- qof_session_end(chart_session);
- g_free(filename);
- gnc_set_current_session(current_session);
-}
-
-static void
-gnc_plugin_business_cmd_export_employee (GtkAction *action, GncMainWindowActionData *mw)
-{
- QofSession *current_session, *chart_session;
- QofBook *book;
- QofCollection *coll;
- gchar *filename;
- gboolean success;
-
- current_session = gnc_get_current_session();
- book = qof_session_get_book(current_session);
- chart_session = qof_session_new();
- success = FALSE;
- filename = gnc_file_dialog(_("Export Employees to XML"), NULL,
- NULL, GNC_FILE_DIALOG_EXPORT);
- if (filename)
- {
- gchar* url = g_strdup_printf( "qsf:%s", filename );
- qof_session_begin(chart_session, url, TRUE, TRUE);
- coll = qof_book_get_collection(book, GNC_ID_EMPLOYEE);
- success = qof_instance_copy_coll_r(chart_session, coll);
- if (success)
- {
- qof_session_save(chart_session, NULL);
- }
- g_free(url);
- }
- show_session_error(qof_session_get_error(chart_session), filename,
- GNC_FILE_DIALOG_EXPORT);
- qof_session_end(chart_session);
- g_free(filename);
- gnc_set_current_session(current_session);
-}
-
-static void
gnc_plugin_business_cmd_test_search (GtkAction *action,
GncMainWindowActionData *data)
{
Modified: gnucash/trunk/src/engine/test/test-recursive.c
===================================================================
--- gnucash/trunk/src/engine/test/test-recursive.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/engine/test/test-recursive.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -47,8 +47,8 @@
#define OBJ_RELATIVE "family"
#define OBJ_LIST "descendents"
-/* set to TRUE to get QSF XML output
- * requires QSF available (i.e. make install) */
+/* set to TRUE to get XML output on stdout
+ * requires a stdout capable backend available (i.e. make install) */
static gboolean debug = FALSE;
/* simple object structure */
@@ -1168,7 +1168,8 @@
copy = qof_session_new();
if (debug)
{
- qof_session_begin(copy, QOF_STDOUT, TRUE, FALSE);
+/* FIXME XML backend can't handle STDOUT
+ * qof_session_begin(copy, QOF_STDOUT, TRUE, FALSE); */
}
/* TODO: implement QOF_TYPE_CHOICE testing. */
qof_instance_copy_coll_r(copy, grand_coll);
@@ -1189,8 +1190,9 @@
do_test((f == c.collect), "Number of children in descendents does not match");
if (counter == 4 && debug == TRUE)
{
- qof_session_save(copy, NULL);
- qof_session_save(original, NULL);
+/* FIXME XML backend can't handle STDOUT
+ * qof_session_save(copy, NULL);
+ qof_session_save(original, NULL); */
}
qof_session_end(copy);
copy = NULL;
@@ -1211,7 +1213,8 @@
original = qof_session_new();
if (debug)
{
- qof_session_begin(original, QOF_STDOUT, TRUE, FALSE);
+/* FIXME XML backend can't handle STDOUT
+ * qof_session_begin(original, QOF_STDOUT, TRUE, FALSE); */
}
create_data(original, (counter % 5));
test_recursion(original, (counter % 5));
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -24,7 +24,6 @@
libgnc_gnome_la_SOURCES = \
swig-gnome.c \
- dialog-chart-export.c \
dialog-commodities.c \
dialog-fincalc.c \
dialog-find-transactions.c \
@@ -39,7 +38,6 @@
dialog-tax-info.c \
druid-acct-period.c \
druid-hierarchy.c \
- druid-merge.c \
druid-loan.c \
druid-stock-split.c \
gnc-plugin-account-tree.c \
@@ -66,7 +64,6 @@
appicondir = $(datadir)/pixmaps
noinst_HEADERS = \
- dialog-chart-export.h \
dialog-fincalc.h \
dialog-find-transactions.h \
dialog-new-user.h \
@@ -77,7 +74,6 @@
dialog-sx-since-last-run.h \
druid-acct-period.h \
druid-hierarchy.h \
- druid-merge.h \
druid-loan.h \
druid-stock-split.h \
gnc-plugin-account-tree.h \
Deleted: gnucash/trunk/src/gnome/dialog-chart-export.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-chart-export.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/dialog-chart-export.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,300 +0,0 @@
-/***************************************************************************
- * dialog-chart-export.c
- *
- * Sun Feb 27 14:19:12 2005
- * Copyright 2005 Neil Williams
- * linux at codehelp.co.uk
- * 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <time.h>
-
-#include "qof.h"
-#include "AccountP.h"
-#include "Transaction.h"
-#include "dialog-chart-export.h"
-#include "gnc-ui-util.h"
-#include "dialog-utils.h"
-#include "gnc-engine.h"
-#include "gnc-file.h"
-#include "gnc-ui.h"
-#include "gnc-session.h"
-
-#define EQUITY_ACCOUNT_NAME _("Opening Balances")
-#define OPENING_BALANCE_DESC _("Opening Balance")
-
-void chart_export_response_cb (GtkDialog *dialog, gint response, gpointer user_data);
-
-typedef struct chart_data_s
-{
- GladeXML *xml;
- GtkWidget *dialog;
- GtkWidget *calendar;
- time_t chart_time_t;
- QofSession *chart_session;
- Account *equity_account;
- GList *param_ref_list;
-} chart_data;
-
-static void
-chart_collection_cb(QofInstance *ent, gpointer user_data)
-{
- chart_data *data;
- Account *acc;
- gboolean success;
- const GncGUID *guid;
- QofCollection *copy_coll;
- QofBook *book;
-
- g_return_if_fail(user_data != NULL);
- data = (chart_data*)user_data;
- acc = (Account*)ent;
- if (0 == safe_strcmp(EQUITY_ACCOUNT_NAME, xaccAccountGetName(acc))
- && (xaccAccountGetType(acc) == ACCT_TYPE_EQUITY))
- {
- success = qof_instance_copy_to_session(data->chart_session, ent);
- if (!success)
- {
- return;
- }
- guid = qof_entity_get_guid(ent);
- book = qof_session_get_book(data->chart_session);
- copy_coll = qof_book_get_collection(book, GNC_ID_ACCOUNT);
- data->equity_account = (Account*)qof_collection_lookup_entity(copy_coll, guid);
- return;
- }
-}
-
-static void
-chart_reference_cb(QofInstance *ent, gpointer user_data)
-{
- QofInstanceReference *reference;
- QofParam *ref_param;
- chart_data *data;
-
- g_return_if_fail(user_data != NULL);
- data = (chart_data*)user_data;
- while (data->param_ref_list != NULL)
- {
- ref_param = data->param_ref_list->data;
- reference = qof_instance_get_reference_from(ent, ref_param);
- qof_session_update_reference_list(data->chart_session, reference);
- data->param_ref_list = data->param_ref_list->next;
- }
-}
-
-static void
-chart_entity_cb(QofInstance *ent, gpointer user_data)
-{
- chart_data *data;
- Account *acc_ent, *equity_account;
- Transaction *trans;
- Split *split;
- gnc_numeric balance;
- QofBook *book;
- QofCollection *coll;
- const GncGUID *guid;
- time_t trans_time;
- GList *ref;
- QofInstanceReference *ent_ref;
-
- g_return_if_fail(user_data != NULL);
- data = (chart_data*)user_data;
- trans_time = data->chart_time_t;
- data->param_ref_list = NULL;
- guid = qof_entity_get_guid(ent);
- acc_ent = (Account*)ent;
- ref = NULL;
- equity_account = data->equity_account;
- g_return_if_fail(equity_account != NULL);
- balance = xaccAccountGetBalanceAsOfDate(acc_ent, data->chart_time_t);
- qof_instance_copy_to_session(data->chart_session, ent);
- book = qof_session_get_book(data->chart_session);
- coll = qof_book_get_collection(book, GNC_ID_ACCOUNT);
- acc_ent = (Account*)qof_collection_lookup_entity(coll, guid);
- if (xaccAccountGetCommodity(acc_ent) == NULL)
- {
- xaccAccountSetCommodity(acc_ent, gnc_default_currency());
- }
- /* can't use gnc_account_create_opening_balance directly - the partial
- QofBook doesn't have an AccountGroup that is used to locate the Equity Account. */
- xaccAccountBeginEdit (acc_ent);
- xaccAccountBeginEdit (equity_account);
- trans = xaccMallocTransaction (book);
- xaccTransBeginEdit (trans);
- xaccTransSetCurrency (trans, xaccAccountGetCommodity (acc_ent));
- xaccTransSetDateSecs (trans, trans_time);
- xaccTransSetDateEnteredSecs (trans, trans_time);
- xaccTransSetDescription (trans, OPENING_BALANCE_DESC);
- /* User account split */
- split = xaccMallocSplit (book);
- xaccTransAppendSplit (trans, split);
- xaccAccountInsertSplit (acc_ent, split);
- xaccSplitSetAmount (split, balance);
- xaccSplitSetValue (split, balance);
- ref = qof_class_get_referenceList(GNC_ID_SPLIT);
- while (ref != NULL)
- {
- ent_ref = qof_instance_get_reference_from(QOF_INSTANCE(split), ref->data);
- qof_session_update_reference_list(data->chart_session, ent_ref);
- ref = g_list_next(ref);
- }
- g_list_free(ref);
- balance = gnc_numeric_neg (balance);
- /* Equity account split */
- split = xaccMallocSplit (book);
- xaccTransAppendSplit (trans, split);
- xaccAccountInsertSplit (equity_account, split);
- xaccSplitSetAmount (split, balance);
- xaccSplitSetValue (split, balance);
- xaccTransCommitEdit (trans);
- xaccAccountCommitEdit (equity_account);
- xaccAccountCommitEdit (acc_ent);
- ref = qof_class_get_referenceList(GNC_ID_TRANS);
- while (ref != NULL)
- {
- ent_ref = qof_instance_get_reference_from(QOF_INSTANCE(trans), ref->data);
- qof_session_update_reference_list(data->chart_session, ent_ref);
- ref = g_list_next(ref);
- }
- g_list_free(ref);
- ref = qof_class_get_referenceList(GNC_ID_SPLIT);
- while (ref != NULL)
- {
- ent_ref = qof_instance_get_reference_from(QOF_INSTANCE(split), ref->data);
- qof_session_update_reference_list(data->chart_session, ent_ref);
- ref = g_list_next(ref);
- }
- g_list_free(ref);
-}
-
-void
-gnc_main_window_chart_export(void)
-{
- GladeXML *xml;
- chart_data *data;
-
- xml = gnc_glade_xml_new ("chart-export.glade", "chart-export");
- data = g_new0(chart_data, 1);
- data->xml = xml;
- data->dialog = glade_xml_get_widget(xml, "chart-export");
- data->calendar = glade_xml_get_widget(xml, "chart-calendar");
- glade_xml_signal_autoconnect_full(xml,
- gnc_glade_autoconnect_full_func,
- data);
- gtk_widget_show(data->dialog);
-}
-
-static void
-on_dateok_clicked (chart_data *data)
-{
- guint year, month, day;
- struct tm *chart_tm;
- gchar *filename;
- QofSession *current_session, *chart_session;
- QofBook *book;
- QofCollection *coll;
-
- data->chart_time_t = time(NULL);
- chart_tm = gmtime(&data->chart_time_t);
- /* set today - calendar will omit any zero/NULL values */
- year = chart_tm->tm_year + 1900;
- month = chart_tm->tm_mon + 1;
- day = chart_tm->tm_mday;
- gtk_calendar_get_date(GTK_CALENDAR(data->calendar),
- &year, &month, &day);
- if ((year + 1900) != chart_tm->tm_year)
- {
- chart_tm->tm_year = year - 1900;
- }
- if (month != chart_tm->tm_mon)
- {
- chart_tm->tm_mon = month;
- }
- if (day != chart_tm->tm_yday)
- {
- chart_tm->tm_mday = day;
- }
- data->chart_time_t = mktime(chart_tm);
- current_session = gnc_get_current_session();
- book = qof_session_get_book(current_session);
- chart_session = qof_session_new();
- filename = gnc_file_dialog(_("Export Chart of Accounts to QSF XML"),
- NULL, NULL, GNC_FILE_DIALOG_EXPORT);
- if (filename)
- {
- gnc_set_busy_cursor(NULL, TRUE);
- qof_event_suspend();
- qof_session_begin(chart_session, filename, TRUE, TRUE);
- data->chart_session = chart_session;
- data->equity_account = NULL;
- coll = qof_book_get_collection(book, GNC_ID_ACCOUNT);
- qof_collection_foreach(coll, chart_collection_cb, data);
- if (data->equity_account == NULL)
- {
- data->equity_account = xaccMallocAccount (qof_session_get_book(chart_session));
- xaccAccountBeginEdit (data->equity_account);
- xaccAccountSetName (data->equity_account, EQUITY_ACCOUNT_NAME);
- xaccAccountSetDescription(data->equity_account, EQUITY_ACCOUNT_NAME);
- xaccAccountSetType (data->equity_account, ACCT_TYPE_EQUITY);
- xaccAccountSetCommodity (data->equity_account, gnc_default_currency());
- }
- qof_object_foreach(GNC_ID_ACCOUNT, book, chart_entity_cb, data);
- data->param_ref_list = qof_class_get_referenceList(GNC_ID_TRANS);
- qof_object_foreach(GNC_ID_TRANS, book, chart_reference_cb, data);
- g_list_free(data->param_ref_list);
- data->param_ref_list = qof_class_get_referenceList(GNC_ID_SPLIT);
- qof_object_foreach(GNC_ID_SPLIT, book, chart_reference_cb, data);
- g_list_free(data->param_ref_list);
- qof_session_save(chart_session, NULL);
- show_session_error(qof_session_get_error(chart_session),
- filename, GNC_FILE_DIALOG_EXPORT);
- qof_event_resume();
- gnc_unset_busy_cursor(NULL);
- }
- qof_session_end(chart_session);
- gnc_set_current_session(current_session);
-}
-
-void
-chart_export_response_cb (GtkDialog *dialog, gint response, gpointer user_data)
-{
- chart_data *data;
- data = (chart_data*)user_data;
- switch (response)
- {
- case GTK_RESPONSE_OK:
- gtk_widget_hide(data->dialog);
- on_dateok_clicked(data);
- break;
-
- default:
- /* do nothing */
- break;
- }
-
- gtk_widget_destroy(data->dialog);
- g_object_unref(data->xml);
- g_free(data);
-}
Deleted: gnucash/trunk/src/gnome/dialog-chart-export.h
===================================================================
--- gnucash/trunk/src/gnome/dialog-chart-export.h 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/dialog-chart-export.h 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,75 +0,0 @@
-/***************************************************************************
- * dialog-chart-export.h
- *
- * Sun Feb 27 14:19:21 2005
- * Copyright 2005 Neil Williams
- * linux at codehelp.co.uk
- ****************************************************************************/
-
-/*
- * 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef _DIALOG_CHART_EXPORT_H
-#define _DIALOG_CHART_EXPORT_H
-
-/** @addtogroup Import_Export
- @{
-*/
-/** @addtogroup ChartExport Export a chart of accounts.
-
-Remember to use qof_instance_copy routines
-like ::qof_instance_copy_to_session so that the QofBook is marked
-as \a partial.
-
-\par guidelines Guidelines for partial book export
--# When exporting GnuCash accounts into QSF, remember that there is no
- AccountGroup in the partial book, not even a root. Some account functions
- that you have used in full books will \b not work within a partial book.
--# Take special care with the book pointer. It is \b very easy to use a
- QofBook* pointer to a book in a different QofSession. Certain API functions
- also make assumptions about the current book - \b check carefully.
--# Remember that just because the function does not use books or AccountGroup
- itself, it does \b not follow that other functions called by the routine
- are also suitable. You may have to reimplement the body of certain functions.
--# Commodities are \b not supported. Most Account functions will use the
- commodity of the account, so be sure to set at least the ::gnc_default_currency().
-
- @{
-*/
-/** @file dialog-chart-export.h
- @brief Chart Export - Routines to export Chart of Accounts to file
- @author Copyright (C) 2005 Neil Williams <linux at codehelp.co.uk>
-*/
-
-/** \brief Export the Chart of Accounts to QSF
-
-Write out the Chart of Accounts \b with balances as of a
-specific date, as QSF.
-
-The function iterates over each account in the current book and
-gets the balance as of the specified date. The account is copied to
-the export session, setting the export session book as partial.
-The function then looks up the new entity in the export session
-book and sets the opening balance of the copied account.
-*/
-void
-gnc_main_window_chart_export(void);
-
-/** @} */
-/** @} */
-
-#endif /* _DIALOG_CHART_EXPORT_H */
Modified: gnucash/trunk/src/gnome/druid-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/druid-hierarchy.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/druid-hierarchy.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -34,7 +34,6 @@
#include "dialog-new-user.h"
#include "dialog-utils.h"
#include "druid-hierarchy.h"
-#include "druid-merge.h"
#include "druid-utils.h"
#include "gnc-amount-edit.h"
#include "gnc-currency-edit.h"
Deleted: gnucash/trunk/src/gnome/druid-merge.c
===================================================================
--- gnucash/trunk/src/gnome/druid-merge.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/druid-merge.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,400 +0,0 @@
-/********************************************************************\
- * druid-merge.c -- account hierarchy merge functionality *
- * Copyright (C) 2001 Gnumatic, Inc. *
- * Copyright (C) 2004 Neil Williams <linux at codehelp.co.uk> *
- * *
- * 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 <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "dialog-utils.h"
-#include "druid-merge.h"
-#include "druid-utils.h"
-#include "gnc-component-manager.h"
-#include "gnc-gui-query.h"
-#include "qof.h"
-#include "druid-hierarchy.h"
-#include "gnc-ui-util.h"
-#include "Account.h"
-
-GtkWidget *druid_hierarchy_window = NULL;
-static GtkWidget *qsf_import_merge_window = NULL;
-QofSession *previous_session = NULL;
-gint count = 0;
-QofBookMergeData *mergeData = NULL;
-QofSession *merge_session = NULL;
-QofBook *mergeBook = NULL;
-QofBook *targetBook = NULL;
-
-static QofLogModule log_module = GNC_QSF_IMPORT;
-
-void collision_rule_loop (QofBookMergeData*, QofBookMergeRule*, guint );
-
-static GtkWidget*
-merge_get_widget (const char *name)
-{
- if (!qsf_import_merge_window) return NULL;
-
- return gnc_glade_lookup_widget (qsf_import_merge_window, name);
-}
-
-static void
-delete_merge_window (void)
-{
- if (!qsf_import_merge_window) return;
-
- gtk_widget_destroy (qsf_import_merge_window);
- qsf_import_merge_window = NULL;
-}
-
-static void
-qof_book_merge_destroy_cb (GtkObject *obj, gpointer user_data)
-{
-}
-
-static gboolean
-on_import_start_page_next(GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- gpointer user_data)
-{
-
- return FALSE;
-}
-
-
-static void
-on_MergeUpdate_clicked (GtkButton *button,
- gpointer user_data)
-{
- GtkLabel *output;
-
- g_return_if_fail(mergeData != NULL);
- ENTER (" ");
- mergeData = qof_book_merge_update_result(mergeData, MERGE_UPDATE);
- count = 0;
- qof_book_merge_rule_foreach(mergeData, collision_rule_loop, MERGE_REPORT);
- if (count == 0)
- {
- output = GTK_LABEL(merge_get_widget("OutPut"));
- gtk_label_set_text(output, _("No conflicts to be resolved."));
- gtk_widget_show(GTK_WIDGET(output));
- }
- LEAVE (" ");
-}
-
-static void
-on_MergeDuplicate_clicked (GtkButton *button,
- gpointer user_data)
-{
- QofBookMergeRule *currentRule;
- GtkLabel *output;
-
- g_return_if_fail(mergeData != NULL);
- ENTER (" ");
- currentRule = mergeData->currentRule;
- if (currentRule->mergeAbsolute == FALSE)
- {
- mergeData = qof_book_merge_update_result(mergeData, MERGE_DUPLICATE);
- count = 0;
- }
- if (currentRule->mergeAbsolute == TRUE)
- {
- mergeData = qof_book_merge_update_result(mergeData, MERGE_ABSOLUTE);
- count = 0;
- }
- qof_book_merge_rule_foreach(mergeData, collision_rule_loop, MERGE_REPORT);
- if (count == 0)
- {
- output = GTK_LABEL(merge_get_widget("OutPut"));
- gtk_label_set_text(output, _("No conflicts to be resolved."));
- gtk_widget_show(GTK_WIDGET(output));
- }
- LEAVE (" ");
-}
-
-static void
-on_MergeNew_clicked (GtkButton *button,
- gpointer user_data)
-{
- QofBookMergeRule *currentRule;
- GtkLabel *output;
-
- g_return_if_fail(mergeData != NULL);
- currentRule = mergeData->currentRule;
- g_return_if_fail(currentRule != NULL);
- ENTER (" ");
- if (currentRule->mergeAbsolute == FALSE)
- {
- mergeData = qof_book_merge_update_result(mergeData, MERGE_NEW);
- }
- count = 0;
- qof_book_merge_rule_foreach(mergeData, collision_rule_loop, MERGE_REPORT);
- if (count == 0)
- {
- output = GTK_LABEL(merge_get_widget("OutPut"));
- gtk_label_set_text(output, _("No conflicts to be resolved."));
- gtk_widget_show(GTK_WIDGET(output));
- }
- LEAVE (" ");
-}
-
-static gboolean
-on_import_next (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- gpointer user_data)
-{
- GtkWidget *top;
- gchar *message;
-
- if (count > 0)
- {
- message = g_strdup_printf(_("Error: Please resolve all %d "
- "conflicts before trying to commit the data."), count);
- top = gtk_widget_get_toplevel (GTK_WIDGET (gnomedruidpage));
- gnc_error_dialog(top, "%s", message);
- g_free(message);
- return TRUE;
- }
- return FALSE;
-}
-
-static void
-on_merge_cancel (GnomeDruid *gnomedruid, gpointer user_data)
-{
- g_return_if_fail(mergeBook != NULL);
- gnc_suspend_gui_refresh ();
- delete_merge_window();
- qof_book_destroy(mergeBook);
- qof_session_end(merge_session);
- gnc_resume_gui_refresh ();
-}
-
-void currency_transfer_cb ( QofInstance* ent, gpointer user_data)
-{
- if (!ent) return;
- if (xaccAccountGetCommodity((Account*)ent) == NULL)
- {
- xaccAccountSetCommodity((Account*)ent, gnc_default_currency());
- }
-}
-
-/* If the account has no parent, shove it into the top level under the root. */
-void reference_parent_cb ( QofInstance* ent, gpointer user_data)
-{
- Account *root;
-
- if (!ent) return;
- if (gnc_account_get_parent((Account*)ent) == NULL)
- {
- root = gnc_book_get_root_account(targetBook);
- gnc_account_append_child(root, (Account*)ent);
- }
-}
-
-static void
-on_merge_finish (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- gpointer user_data)
-{
- gint result;
- GtkWidget *top;
- const char *message;
-
- ENTER (" ");
- g_return_if_fail(mergeData != NULL);
- gnc_suspend_gui_refresh ();
- result = qof_book_merge_commit(mergeData);
- if (result != 0)
- {
- message = g_strdup_printf(_("Error: the Commit operation failed, error code %d."), result);
- top = gtk_widget_get_toplevel (GTK_WIDGET (gnomedruidpage));
- gnc_error_dialog(top, "%s", message);
- }
- g_return_if_fail(result == 0);
- delete_merge_window ();
- qof_object_foreach(GNC_ID_ACCOUNT, targetBook, currency_transfer_cb, NULL);
- qof_object_foreach(GNC_ID_ACCOUNT, targetBook, reference_parent_cb, NULL);
- qof_book_destroy(mergeBook);
- qof_session_end(merge_session);
- gnc_resume_gui_refresh ();
- LEAVE (" ");
-}
-
-static void
-on_merge_prepare (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- gpointer user_data)
-{
- GtkLabel *progress, *output;
-
- gnc_suspend_gui_refresh ();
- ENTER (" ");
- progress = GTK_LABEL (merge_get_widget("ResultsBox"));
- /* blank out old data */
- gtk_label_set_text(progress, "");
- g_return_if_fail(mergeBook || targetBook);
- mergeData = qof_book_merge_init(mergeBook, targetBook);
- g_return_if_fail(mergeData != NULL);
- count = 0;
- qof_book_merge_rule_foreach(mergeData, collision_rule_loop, MERGE_REPORT);
- if (count == 0)
- {
- output = GTK_LABEL(merge_get_widget("OutPut"));
- gtk_label_set_text(output, _("No conflicts to be resolved."));
- gtk_widget_show(GTK_WIDGET(output));
- }
- gnc_resume_gui_refresh ();
- LEAVE (" ");
-}
-
-static GtkWidget *
-gnc_create_import_druid ( void )
-{
- GtkWidget *dialog, *druid, *start_page;
- GladeXML *xml;
-
- xml = gnc_glade_xml_new ("merge.glade", "Merge Druid");
-
- dialog = glade_xml_get_widget (xml, "Merge Druid");
- druid = glade_xml_get_widget (xml, "merge_druid");
- gnc_druid_set_colors (GNOME_DRUID (druid));
- start_page = glade_xml_get_widget (xml, "start_page");
- gtk_widget_show (start_page);
- gtk_widget_show (glade_xml_get_widget (xml, "MergeDruidFinishPage"));
-
- glade_xml_signal_connect(xml, "on_start_page_next",
- G_CALLBACK (on_import_start_page_next));
-
- glade_xml_signal_connect(xml, "on_qof_book_merge_prepare",
- G_CALLBACK (on_merge_prepare));
-
- glade_xml_signal_connect(xml, "on_qof_book_merge_next",
- G_CALLBACK (on_import_next));
-
- glade_xml_signal_connect (xml, "on_finish",
- G_CALLBACK (on_merge_finish));
-
- glade_xml_signal_connect (xml, "on_cancel",
- G_CALLBACK (on_merge_cancel));
-
- glade_xml_signal_connect (xml, "on_MergeUpdate_clicked",
- G_CALLBACK (on_MergeUpdate_clicked));
-
- glade_xml_signal_connect (xml, "on_MergeDuplicate_clicked",
- G_CALLBACK (on_MergeDuplicate_clicked));
-
- glade_xml_signal_connect (xml, "on_MergeNew_clicked",
- G_CALLBACK (on_MergeNew_clicked));
-
- g_signal_connect (dialog, "destroy",
- G_CALLBACK(qof_book_merge_destroy_cb), NULL);
- return dialog;
-}
-
-void collision_rule_loop(QofBookMergeData *mergeData, QofBookMergeRule *rule,
- guint remainder)
-{
- GSList *user_reports;
- QofParam *one_param;
- gchar *importstring, *targetstring;
- GtkLabel *output;
- gchar *buffer, *buffer2, *buffer3;
-
- g_return_if_fail(rule != NULL);
- buffer = "";
- /* there is a rule awaiting resolution, don't print any more */
- if (count > 0)
- {
- return;
- }
- ENTER (" remainder=%d", remainder);
- gnc_suspend_gui_refresh ();
- user_reports = rule->mergeParam;
- mergeData->currentRule = rule;
- output = GTK_LABEL(merge_get_widget("OutPut"));
- gtk_label_set_text(output, buffer);
- gtk_widget_show(GTK_WIDGET(output));
- gnc_resume_gui_refresh ();
- count = 1; /* user display text counts from 1, not zero */
- importstring = targetstring = NULL;
- gnc_suspend_gui_refresh ();
- /* Translators: %i is the number of conflicts. This is a
- ngettext(3) message. */
- buffer2 = g_strdup_printf(ngettext("%i conflict needs to be resolved.",
- "%i conflicts need to be resolved.",
- remainder),
- remainder);
- /* Translators: %i is the number of values. This is a
- ngettext(3) message. */
- buffer3 = g_strdup_printf(ngettext("%i parameter value for this \"%s\" object.",
- "%i parameter values for this \"%s\" object.",
- g_slist_length(user_reports)),
- g_slist_length(user_reports), rule->targetEnt->e_type);
- buffer = g_strconcat("\n", buffer2, "\n", "\n", buffer3, "\n", NULL);
- g_free(buffer2);
- g_free(buffer3);
- while (user_reports != NULL)
- {
- one_param = user_reports->data;
- /* FIXME: each g_strdup_printf as well as g_strconcat
- will allocate a new string; all of these need to be
- freed later. Currently this causes a lot of memory
- leaks. */
- buffer = g_strconcat(buffer, g_strdup_printf(_("%i: Parameter name: %s "),
- count, one_param->param_name), NULL);
- importstring = qof_book_merge_param_as_string(one_param, rule->importEnt);
- buffer = g_strconcat(buffer,
- g_strdup_printf(_("Import data : %s "), importstring), NULL);
- targetstring = qof_book_merge_param_as_string(one_param, rule->targetEnt);
- buffer = g_strconcat(buffer,
- g_strdup_printf(_("Original data : %s\n"), targetstring), NULL);
- user_reports = g_slist_next(user_reports);
- count++;
- }
- gtk_label_set_text(output, buffer);
- gtk_widget_show(GTK_WIDGET(output));
- gnc_resume_gui_refresh ();
- g_free(buffer);
- g_free(importstring);
- g_free(targetstring);
- LEAVE (" ");
-}
-
-void
-gnc_ui_qsf_import_merge_druid (QofSession *original, QofSession *import)
-{
- if (qsf_import_merge_window)
- {
- return;
- }
- qof_event_suspend ();
- qsf_import_merge_window = gnc_create_import_druid();
- g_return_if_fail(qsf_import_merge_window != NULL);
- previous_session = original;
- targetBook = qof_session_get_book(previous_session);
- merge_session = import;
- mergeBook = qof_session_get_book(merge_session);
- gtk_widget_show(qsf_import_merge_window);
-}
Deleted: gnucash/trunk/src/gnome/druid-merge.h
===================================================================
--- gnucash/trunk/src/gnome/druid-merge.h 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/druid-merge.h 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,90 +0,0 @@
-/********************************************************************\
- * druid-merge.h -- account hierarchy merge functionality *
- * Copyright (C) 2001 Gnumatic, Inc. *
- * Copyright (C) 2004 Neil Williams <linux at codehelp.co.uk> *
- * *
- * 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_MERGE_H
-#define DRUID_MERGE_H
-#include "qof.h"
-
-/** @addtogroup GUI
- @{ */
-/** @addtogroup NewHierarchy Merging a new account tree into an existing file
-
-<b>Collision handling principles.</b>\n
-\n
-This druid builds a second ::QofBook in memory using ::QofSession and
-populates the book with accounts created using the usual New Account Tree
-code. The druid then uses ::qof_book_merge_init to begin the merge
-of the new book (created with QofSession) with the existing QofBook
-(loaded by the user), with user intervention and collision handling.
-
- -# Always check for a ::GncGUID first and compare. qof_book_merge only accepts valid ::QofBook
- data and therefore ALL objects in the import book will include valid GncGUID's.
- -# If the original import data did not contain a GncGUID (e.g. an external non-GnuCash source)
- the GncGUID values will have been created by QofSession and will not match any existing
- GncGUID's in the target book so objects that do not have a GncGUID match cannot be assumed to
- be ::MERGE_NEW - parameter values must be checked.
-
-- If a GncGUID match exists, set QofBookMergeRule::mergeAbsolute to \a TRUE.
- -# If ALL parameters in the import object match the target object with the same \a GncGUID,
- set ::QofBookMergeResult to \a MERGE_ABSOLUTE.
- -# If any parameters differ, set ::MERGE_UPDATE.
-- If the import object \a GncGUID does not match an existing object,
-mergeAbsolute is unchanged from the default \a FALSE
-The parameter values of the object are compared to other objects of the same
-type in the target book.
- -# If the same data exists in the target book with a different GncGUID, the object
- is tagged as DUPLICATE.
- -# If the data has changed, the object is tagged as REPORT.
- -# If the data does not match, the object is tagged as NEW
-
-More information is at http://code.neil.williamsleesmill.me.uk/
-
-Each foreach function uses g_return_if_fail checks to protect the target book. If
-any essential data is missing, the loop returns without changing the target book.
-Note that this will not set or return an error value. However, g_return is only
-used for critical errors that arise from programming errors, not for invalid import data
-which should be cleaned up before creating the import QofBook.
-
-Only ::qof_book_merge_init, ::qof_book_merge_update_result and ::qof_book_merge_commit return
-any error values to the calling process.
-
- @{ */
-/** @file druid-merge.h
- @brief API for merging two \c QofBook* structures with collision handling
- @author Copyright (c) 2004 Neil Williams <linux at codehelp.co.uk>
-*/
-
-void gnc_ui_qsf_import_merge_druid(QofSession *original, QofSession *import);
-
-#define GNC_QSF_IMPORT "gnc-qsf-import-druid"
-
-/** \brief gncCommodity is not QOF enabled, need to set a default commodity before the merge */
-void currency_transfer_cb ( QofInstance* ent, gpointer user_data);
-
-/** \brief workaround for AccountGroup not being fully QOF enabled. Eh? */
-void reference_parent_cb ( QofInstance* ent, gpointer user_data);
-
-/** @} */
-/** @} */
-
-#endif
Modified: gnucash/trunk/src/gnome/glade/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/glade/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/glade/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -4,11 +4,9 @@
acctperiod.glade \
autoclear.glade \
budget.glade \
- chart-export.glade \
commodities.glade \
fincalc.glade \
lots.glade \
- merge.glade \
newuser.glade \
price.glade \
print.glade \
Deleted: gnucash/trunk/src/gnome/glade/chart-export.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/chart-export.glade 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/glade/chart-export.glade 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,245 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="chart-export">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Export Chart of Accounts</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="has_separator">False</property>
- <signal name="response" handler="chart_export_response_cb" last_modification_time="Mon, 23 Jan 2006 04:43:46 GMT"/>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="dateok">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Click to choose the filename and location.</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label">_Export</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="chartlabel">
- <property name="width_request">304</property>
- <property name="height_request">56</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">You can export the Chart of Accounts to a QSF XML file that can be imported into another GnuCash file or used in other programs.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_FILL</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.519999980927</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="chartnote">
- <property name="width_request">304</property>
- <property name="height_request">56</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">The Chart of Accounts includes the balance for each account, on the date specified. Note that future dates are not supported.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_FILL</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="processlabel">
- <property name="width_request">296</property>
- <property name="height_request">48</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select the date to use and click Export to choose the filename and location. Future dates are not supported.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_FILL</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCalendar" id="chart-calendar">
- <property name="width_request">215</property>
- <property name="height_request">180</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="display_options">GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
Deleted: gnucash/trunk/src/gnome/glade/merge.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/merge.glade 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/glade/merge.glade 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,296 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-<requires lib="gnome"/>
-
-<widget class="GtkWindow" id="Merge Druid">
- <property name="visible">True</property>
- <property name="title" translatable="yes">QSF Data Import Setup</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
-
- <child>
- <widget class="GnomeDruid" id="merge_druid">
- <property name="border_width">4</property>
- <property name="visible">True</property>
- <property name="show_help">False</property>
- <signal name="cancel" handler="on_cancel"/>
-
- <child>
- <widget class="GnomeDruidPageEdge" id="start_page">
- <property name="visible">True</property>
- <property name="position">GNOME_EDGE_START</property>
- <property name="title" translatable="yes">QSF Data Import Setup</property>
- <property name="text" translatable="yes">This assistant will merge your QSF data into the currently open GnuCash file.
-
-You will be asked how to proceed if some QSF data clashes with the your existing GnuCash data file.
-
-There is NO way to undo this operation! Please ensure you have a backup of your file BEFORE continuing! You will be given the option to cancel the merge at all stages until the final merge operation. Once you click Finish, the new QSF data will be committed to your current data file.
-
-There is currently no currency or price support in the merge operation, the new data will inherit any default currency or you can change the currency after the merge is complete.
-
-Your QSF data is ready to import
-
-Click 'Cancel' if you do not wish to merge your QSF data now.</property>
- <property name="title_color">#ffffffffffff</property>
- <property name="text_color">#000000000000</property>
- <property name="background_color">#191919197070</property>
- <property name="logo_background_color">#ffffffffffff</property>
- <property name="textbox_color">#ffffffffffff</property>
- <signal name="next" handler="on_start_page_next"/>
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageStandard" id="qof_book_merge">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Please resolve any conflicts in the merge</property>
- <property name="title_foreground">#ffffffffffff</property>
- <property name="background">#191919197070</property>
- <property name="logo_background">#ffffffffffff</property>
- <signal name="prepare" handler="on_qof_book_merge_prepare"/>
- <signal name="next" handler="on_qof_book_merge_next"/>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox6">
- <property name="border_width">16</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox105">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox121">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="ResultsBox">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox106">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow27">
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="border_width">5</property>
- <property name="height_request">51</property>
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Shows how your QSF data conflicts with existing data in your file.</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkLabel" id="OutPut">
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">MergeUpdate</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="Static">
- <property name="visible">True</property>
- <property name="label" translatable="yes">You have three choices for each collision:
-1. The import object can be allowed to overwrite the target - use this to update your existing book.
-2. The import object can be ignored - use this if the import is a duplicate of an object in the existing book.
-3. The import object can be created as a new object in the existing book.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_FILL</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MergeUpdate">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">overwrite the original with the import data</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="label" translatable="yes">1. Update your existing book with the import data</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_MergeUpdate_clicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MergeDuplicate">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">ignore the import, leave the original untouched</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">2. Ignore the import data, leave original unchanged</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_MergeDuplicate_clicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MergeNew">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Add the import as a new object, leave original in place</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">3. Import the data as a NEW object</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_MergeNew_clicked"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageEdge" id="MergeDruidFinishPage">
- <property name="visible">True</property>
- <property name="position">GNOME_EDGE_FINISH</property>
- <property name="title" translatable="yes">Commit QSF Import Data to data file</property>
- <property name="text" translatable="yes">Press `Apply' to merge your QSF data into the current GnuCash file.
-
-Press `Back' to review your selections.
-
-Press `Cancel' to close this dialog without changing your current data file.
-
-REMEMBER: There is no way to undo this final operation! Make sure you have a backup before clicking 'Apply'.</property>
- <property name="title_color">#ffffffffffff</property>
- <property name="text_color">#000000000000</property>
- <property name="background_color">#191919197070</property>
- <property name="logo_background_color">#ffffffffffff</property>
- <property name="textbox_color">#ffffffffffff</property>
- <signal name="finish" handler="on_finish"/>
- </widget>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
Modified: gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome/gnc-plugin-basic-commands.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -40,7 +40,6 @@
#include "gnc-ui-util.h"
#include "dialog-book-close.h"
-#include "dialog-chart-export.h"
#include "dialog-file-access.h"
#include "dialog-fincalc.h"
#include "dialog-find-transactions.h"
@@ -48,7 +47,6 @@
#include "dialog-totd.h"
#include "druid-acct-period.h"
#include "druid-loan.h"
-#include "druid-merge.h"
#include "gnc-engine.h"
#include "gnc-file.h"
#include "gnc-gui-query.h"
@@ -72,9 +70,7 @@
static void gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindowActionData *data);
-static void gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data);
-static void gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_actions_mortgage_loan (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_actions_scheduled_transaction_editor (GtkAction *action, GncMainWindowActionData *data);
@@ -119,26 +115,12 @@
NULL,
G_CALLBACK (gnc_main_window_cmd_file_save_as)
},
-#ifdef QSF_IMPORT_WORKS
{
- "FileImportQSFAction", GTK_STOCK_CONVERT,
- N_("_QSF Import"), NULL,
- N_("Import a QSF object file"),
- G_CALLBACK (gnc_main_window_cmd_file_qsf_import)
- },
-#endif // QSF_IMPORT_WORKS
- {
"FileExportAccountsAction", GTK_STOCK_CONVERT,
N_("Export _Accounts"), NULL,
N_("Export the account hierarchy to a new GnuCash datafile"),
G_CALLBACK (gnc_main_window_cmd_file_export_accounts)
},
- {
- "FileExportChartAction", GTK_STOCK_CONVERT,
- N_("Export _Chart of Accounts to QSF"), NULL,
- N_("Export the chart of accounts for a date with balances as QSF"),
- G_CALLBACK (gnc_main_window_cmd_file_chart_export)
- },
/* Edit menu */
@@ -440,62 +422,6 @@
}
static void
-qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs )
-{
- QofSession *qsf_session, *first_session;
- const gchar *filename, *message, *error_message;
- QofBook *original;
- QofBackendError err;
-
- ENTER (" ");
- qof_event_suspend();
- filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION (fs));
- gtk_widget_destroy((GtkWidget*) fs);
- first_session = gnc_get_current_session();
- original = qof_session_get_book(first_session);
- qsf_session = qof_session_new();
- qof_session_begin(qsf_session, filename, TRUE, FALSE);
- qof_session_load(qsf_session, NULL);
- err = qof_session_get_error(qsf_session);
- if (err != ERR_BACKEND_NO_ERR)
- {
- error_message = qof_session_get_error_message(qsf_session);
- if (!error_message)
- error_message = "";
- /* Translators: %d is the error number; %s is the error message as
- text. */
- message = g_strdup_printf(_("Error: Loading failed, error code %d - %s."), err, error_message);
- PERR("%s", message);
- qof_session_destroy(qsf_session);
- qof_event_resume();
- gnc_error_dialog(gnc_ui_get_toplevel(), "%s", message);
- LEAVE (" ");
- return;
- }
-
- qof_event_resume();
- gnc_ui_qsf_import_merge_druid(first_session, qsf_session);
- LEAVE (" ");
-}
-
-static void
-gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindowActionData *data)
-{
- GtkWidget *file_select;
-
- g_return_if_fail (data != NULL);
-
- gnc_window_set_progressbar_window(GNC_WINDOW(data->window));
- file_select = gtk_file_selection_new(_("Select the QSF file to import into GnuCash"));
- g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_select)->ok_button),
- "clicked", G_CALLBACK (qsf_file_select_ok), (gpointer) file_select);
- g_signal_connect_swapped (G_OBJECT (GTK_FILE_SELECTION (file_select)->cancel_button),
- "clicked", G_CALLBACK (gtk_widget_destroy), G_OBJECT (file_select));
- gtk_widget_show (file_select);
- gnc_window_set_progressbar_window(NULL);
-}
-
-static void
gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindowActionData *data)
{
g_return_if_fail (data != NULL);
@@ -508,18 +434,6 @@
}
static void
-gnc_main_window_cmd_file_chart_export (GtkAction *action, GncMainWindowActionData *data)
-{
- g_return_if_fail (data != NULL);
-
- gnc_window_set_progressbar_window (GNC_WINDOW(data->window));
- gnc_main_window_chart_export();
- gnc_window_set_progressbar_window (NULL);
- /* FIXME GNOME 2 Port (update the title etc.) */
- /* gnc_refresh_main_window_info (); */
-}
-
-static void
gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindowActionData *data)
{
g_return_if_fail (data != NULL);
Modified: gnucash/trunk/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/gnome-utils/gnc-file.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -332,79 +332,6 @@
gnc_error_dialog (parent, fmt, newfile);
break;
- /* QSF additions */
- case ERR_QSF_INVALID_OBJ:
- fmt = _("Invalid QSF Object file! The QSF object file %s failed to"
- " validate against the QSF object schema. The XML structure of"
- " the file is either not well-formed or contains illegal data.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_INVALID_MAP:
- fmt = _("Invalid QSF Map file! The QSF map file %s failed to validate"
- " against the QSF map schema. The XML structure of the file"
- " is either not well-formed or contains illegal data.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_BAD_QOF_VERSION:
- fmt = _("The QSF Map file %s was written for a different version of"
- " QOF. It may need to be modified to work with your current"
- " QOF installation.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_BAD_MAP:
- fmt = _("The selected QSF map %s contains unusable data. "
- "This is usually because not all the required parameters for "
- "the defined objects have calculations described in the map.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_BAD_OBJ_GUID:
- fmt = _("The selected QSF object file %s contains one or more invalid "
- "GUIDs. The file cannot be processed - please check the source "
- "of the file and try again.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_NO_MAP:
- fmt = _("The selected QSF Object file %s requires a map but it was "
- "not provided.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_WRONG_MAP:
- fmt = _("Wrong QSF map selected. The selected map %s validates but was "
- "written for different QOF objects. The list of objects defined "
- "in this map does not include all the objects described in "
- "the current QSF object file.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_MAP_NOT_OBJ:
- fmt = _("The selected file %s is a QSF map and cannot be "
- "opened as a QSF object.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_OVERFLOW:
- fmt = _("When converting XML strings into numbers, an overflow "
- "has been detected. The QSF object file %s contains invalid "
- "data in a field that is meant to hold a number.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
- case ERR_QSF_OPEN_NOT_MERGE:
- fmt = _("The QSF object file %s is valid and contains GnuCash "
- "objects. However, GnuCash cannot open the file directly because "
- "the data needs to be merged into an existing GnuCash data book. "
- "Please open a GnuCash file or create a new one, then import "
- "this QSF object file so that the data can be merged into the "
- "main data book.");
- gnc_error_dialog(parent, fmt, newfile);
- break;
-
case ERR_FILEIO_FILE_BAD_READ:
fmt = _("There was an error reading the file. "
"Do you want to continue?");
@@ -776,10 +703,6 @@
gnc_file_new ();
}
}
- if (ERR_QSF_OPEN_NOT_MERGE == io_err)
- {
- uh_oh = TRUE;
- }
/* if the database doesn't exist, ask the user ... */
else if ((ERR_BACKEND_NO_SUCH_DB == io_err) ||
(ERR_SQL_DB_TOO_OLD == io_err))
Modified: gnucash/trunk/src/libqof/Makefile.am
===================================================================
--- gnucash/trunk/src/libqof/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,2 +1,2 @@
-SUBDIRS = . qof backend
+SUBDIRS = . qof
Modified: gnucash/trunk/src/libqof/qof/qof.h
===================================================================
--- gnucash/trunk/src/libqof/qof/qof.h 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qof.h 2010-05-04 14:15:38 UTC (rev 19099)
@@ -97,9 +97,4 @@
#include "qofbookmerge.h"
#include "qofreference.h"
-/** allow easy logging of QSF debug messages */
-#define QOF_MOD_QSF "qof.backend.qsf"
-/** allow easy loading of the QSF backend */
-#define QSF_BACKEND_LIB "gncqof-backend-qsf"
-
#endif /* QOF_H_ */
Modified: gnucash/trunk/src/libqof/qof/qofbackend.h
===================================================================
--- gnucash/trunk/src/libqof/qof/qofbackend.h 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qofbackend.h 2010-05-04 14:15:38 UTC (rev 19099)
@@ -75,37 +75,13 @@
another user has deleted the object */
ERR_BACKEND_MISC, /**< undetermined error */
- /* QSF add-ons */
- ERR_QSF_INVALID_OBJ, /**< The QSF object failed to validate against the QSF object schema */
- ERR_QSF_INVALID_MAP, /**< The QSF map failed to validate against the QSF map schema */
- ERR_QSF_BAD_OBJ_GUID, /**< The QSF object contains one or more invalid GUIDs. */
- ERR_QSF_BAD_QOF_VERSION, /**< QSF map or object doesn't match the current QOF_OBJECT_VERSION. */
- ERR_QSF_BAD_MAP, /**< The selected map validates but is unusable.
+ ERR_QOF_OVERFLOW, /**< EOVERFLOW - generated by strtol or strtoll.
- This is usually because not all the required parameters for the defined objects
- have calculations described in the map.
- */
- ERR_QSF_NO_MAP, /**< The QSF object file was loaded without a map
-
- The QSF Object file requires a map but it was not provided.
- */
- ERR_QSF_WRONG_MAP, /**< The selected map validates but is for different objects.
-
- The list of objects defined in this map does not include all the objects described in
- the current QSF object file.
- */
- ERR_QSF_MAP_NOT_OBJ, /**< Selected file is a QSF map and cannot be opened as a QSF object */
- ERR_QSF_OVERFLOW, /**< EOVERFLOW - generated by strtol or strtoll.
-
When converting XML strings into numbers, an overflow has been detected. The XML file
contains invalid data in a field that is meant to hold a signed long integer or signed long long
integer.
*/
- ERR_QSF_OPEN_NOT_MERGE, /** QSF files cannot be opened alone. The data must be merged.
- This error is more of a warning that can be ignored by any routine
- that uses qof_book_merge on the new session.
- */
/* fileio errors */
ERR_FILEIO_FILE_BAD_READ = 1000, /**< read failed or file prematurely truncated */
ERR_FILEIO_FILE_EMPTY, /**< file exists, is readable, but is empty */
Modified: gnucash/trunk/src/libqof/qof/qofchoice.h
===================================================================
--- gnucash/trunk/src/libqof/qof/qofchoice.h 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qofchoice.h 2010-05-04 14:15:38 UTC (rev 19099)
@@ -54,8 +54,8 @@
\verbatim
QOF_TYPE_CHOICE<QOF_X, QOF_Y, QOF_Z>
\endverbatim
-It holds a single entity of type X, Y, or Z for the purposes of QOF
-or ::QSF. For querying the object it queries as if it's an X, Y, or Z.
+It holds a single entity of type X, Y, or Z for the purposes of QOF.
+For querying the object it queries as if it's an X, Y, or Z.
Each choice type has it's own definition of the allowable objects -
each of which need to be registered as normal. Objects can declare
Modified: gnucash/trunk/src/libqof/qof/qofsession.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofsession.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qofsession.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1011,7 +1011,6 @@
and use JUST the module name without .so - .so is not portable! */
struct backend_providers backend_list[] =
{
- { QOF_LIB_DIR, QSF_BACKEND_LIB },
#ifdef HAVE_DWI
{ QOF_LIB_DIR, "libqof_backend_dwi"},
#endif
Modified: gnucash/trunk/src/libqof/qof/qofsession.h
===================================================================
--- gnucash/trunk/src/libqof/qof/qofsession.h 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qofsession.h 2010-05-04 14:15:38 UTC (rev 19099)
@@ -120,10 +120,9 @@
/** The qof_session_begin () method begins a new session.
* It takes as an argument the book id. The book id must be a string
* in the form of a URI/URL. The access method specified depends
- * on the loaded backends. In the absence of a customised backend,
- * only QSF XML would be accepted). Paths may be relative or absolute.
- * If the path is relative; that is, if the argument is "file:somefile.xml"
- * then the current working directory is assumed. Customised backends can
+ * on the loaded backends. Paths may be relative or absolute.
+ * If the path is relative; that is, if the argument is "file://somefile.xml"
+ * then the current working directory is assumed. Customized backends can
* choose to search other, application-specific, directories as well.
*
* The 'ignore_lock' argument, if set to TRUE, will cause this routine
Modified: gnucash/trunk/src/libqof/qof/qofsql.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofsql.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qofsql.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -655,17 +655,6 @@
LEAVE (" string to guid failed for %s", insert_string);
return;
}
- /* reference_type = xmlGetProp(node, QSF_OBJECT_TYPE);
- if(0 == safe_strcmp(QOF_PARAM_GUID, reference_type))
- {
- qof_instance_set_guid(qsf_ent, cm_guid);
- }
- else {
- reference = qof_instance_get_reference_from(qsf_ent, cm_param);
- if(reference) {
- params->referenceList = g_list_append(params->referenceList, reference);
- }
- }*/
}
if (safe_strcmp(param->param_type, QOF_TYPE_INT32) == 0)
{
@@ -686,7 +675,7 @@
book = qof_instance_get_book((QofInstance*)ent);
backend = qof_book_get_backend(book);
- qof_backend_set_error(backend, ERR_QSF_OVERFLOW);
+ qof_backend_set_error(backend, ERR_QOF_OVERFLOW);
}
}
if (safe_strcmp(param->param_type, QOF_TYPE_INT64) == 0)
@@ -708,7 +697,7 @@
book = qof_instance_get_book((QofInstance*)ent);
backend = qof_book_get_backend(book);
- qof_backend_set_error(backend, ERR_QSF_OVERFLOW);
+ qof_backend_set_error(backend, ERR_QOF_OVERFLOW);
}
}
if (safe_strcmp(param->param_type, QOF_TYPE_DOUBLE) == 0)
Modified: gnucash/trunk/src/libqof/qof/qofutil.c
===================================================================
--- gnucash/trunk/src/libqof/qof/qofutil.c 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/libqof/qof/qofutil.c 2010-05-04 14:15:38 UTC (rev 19099)
@@ -413,7 +413,6 @@
{
boolean_getter = (gboolean (*)(QofInstance*, QofParam*)) param->param_getfcn;
param_boolean = boolean_getter(ent, param);
- /* Boolean values need to be lowercase for QSF validation. */
if (param_boolean == TRUE)
{
param_string = g_strdup("true");
Modified: gnucash/trunk/src/optional/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/Makefile.am 2010-05-04 09:45:50 UTC (rev 19098)
+++ gnucash/trunk/src/optional/Makefile.am 2010-05-04 14:15:38 UTC (rev 19099)
@@ -1,2 +1,2 @@
-SUBDIRS = xsl ${PYTHON_DIR}
-DIST_SUBDIRS = xsl python-bindings
+SUBDIRS = ${PYTHON_DIR}
+DIST_SUBDIRS = python-bindings
More information about the gnucash-changes
mailing list