r15565 - gnucash/branches/remove-group2 - Sync changes 15253:15563 into the branch.
David Hampton
hampton at cvs.gnucash.org
Sun Feb 11 14:55:29 EST 2007
Author: hampton
Date: 2007-02-11 14:54:51 -0500 (Sun, 11 Feb 2007)
New Revision: 15565
Trac: http://svn.gnucash.org/trac/changeset/15565
Added:
gnucash/branches/remove-group2/ChangeLog.2006
gnucash/branches/remove-group2/accounts/fr_CA/
gnucash/branches/remove-group2/lib/glib28/
gnucash/branches/remove-group2/lib/libc/pow.h
gnucash/branches/remove-group2/packaging/win32/exetype.pl
gnucash/branches/remove-group2/packaging/win32/libofx-0.8.3-patch.diff
gnucash/branches/remove-group2/packaging/win32/opensp-1.5.2-patch.diff
gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.c
gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.h
gnucash/branches/remove-group2/src/app-utils/test/test-sx.c
gnucash/branches/remove-group2/src/business/business-core/gncmod-business-core.c
gnucash/branches/remove-group2/src/business/business-gnome/gncmod-business-gnome.c
gnucash/branches/remove-group2/src/doc/sx.rst
gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-model.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-model.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-store.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-store.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h
gnucash/branches/remove-group2/src/gnome-utils/test/test-sx.c
gnucash/branches/remove-group2/src/gnome/dialog-sx-editor.c
gnucash/branches/remove-group2/src/gnome/dialog-sx-editor.h
gnucash/branches/remove-group2/src/gnome/dialog-sx-since-last-run.c
gnucash/branches/remove-group2/src/gnome/dialog-sx-since-last-run.h
gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-sx-list.c
gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-sx-list.h
gnucash/branches/remove-group2/src/gnome/gnc-sx-list-tree-model-adapter.c
gnucash/branches/remove-group2/src/gnome/gnc-sx-list-tree-model-adapter.h
gnucash/branches/remove-group2/src/gnome/ui/gnc-plugin-page-sx-list-ui.xml
Removed:
gnucash/branches/remove-group2/gnucash-config.in
gnucash/branches/remove-group2/gnucash.m4
gnucash/branches/remove-group2/lib/glib26/
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h
gnucash/branches/remove-group2/src/business/business-core/businessmod-core.c
gnucash/branches/remove-group2/src/business/business-gnome/businessmod-gnome.c
gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.c
gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.h
gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.c
gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.h
gnucash/branches/remove-group2/src/gtk-compat.h
Modified:
gnucash/branches/remove-group2/
gnucash/branches/remove-group2/ChangeLog
gnucash/branches/remove-group2/Makefile.am
gnucash/branches/remove-group2/README.dependencies
gnucash/branches/remove-group2/accounts/Makefile.am
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_automobile.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_basecommune.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_chequier.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_courtage.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_garderie.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_locataire.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_retraite.gnucash-xea
gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_revenus.gnucash-xea
gnucash/branches/remove-group2/autogen.sh
gnucash/branches/remove-group2/configure.in
gnucash/branches/remove-group2/doc/README.dependencies
gnucash/branches/remove-group2/goffice-config.h.in
gnucash/branches/remove-group2/gsf-config.h.in
gnucash/branches/remove-group2/lib/Makefile.am
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c
gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
gnucash/branches/remove-group2/lib/libc/Makefile.am
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c
gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c
gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am
gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c
gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am
gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c
gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h
gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c
gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h
gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c
gnucash/branches/remove-group2/lib/libqof/qof/guid.c
gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h
gnucash/branches/remove-group2/lib/libqof/qof/qof.h
gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c
gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h
gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h
gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h
gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h
gnucash/branches/remove-group2/lib/libqof/qof/qofid.h
gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c
gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h
gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c
gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h
gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c
gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h
gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h
gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c
gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c
gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h
gnucash/branches/remove-group2/macros/ac_pkg_swig.m4
gnucash/branches/remove-group2/macros/binreloc.m4
gnucash/branches/remove-group2/packaging/gnucash.spec.in
gnucash/branches/remove-group2/packaging/win32/README
gnucash/branches/remove-group2/packaging/win32/custom.sh
gnucash/branches/remove-group2/packaging/win32/dist.sh
gnucash/branches/remove-group2/packaging/win32/functions
gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in
gnucash/branches/remove-group2/packaging/win32/install.sh
gnucash/branches/remove-group2/packaging/win32/reset.sh
gnucash/branches/remove-group2/po/de.po
gnucash/branches/remove-group2/src/Makefile.am
gnucash/branches/remove-group2/src/app-utils/Makefile.am
gnucash/branches/remove-group2/src/app-utils/file-utils.c
gnucash/branches/remove-group2/src/app-utils/file-utils.h
gnucash/branches/remove-group2/src/app-utils/gfec.c
gnucash/branches/remove-group2/src/app-utils/gnc-ui-util.c
gnucash/branches/remove-group2/src/app-utils/gncmod-app-utils.c
gnucash/branches/remove-group2/src/app-utils/prefs.scm
gnucash/branches/remove-group2/src/app-utils/test/
gnucash/branches/remove-group2/src/app-utils/test/Makefile.am
gnucash/branches/remove-group2/src/app-utils/test/test-exp-parser.c
gnucash/branches/remove-group2/src/app-utils/test/test-load-module
gnucash/branches/remove-group2/src/backend/file/Makefile.am
gnucash/branches/remove-group2/src/backend/file/gnc-account-xml-v2.c
gnucash/branches/remove-group2/src/backend/file/gnc-backend-file.c
gnucash/branches/remove-group2/src/backend/file/gnc-lot-xml-v2.c
gnucash/branches/remove-group2/src/backend/file/gnc-schedxaction-xml-v2.c
gnucash/branches/remove-group2/src/backend/file/gncmod-backend-file.c
gnucash/branches/remove-group2/src/backend/file/io-example-account.c
gnucash/branches/remove-group2/src/backend/file/io-gncxml-v2.c
gnucash/branches/remove-group2/src/backend/file/sixtp-dom-parsers.c
gnucash/branches/remove-group2/src/backend/file/sixtp-utils.c
gnucash/branches/remove-group2/src/backend/file/sixtp.c
gnucash/branches/remove-group2/src/backend/file/test/Makefile.am
gnucash/branches/remove-group2/src/backend/file/test/test-dom-parser1.c
gnucash/branches/remove-group2/src/backend/file/test/test-file-stuff.c
gnucash/branches/remove-group2/src/backend/file/test/test-kvp-frames.c
gnucash/branches/remove-group2/src/backend/file/test/test-load-backend.c
gnucash/branches/remove-group2/src/backend/file/test/test-load-example-account.c
gnucash/branches/remove-group2/src/backend/file/test/test-load-xml2.c
gnucash/branches/remove-group2/src/backend/file/test/test-save-in-lang.c
gnucash/branches/remove-group2/src/backend/file/test/test-string-converters.c
gnucash/branches/remove-group2/src/backend/file/test/test-xml-account.c
gnucash/branches/remove-group2/src/backend/file/test/test-xml-commodity.c
gnucash/branches/remove-group2/src/backend/file/test/test-xml-pricedb.c
gnucash/branches/remove-group2/src/backend/file/test/test-xml-transaction.c
gnucash/branches/remove-group2/src/backend/file/test/test-xml2-is-file.c
gnucash/branches/remove-group2/src/backend/postgres/Makefile.am
gnucash/branches/remove-group2/src/backend/postgres/PostgresBackend.c
gnucash/branches/remove-group2/src/backend/postgres/checkpoint.c
gnucash/branches/remove-group2/src/backend/postgres/test/Makefile.am
gnucash/branches/remove-group2/src/backend/postgres/test/test-db.c
gnucash/branches/remove-group2/src/backend/postgres/test/test-period.c
gnucash/branches/remove-group2/src/bin/Makefile.am
gnucash/branches/remove-group2/src/bin/gnucash-bin.c
gnucash/branches/remove-group2/src/bin/gnucash-valgrind.in
gnucash/branches/remove-group2/src/bin/gnucash.in
gnucash/branches/remove-group2/src/bin/overrides/Makefile.am
gnucash/branches/remove-group2/src/bin/overrides/gnucash-build-env.in
gnucash/branches/remove-group2/src/bin/overrides/gnucash-env.in
gnucash/branches/remove-group2/src/bin/test/Makefile.am
gnucash/branches/remove-group2/src/business/business-core/Makefile.am
gnucash/branches/remove-group2/src/business/business-core/file/Makefile.am
gnucash/branches/remove-group2/src/business/business-core/file/gncmod-business-backend-file.c
gnucash/branches/remove-group2/src/business/business-core/test/Makefile.am
gnucash/branches/remove-group2/src/business/business-core/test/test-customer.c
gnucash/branches/remove-group2/src/business/business-core/test/test-employee.c
gnucash/branches/remove-group2/src/business/business-core/test/test-job.c
gnucash/branches/remove-group2/src/business/business-core/test/test-vendor.c
gnucash/branches/remove-group2/src/business/business-gnome/Makefile.am
gnucash/branches/remove-group2/src/business/business-gnome/dialog-invoice.c
gnucash/branches/remove-group2/src/business/business-gnome/glade/billterms.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/businessprefs.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/choose-owner.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/customer.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/date-close.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/employee.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/invoice.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/job.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/order.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/payment.glade
gnucash/branches/remove-group2/src/business/business-gnome/glade/vendor.glade
gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-business.c
gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-page-invoice.c
gnucash/branches/remove-group2/src/business/business-gnome/search-owner.c
gnucash/branches/remove-group2/src/business/business-gnome/search-owner.h
gnucash/branches/remove-group2/src/business/business-ledger/Makefile.am
gnucash/branches/remove-group2/src/business/business-reports/Makefile.am
gnucash/branches/remove-group2/src/business/business-reports/aging.scm
gnucash/branches/remove-group2/src/business/business-reports/easy-invoice.scm
gnucash/branches/remove-group2/src/business/business-reports/fancy-invoice.scm
gnucash/branches/remove-group2/src/business/business-reports/invoice.scm
gnucash/branches/remove-group2/src/business/business-utils/Makefile.am
gnucash/branches/remove-group2/src/business/business-utils/gncmod-business-utils.c
gnucash/branches/remove-group2/src/business/dialog-tax-table/Makefile.am
gnucash/branches/remove-group2/src/business/dialog-tax-table/gncmod-dialog-tax-table.c
gnucash/branches/remove-group2/src/business/dialog-tax-table/tax-tables.glade
gnucash/branches/remove-group2/src/calculation/Makefile.am
gnucash/branches/remove-group2/src/calculation/fin.c
gnucash/branches/remove-group2/src/calculation/gncmod-calculation.c
gnucash/branches/remove-group2/src/calculation/test/Makefile.am
gnucash/branches/remove-group2/src/core-utils/Makefile.am
gnucash/branches/remove-group2/src/core-utils/core-utils.scm
gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.c
gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.h
gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.c
gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.h
gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.c
gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.h
gnucash/branches/remove-group2/src/doc/loans.txt
gnucash/branches/remove-group2/src/doc/xml/gnucash-v2.rnc
gnucash/branches/remove-group2/src/engine/FreqSpec.c
gnucash/branches/remove-group2/src/engine/Makefile.am
gnucash/branches/remove-group2/src/engine/SX-book-p.h
gnucash/branches/remove-group2/src/engine/SX-book.c
gnucash/branches/remove-group2/src/engine/SX-book.h
gnucash/branches/remove-group2/src/engine/SchedXaction.c
gnucash/branches/remove-group2/src/engine/SchedXaction.h
gnucash/branches/remove-group2/src/engine/SchedXactionP.h
gnucash/branches/remove-group2/src/engine/Split.c
gnucash/branches/remove-group2/src/engine/TransLog.c
gnucash/branches/remove-group2/src/engine/gnc-commodity.c
gnucash/branches/remove-group2/src/engine/gnc-engine.c
gnucash/branches/remove-group2/src/engine/gnc-engine.h
gnucash/branches/remove-group2/src/engine/gnc-filepath-utils.c
gnucash/branches/remove-group2/src/engine/gnc-hooks.c
gnucash/branches/remove-group2/src/engine/gncmod-engine.c
gnucash/branches/remove-group2/src/engine/iso-4217-currencies.scm
gnucash/branches/remove-group2/src/engine/test-core/Makefile.am
gnucash/branches/remove-group2/src/engine/test-core/gncmod-test-engine.c
gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.c
gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.h
gnucash/branches/remove-group2/src/engine/test/Makefile.am
gnucash/branches/remove-group2/src/engine/test/test-book-merge.c
gnucash/branches/remove-group2/src/engine/test/test-commodities.c
gnucash/branches/remove-group2/src/engine/test/test-freq-spec.c
gnucash/branches/remove-group2/src/engine/test/test-group-vs-book.c
gnucash/branches/remove-group2/src/engine/test/test-guid.c
gnucash/branches/remove-group2/src/engine/test/test-load-engine.c
gnucash/branches/remove-group2/src/engine/test/test-lots.c
gnucash/branches/remove-group2/src/engine/test/test-numeric.c
gnucash/branches/remove-group2/src/engine/test/test-object.c
gnucash/branches/remove-group2/src/engine/test/test-period.c
gnucash/branches/remove-group2/src/engine/test/test-query.c
gnucash/branches/remove-group2/src/engine/test/test-querynew.c
gnucash/branches/remove-group2/src/engine/test/test-recurrence.c
gnucash/branches/remove-group2/src/engine/test/test-resolve-file-path.c
gnucash/branches/remove-group2/src/engine/test/test-split-vs-account.c
gnucash/branches/remove-group2/src/engine/test/test-transaction-reversal.c
gnucash/branches/remove-group2/src/engine/test/test-transaction-voiding.c
gnucash/branches/remove-group2/src/gnc-module/Makefile.am
gnucash/branches/remove-group2/src/gnc-module/gnc-module.c
gnucash/branches/remove-group2/src/gnc-module/gnc-module.scm
gnucash/branches/remove-group2/src/gnc-module/test/Makefile.am
gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/Makefile.am
gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/agedver.c
gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/futuremodsys.c
gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/incompatdep.c
gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/Makefile.am
gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/gnc-mod-bar.c
gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/Makefile.am
gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/gnc-mod-baz.c
gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/Makefile.am
gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/gnc-mod-foo.c
gnucash/branches/remove-group2/src/gnc-module/test/test-dynload.c
gnucash/branches/remove-group2/src/gnc-module/test/test-scm-dynload
gnucash/branches/remove-group2/src/gnc-test-env
gnucash/branches/remove-group2/src/gnome-search/Makefile.am
gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.c
gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.h
gnucash/branches/remove-group2/src/gnome-search/gncmod-gnome-search.c
gnucash/branches/remove-group2/src/gnome-search/search-account.c
gnucash/branches/remove-group2/src/gnome-search/search-account.h
gnucash/branches/remove-group2/src/gnome-search/search-boolean.c
gnucash/branches/remove-group2/src/gnome-search/search-boolean.h
gnucash/branches/remove-group2/src/gnome-search/search-date.c
gnucash/branches/remove-group2/src/gnome-search/search-date.h
gnucash/branches/remove-group2/src/gnome-search/search-double.c
gnucash/branches/remove-group2/src/gnome-search/search-double.h
gnucash/branches/remove-group2/src/gnome-search/search-int64.c
gnucash/branches/remove-group2/src/gnome-search/search-int64.h
gnucash/branches/remove-group2/src/gnome-search/search-numeric.c
gnucash/branches/remove-group2/src/gnome-search/search-numeric.h
gnucash/branches/remove-group2/src/gnome-search/search-reconciled.c
gnucash/branches/remove-group2/src/gnome-search/search-reconciled.h
gnucash/branches/remove-group2/src/gnome-search/search-string.c
gnucash/branches/remove-group2/src/gnome-search/search-string.h
gnucash/branches/remove-group2/src/gnome-search/search.glade
gnucash/branches/remove-group2/src/gnome-utils/Makefile.am
gnucash/branches/remove-group2/src/gnome-utils/dialog-account.c
gnucash/branches/remove-group2/src/gnome-utils/dialog-options.c
gnucash/branches/remove-group2/src/gnome-utils/dialog-preferences.c
gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.c
gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.h
gnucash/branches/remove-group2/src/gnome-utils/druid-gconf-setup.c
gnucash/branches/remove-group2/src/gnome-utils/glade/commodity.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-query-list.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-reset-warnings.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gconf-setup.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gnc-xml-import.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/druid-provider-multifile.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/exchange-dialog.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-date-format.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-gui-query.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/preferences.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/totd.glade
gnucash/branches/remove-group2/src/gnome-utils/glade/transfer.glade
gnucash/branches/remove-group2/src/gnome-utils/gnc-date-edit.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-embedded-window.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-file.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-html-graph-gog.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-html.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-main-window.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-file-history.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-page.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.h
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-account.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-commodity.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-selection.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-account.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-commodity.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-price.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.c
gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.h
gnucash/branches/remove-group2/src/gnome-utils/gncmod-gnome-utils.c
gnucash/branches/remove-group2/src/gnome-utils/gnctreemodelsort.c
gnucash/branches/remove-group2/src/gnome-utils/test/
gnucash/branches/remove-group2/src/gnome-utils/test/Makefile.am
gnucash/branches/remove-group2/src/gnome-utils/window-main-summarybar.c
gnucash/branches/remove-group2/src/gnome/Makefile.am
gnucash/branches/remove-group2/src/gnome/dialog-chart-export.c
gnucash/branches/remove-group2/src/gnome/dialog-new-user.c
gnucash/branches/remove-group2/src/gnome/dialog-sx-from-trans.c
gnucash/branches/remove-group2/src/gnome/druid-acct-period.c
gnucash/branches/remove-group2/src/gnome/druid-hierarchy.c
gnucash/branches/remove-group2/src/gnome/druid-loan.c
gnucash/branches/remove-group2/src/gnome/glade/account.glade
gnucash/branches/remove-group2/src/gnome/glade/acctperiod.glade
gnucash/branches/remove-group2/src/gnome/glade/budget.glade
gnucash/branches/remove-group2/src/gnome/glade/chart-export.glade
gnucash/branches/remove-group2/src/gnome/glade/commodities.glade
gnucash/branches/remove-group2/src/gnome/glade/fincalc.glade
gnucash/branches/remove-group2/src/gnome/glade/lots.glade
gnucash/branches/remove-group2/src/gnome/glade/merge.glade
gnucash/branches/remove-group2/src/gnome/glade/newuser.glade
gnucash/branches/remove-group2/src/gnome/glade/price.glade
gnucash/branches/remove-group2/src/gnome/glade/print.glade
gnucash/branches/remove-group2/src/gnome/glade/progress.glade
gnucash/branches/remove-group2/src/gnome/glade/reconcile.glade
gnucash/branches/remove-group2/src/gnome/glade/register.glade
gnucash/branches/remove-group2/src/gnome/glade/sched-xact.glade
gnucash/branches/remove-group2/src/gnome/glade/stocks.glade
gnucash/branches/remove-group2/src/gnome/glade/tax.glade
gnucash/branches/remove-group2/src/gnome/glade/userpass.glade
gnucash/branches/remove-group2/src/gnome/gnc-plugin-basic-commands.c
gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-account-tree.c
gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-budget.c
gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-register.c
gnucash/branches/remove-group2/src/gnome/gnc-split-reg.c
gnucash/branches/remove-group2/src/gnome/gnc-split-reg.h
gnucash/branches/remove-group2/src/gnome/top-level.c
gnucash/branches/remove-group2/src/gnome/ui/Makefile.am
gnucash/branches/remove-group2/src/gnome/window-reconcile.c
gnucash/branches/remove-group2/src/import-export/Makefile.am
gnucash/branches/remove-group2/src/import-export/binary-import/Makefile.am
gnucash/branches/remove-group2/src/import-export/binary-import/binary-import.glade
gnucash/branches/remove-group2/src/import-export/binary-import/gncmod-binary-import.c
gnucash/branches/remove-group2/src/import-export/csv/gnc-csv2glist.c
gnucash/branches/remove-group2/src/import-export/generic-import.glade
gnucash/branches/remove-group2/src/import-export/gncmod-generic-import.c
gnucash/branches/remove-group2/src/import-export/hbci/Makefile.am
gnucash/branches/remove-group2/src/import-export/hbci/dialog-hbcitrans.c
gnucash/branches/remove-group2/src/import-export/hbci/druid-hbci-initial.c
gnucash/branches/remove-group2/src/import-export/hbci/glade/hbci.glade
gnucash/branches/remove-group2/src/import-export/hbci/glade/hbcipass.glade
gnucash/branches/remove-group2/src/import-export/hbci/glade/hbciprefs.glade
gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.c
gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.h
gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-getbalance.c
gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-gettrans.c
gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-transfer.c
gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.c
gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.h
gnucash/branches/remove-group2/src/import-export/hbci/gnc-plugin-hbci.c
gnucash/branches/remove-group2/src/import-export/hbci/gncmod-hbci.c
gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.c
gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.h
gnucash/branches/remove-group2/src/import-export/hbci/hbci-interactionP.h
gnucash/branches/remove-group2/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in
gnucash/branches/remove-group2/src/import-export/hbci/test/Makefile.am
gnucash/branches/remove-group2/src/import-export/import-account-matcher.c
gnucash/branches/remove-group2/src/import-export/import-backend.c
gnucash/branches/remove-group2/src/import-export/import-match-map.c
gnucash/branches/remove-group2/src/import-export/import-match-picker.c
gnucash/branches/remove-group2/src/import-export/import-provider-format.glade
gnucash/branches/remove-group2/src/import-export/log-replay/Makefile.am
gnucash/branches/remove-group2/src/import-export/log-replay/gnc-log-replay.c
gnucash/branches/remove-group2/src/import-export/log-replay/gncmod-log-replay.c
gnucash/branches/remove-group2/src/import-export/ofx/Makefile.am
gnucash/branches/remove-group2/src/import-export/ofx/gnc-ofx-import.c
gnucash/branches/remove-group2/src/import-export/ofx/gncmod-ofx-import.c
gnucash/branches/remove-group2/src/import-export/ofx/test/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif-import/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif-import/dialog-account-picker.c
gnucash/branches/remove-group2/src/import-export/qif-import/druid-qif-import.c
gnucash/branches/remove-group2/src/import-export/qif-import/gncmod-qif-import.c
gnucash/branches/remove-group2/src/import-export/qif-import/qif-guess-map.scm
gnucash/branches/remove-group2/src/import-export/qif-import/qif-import.scm
gnucash/branches/remove-group2/src/import-export/qif-import/qif-parse.scm
gnucash/branches/remove-group2/src/import-export/qif-import/qif.glade
gnucash/branches/remove-group2/src/import-export/qif-import/test/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif-io-core/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif-io-core/gncmod-qifiocore.c
gnucash/branches/remove-group2/src/import-export/qif-io-core/test/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif/qif-file.c
gnucash/branches/remove-group2/src/import-export/qif/test/Makefile.am
gnucash/branches/remove-group2/src/import-export/qif/test/test-qif.c
gnucash/branches/remove-group2/src/import-export/test/Makefile.am
gnucash/branches/remove-group2/src/network-utils/Makefile.am
gnucash/branches/remove-group2/src/network-utils/gncmod-network-utils.c
gnucash/branches/remove-group2/src/network-utils/test/Makefile.am
gnucash/branches/remove-group2/src/quotes/gnc-fq-check.in
gnucash/branches/remove-group2/src/quotes/gnc-fq-dump
gnucash/branches/remove-group2/src/quotes/gnc-fq-helper.in
gnucash/branches/remove-group2/src/quotes/gnc-fq-update.in
gnucash/branches/remove-group2/src/register/ledger-core/Makefile.am
gnucash/branches/remove-group2/src/register/ledger-core/gncmod-ledger-core.c
gnucash/branches/remove-group2/src/register/ledger-core/split-register.c
gnucash/branches/remove-group2/src/register/ledger-core/test/Makefile.am
gnucash/branches/remove-group2/src/register/register-core/Makefile.am
gnucash/branches/remove-group2/src/register/register-core/gncmod-register-core.c
gnucash/branches/remove-group2/src/register/register-core/table-allgui.c
gnucash/branches/remove-group2/src/register/register-core/test/Makefile.am
gnucash/branches/remove-group2/src/register/register-gnome/Makefile.am
gnucash/branches/remove-group2/src/register/register-gnome/datecell-gnome.c
gnucash/branches/remove-group2/src/register/register-gnome/gncmod-register-gnome.c
gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.c
gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.h
gnucash/branches/remove-group2/src/register/register-gnome/gnucash-item-list.c
gnucash/branches/remove-group2/src/register/register-gnome/test/Makefile.am
gnucash/branches/remove-group2/src/report/locale-specific/us/Makefile.am
gnucash/branches/remove-group2/src/report/locale-specific/us/gncmod-locale-reports-us.c
gnucash/branches/remove-group2/src/report/locale-specific/us/test/Makefile.am
gnucash/branches/remove-group2/src/report/report-gnome/Makefile.am
gnucash/branches/remove-group2/src/report/report-gnome/gnc-plugin-page-report.c
gnucash/branches/remove-group2/src/report/report-gnome/gncmod-report-gnome.c
gnucash/branches/remove-group2/src/report/report-gnome/report.glade
gnucash/branches/remove-group2/src/report/report-gnome/test/Makefile.am
gnucash/branches/remove-group2/src/report/report-gnome/test/test-load-module
gnucash/branches/remove-group2/src/report/report-gnome/window-report.c
gnucash/branches/remove-group2/src/report/report-gnome/window-report.h
gnucash/branches/remove-group2/src/report/report-system/Makefile.am
gnucash/branches/remove-group2/src/report/report-system/gncmod-report-system.c
gnucash/branches/remove-group2/src/report/report-system/test/Makefile.am
gnucash/branches/remove-group2/src/report/report-system/test/test-load-module
gnucash/branches/remove-group2/src/report/standard-reports/Makefile.am
gnucash/branches/remove-group2/src/report/standard-reports/budget.scm
gnucash/branches/remove-group2/src/report/standard-reports/cash-flow.scm
gnucash/branches/remove-group2/src/report/standard-reports/gncmod-standard-reports.c
gnucash/branches/remove-group2/src/report/standard-reports/register.scm
gnucash/branches/remove-group2/src/report/standard-reports/standard-reports.scm
gnucash/branches/remove-group2/src/report/standard-reports/test/Makefile.am
gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm
gnucash/branches/remove-group2/src/report/stylesheets/Makefile.am
gnucash/branches/remove-group2/src/report/stylesheets/gncmod-stylesheets.c
gnucash/branches/remove-group2/src/report/stylesheets/test/Makefile.am
gnucash/branches/remove-group2/src/report/stylesheets/test/test-load-module
gnucash/branches/remove-group2/src/report/utility-reports/Makefile.am
gnucash/branches/remove-group2/src/report/utility-reports/gncmod-utility-reports.c
gnucash/branches/remove-group2/src/report/utility-reports/test/Makefile.am
gnucash/branches/remove-group2/src/scm/fin.scm
gnucash/branches/remove-group2/src/scm/price-quotes.scm
gnucash/branches/remove-group2/src/tax/us/Makefile.am
gnucash/branches/remove-group2/src/tax/us/gncmod-tax-us.c
gnucash/branches/remove-group2/src/tax/us/test/Makefile.am
gnucash/branches/remove-group2/src/test-core/Makefile.am
gnucash/branches/remove-group2/src/test-core/gncmod-test.c
gnucash/branches/remove-group2/src/valgrind-gnucash.supp
gnucash/branches/remove-group2/util/glade-fixup
gnucash/branches/remove-group2/util/gnc-svnversion
Log:
Sync changes 15253:15563 into the branch.
Property changes on: gnucash/branches/remove-group2
___________________________________________________________________
Name: svk:merge
- 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1024
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13759
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
+ 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:1037
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:14082
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
Modified: gnucash/branches/remove-group2/ChangeLog
===================================================================
--- gnucash/branches/remove-group2/ChangeLog 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/ChangeLog 2007-02-11 19:54:51 UTC (rev 15565)
@@ -114,6 +114,17 @@
relocation of previously compiled-in paths. With the exception of
the env variables in src/bin/gnucash, we're fully relocatable now.
+2006-09-16 Joshua Sled <jsled at asynchronous.org>
+
+ * src/gnome/gnc-plugin-page-sx-list.c (sxsl_get_sx_vars): Add
+ variable extraction to instance-model creation. The
+ GncSxInstances now has a hashtable of variables parsed from the
+ formula, and the GncSxInstance has a copy of that variables hash.
+ Not finished, but mostly in place.
+
+ * src/gnome/dialog-sx-since-last-run.c: New, simplified version of
+ the since-last-run dialog. GncSxSlrTreeModelAdapter.
+
2006-09-13 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/gnc-plugin-hbci.c: Move the MT940
@@ -307,6 +318,30 @@
preferences_dialog->Windows. Move "Show close button on notebook
tabs" from General to Windows. Fixes #340299.
+2006-07-27 Joshua Sled <jsled at asynchronous.org>
+
+ * src/gnome-utils/gnc-dense-cal.c
+ (gnc_dense_cal_transient_model_new): Actually implement
+ GncDenseCalTransientModel.
+
+ * src/gnome/dialog-sx-editor.c (gnc_sxed_update_cal):
+ * src/gnome/dialog-sx-from-trans.c (sxftd_update_example_cal):
+ Use GncDenseCalTransientModel from previous ad-hoc updaters.
+
+
+2006-07-25 Joshua Sled <jsled at asynchronous.org>
+
+ * src/gnome-utils/gnc-dense-cal.c:
+ Add GncDenseCalModel interface, support.
+ Add unfinished GncDenseCalTransient model impl. for
+ one-off being-edited-SX calendar usage.
+
+ * src/gnome/gnc-plugin-page-sx-list.c:
+ Add GncSxInstanceDenseCalAdapter between GncSxInstanceModel and
+ GncDenseCalModel. Start to hook up 'added' and 'removing' signals
+ on the GncSxInstanceModel. The SX-List dense-cal works again, and
+ reflects both removed and new SXes.
+
2006-07-24 Derek Atkins <derek at ihtfp.com>
* [lots of Makefile.am files]:
@@ -339,6 +374,27 @@
extra de-quoting of path names that is done on the GNC_MODULE_PATH
env variable.
+2006-07-16 Joshua Sled <jsled at asynchronous.org>
+
+ * src/engine/SX-book-p.h:
+ * src/engine/SX-book.h:
+ * src/engine/SX-book.c: Promote SX list from a GList to a
+ `SchedXactions` QOF Entity. Create add/remove API that emits
+ GNC_EVENT_{INSERT,REMOVE} signals. Correctly associate the SX
+ List with the collection of SchedXaction qof-type rather than the
+ SX template transactions qof-type. Remove some (now-)dead
+ code. Fix long-standing bug in registration of SX qof types.
+
+ * src/gnome/dialog-sx-editor.[ch]:
+ * src/gnome/dialog-schedxaction.[ch]:
+ Move the SX editor dialog subset of dialog-schedxaction to
+ dialog-sx-editor.[ch].
+
+ * src/gnome/gnc-plugin-page-sx-list.c:
+ Hookup SX editor for both 'new' and 'edit' actions. Hookup
+ row-activation from tree-view. Extend GncSxInstanceModel to
+ support SchedXactions (sx list) modification events.
+
2006-07-16 Derek Atkins <derek at ihtfp.com>
* configure.in:
@@ -368,6 +424,18 @@
* src/gnome-utils/gnc-main-window.c: Do not move windows on
restoration that would be offscreen.
+2006-07-15 Joshua Sled <jsled at asynchronous.org>
+
+ * src/engine/SchedXaction.h (GNC_IS_SX,GNC_SX): added for convenience.
+
+ * src/gnome/ui/gnc-plugin-page-sx-list-ui.xml:
+ * src/gnome/gnc-plugin-page-sx-list.[ch]: SX List as a plugin page.
+
+ * src/gnome/gnc-plugin-basic-commands.c: Call SX List plugin page,
+ not dialog.
+
+ * src/doc/sx.rst: Added.
+
2006-07-15 Derek Atkins <derek at ihtfp.com>
* src/business/business-core/gncAddress.[ch]:
Copied: gnucash/branches/remove-group2/ChangeLog.2006 (from rev 15563, gnucash/trunk/ChangeLog.2006)
Modified: gnucash/branches/remove-group2/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -12,6 +12,7 @@
AUTHORS \
COPYING \
ChangeLog \
+ ChangeLog.2006 \
ChangeLog.2005 \
ChangeLog.2004 \
ChangeLog.2003 \
@@ -24,9 +25,6 @@
README.patches \
README.dependencies
-m4datadir = $(datadir)/aclocal
-m4data_DATA = gnucash.m4
-
# All the other files that go in the distribution tarfile that aren't
# included some other way...
@@ -40,8 +38,6 @@
EXTRA_DIST = \
gnucash.lsm \
- gnucash.m4 \
- gnucash-config.in \
make-gnucash-patch.in \
make-gnucash-potfiles.in \
macros/aqbanking.m4 \
@@ -79,10 +75,6 @@
intltool-update.in \
util/gnc-svnversion
-bin_SCRIPTS = gnucash-config
-
-CLEANFILES = gnucash-config
-
## We borrow guile's convention and use @-...-@ as the substitution
## brackets here, instead of the usual @... at . This prevents autoconf
## from substituting the values directly into the left-hand sides of
@@ -205,6 +197,6 @@
SVN = svn
XSLTPROC = xsltproc
ChangeLog.svn:
- $(SVN) log -v --xml -r HEAD:11782 http://svn.gnucash.org/repo/gnucash | \
+ $(SVN) log -v --xml -r HEAD:15287 http://svn.gnucash.org/repo/gnucash | \
$(XSLTPROC) --stringparam strip-prefix "gnucash" \
--stringparam include-rev "yes" $(srcdir)/macros/svn2cl.xsl - > $@
Modified: gnucash/branches/remove-group2/README.dependencies
===================================================================
--- gnucash/branches/remove-group2/README.dependencies 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/README.dependencies 2007-02-11 19:54:51 UTC (rev 15565)
@@ -124,7 +124,38 @@
- libgnomeui-2.0 >= 2.0.0
- libgsf-gnome-1 >= 1.12.2
+Status, 2007-01-17
+------------------
+1. Ubuntu
+ - 2006.10 [2006/10/26]
+ - gtk+ 2.10.6
+ - swig 1.3.28-1.1ubuntu1
+ - 2006.06 [2006/06/01]
+ - gtk+ 2.8.17
+2. Mandriva Linux
+ - 2007 [2006/10/03]
+ - gtk+ 2.10.3
+ - 2006 [2005/10/06]
+ - gtk+ 2.8.3
+3. Suse
+ - 10.2 [2006/12/07]
+ - gtk+ 2.10.6
+ - 10.1 [2006/05/11]
+ - gtk+ 2.8.10
+4. Fedora Core
+ - FC6 [2006/10/24]
+ - gtk+ 2.10.4
+ - FC5 [2006/03/20]
+ - gtk+ 2.8.15
+5. Debian GNU/Linux
+ - unstable
+ - gtk+ 2.8.20
+ - testing
+ - gtk+ 2.8.20
+ - sarge [2005/06/06]
+ - gtk+ 2.6.4
+
Status, 2005-11-06
------------------
The major distributions, as defined by http://distrowatch.com/dwres.php?resource=major, are:
@@ -172,6 +203,25 @@
- libxml-2 libxml2_2.6.17-0ubuntu1_i386.deb
- pango libpango1.0-0_1.8.1-0ubuntu2
- Mandriva
+ - 2007.0 = 2007-01-03
+ [from ftp://ftp.proxad.net/pub/Distributions_Linux/MandrivaLinux/official/2007.0/i586/media/main/]
+ - aqbanking-2.2.1
+ - libcairo2-1.2.4
+ - gconf-2.14.0
+ - glib-2.12.3
+ - gtk+-2.10.3
+ - guile-1.6.8
+ - g-wrap-1.9.6
+ - libart-2.3.17
+ - libglade-2.6.0
+ - libgnomeprint-2.2-2.12.1
+ - libgnomeui-2.16.0
+ - libgsf-1.14.1
+ - libofx-0.8.0
+ - libxml-2.6.26
+ - pango-1.14.3
+ - libgtkhtml-3.8-3.12.0
+ Note: -devel packages for the libraries above must also be installed.
- 2006 = 2005-10-06
[from ftp://ftp.rutgers.edu/pub/Mandrakelinux/devel/2006.0/i586/media/main/]
- aqbanking-1.2.0
Modified: gnucash/branches/remove-group2/accounts/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/accounts/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/accounts/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,3 +1,3 @@
-SUBDIRS = C da de_AT de_CH de_DE el_GR es_ES fr_CH fr_FR hu_HU it nb pt_BR pt_PT sk tr_TR
+SUBDIRS = C da de_AT de_CH de_DE el_GR es_ES fr_CH fr_CA fr_FR hu_HU it nb pt_BR pt_PT sk tr_TR
Copied: gnucash/branches/remove-group2/accounts/fr_CA (from rev 15563, gnucash/trunk/accounts/fr_CA)
Property changes on: gnucash/branches/remove-group2/accounts/fr_CA
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_actifsfixes.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous possédez des immobilisations ou actifs fixes importants tels que résidence, chalet, auto ou autres actifs.
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_automobile.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_automobile.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_automobile.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous devez suivre les frais relatifs à la possession et à l'utilisation d'une auto (assurances, carburant, emprunt, intérêts, ...).
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Passif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -113,6 +121,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_basecommune.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_basecommune.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_basecommune.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
</gnc-act:long-description>
<gnc-act:start-selected>1</gnc-act:start-selected>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -90,6 +97,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Passif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -131,6 +139,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Revenus</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -214,6 +223,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -711,6 +721,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Capitaux propres</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_cdmarchemon.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes (CD/CPG , marché monétaire et intérêts) si vous détenez des certificats de dépôt et d'autres titres du marché monétaire.
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -78,6 +85,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Revenus</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_chequier.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_chequier.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_chequier.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous ne voulez suivre que le solde de votre compte en banque. Si le besoin s'en fait sentir plus tard, vous pourrez commencer un suivi plus serré de vos revenus et dépenses en ajoutant de nouveaux groupes de comptes.
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Capitaux propres</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -95,6 +103,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Revenus</act:name>
@@ -106,6 +115,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Revenus</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
</gnc-account-example>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointretraite.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe si vous faites le suivi d'un compte de placements (actions, obligations, fonds communs et fonds d'indices boursiers) pour la retraite de votre conjoint(e).
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_conjointrev.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous voulez suivre séparément les revenus et dépenses d'emploi du (de la) conjoint(e).
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Revenus</act:name>
<act:id type="guid">e5e6414e2da9abb0d11a675a1244e380</act:id>
<act:type>INCOME</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Revenus</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -96,6 +103,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_courtage.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_courtage.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_courtage.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous possédez des titres de placements (actions, obligations, fonds communs de placement, fonds d'indices boursiers).
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -114,6 +121,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -143,6 +151,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Revenus</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_etudeemprunt.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Selectionnez ce groupe si vous devez gérer un emprunt pour études.
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Passif</act:name>
<act:id type="guid">daf9ad37262c7254bbdf0be5ba26e29e</act:id>
<act:type>LIABILITY</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Passif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_garderie.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_garderie.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_garderie.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe si vous avez un jeune enfant .
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Dépenses</act:name>
<act:id type="guid">5882be9c31d58cc589c53f94d86f82da</act:id>
<act:type>EXPENSE</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_locataire.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_locataire.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_locataire.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de compte si vous louez une résidence ou un logis (Loyer, assurances, ...).
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Dépenses</act:name>
<act:id type="guid">5882be9c31d58cc589c53f94d86f82da</act:id>
<act:type>EXPENSE</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_proprietaire.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous êtes propriétaire d'une résidence, et voulez en suivre les frais associés (hypothèque, intérêts, entretien et réparations, taxes, ...).
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -66,6 +73,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Passif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -113,6 +121,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_retraite.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_retraite.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_retraite.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous faites le suivi d'un compte de placements (actions, obligations, fonds communs et fonds d'indices boursiers) pour votre retraite.
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Actif</act:name>
<act:id type="guid">b14f810bdb0b57b77acf1a5db700068c</act:id>
<act:type>ASSET</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actif</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_revenus.gnucash-xea
===================================================================
--- gnucash/trunk/accounts/fr_CA/acctchrt_revenus.gnucash-xea 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/accounts/fr_CA/acctchrt_revenus.gnucash-xea 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,6 +10,12 @@
Sélectionnez ce groupe de comptes si vous voulez faire le suivi de vos revenus et dépenses d'emploi.
</gnc-act:long-description>
<gnc:account version="2.0.0">
+ <act:name/>
+ <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+ <act:type>ROOT</act:type>
+ <act:commodity-scu>0</act:commodity-scu>
+ </gnc:account>
+ <gnc:account version="2.0.0">
<act:name>Revenus</act:name>
<act:id type="guid">e5e6414e2da9abb0d11a675a1244e380</act:id>
<act:type>INCOME</act:type>
@@ -19,6 +25,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Revenus</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -96,6 +103,7 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Dépenses</act:description>
+ <act:parent type="guid">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
Modified: gnucash/branches/remove-group2/autogen.sh
===================================================================
--- gnucash/branches/remove-group2/autogen.sh 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/autogen.sh 2007-02-11 19:54:51 UTC (rev 15565)
@@ -135,12 +135,17 @@
DIE=1
}
+# On MacOS, libtoolize is installed as glibtoolize, so handle that here.
(${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
+ LIBTOOLIZE=glibtoolize
+ (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
+ echo "Could not find either \`libtoolize' or \'glibtoolize'."
+ echo "Download the appropriate package for your distribution,"
+ echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+ DIE=1
+ }
}
(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
Modified: gnucash/branches/remove-group2/configure.in
===================================================================
--- gnucash/branches/remove-group2/configure.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/configure.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,6 +37,15 @@
GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/' ]`
GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | [ sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/' ]`
+# save any user/environment optimization flags before we muck with them in
+# --enable-debug:
+USER_OPTIMIZATION=""
+for flag in $CFLAGS; do
+ if test -z $(echo $flag | sed -e 's,-O.,,'); then
+ USER_OPTIMIZATION="$USER_OPTIMIZATION ${flag}"
+ fi
+done
+
## Do this first, because the other tests depend on it:
# Check for gcc and intltool (somehow breaks the suggested content
@@ -146,11 +155,6 @@
fi
fi
-AC_CHECK_HEADERS(ltdl.h)
-if test "x$ac_cv_header_ltdl_h" = xno; then
- AC_MSG_ERROR([Cannot find ltdl.h -- libtool-devel (or libtool-ltdl-devel) not installed?])
-fi
-
# test whether we are building directly from SVN/SVK
${srcdir}/util/gnc-svnversion ${srcdir} >/dev/null 2>&1
if test $? = 0 ; then
@@ -161,6 +165,27 @@
AC_PROG_SWIG(1.3.28)
else
BUILDING_FROM_SVN=no
+ # Make sure we've got swig-runtime.h and gnc-svninfo.h
+ AC_CHECK_FILE(${srcdir}/src/swig-runtime.h, [],
+ [AC_MSG_ERROR([
+
+It looks like you are NOT building from Subversion
+but I cannot find swig-runtime.h. Check your PATH
+and make sure we can find svnversion in your PATH!
+Either that or contact gnucash-devel at gnucash.org because
+the tarball you downloaded is broken.
+
+ ])])
+ AC_CHECK_FILE(${srcdir}/src/gnome-utils/gnc-svninfo.h, [],
+ [AC_MSG_ERROR([
+
+It looks like you are NOT building from Subversion
+but I cannot find gnc-svninfo.h. Check your PATH
+and make sure we can find svnversion in your PATH!
+Either that or contact gnucash-devel at gnucash.org because
+the tarball you downloaded is broken.
+
+ ])])
fi
AM_CONDITIONAL(BUILDING_FROM_SVN, test "x$BUILDING_FROM_SVN" = "xyes")
@@ -187,8 +212,8 @@
### --------------------------------------------------------------------------
### Glib checks..
-AM_PATH_GLIB_2_0(2.4.0,,AC_MSG_ERROR([
-*** GLIB >= 2.4 is required to build Gnucash; please make sure you have the
+AM_PATH_GLIB_2_0(2.6.0,,AC_MSG_ERROR([
+*** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
*** development headers installed. The latest version of GLIB is
*** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/.]),
gthread gobject gmodule)
@@ -198,20 +223,24 @@
AC_MSG_ERROR([Cannot find glib. Check config.log])
fi
-AC_MSG_CHECKING(for GLIB - version >= 2.6.0)
-if $PKG_CONFIG 'glib-2.0 >= 2.6.0'
+AC_MSG_CHECKING(for GLIB - version >= 2.8.0)
+if $PKG_CONFIG 'glib-2.0 >= 2.8.0'
then
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GLIB26,1,[System has glib 2.6.0 or better])
- HAVE_GLIB26=yes
+ AC_DEFINE(HAVE_GLIB_2_8,1,[System has glib 2.8.0 or better])
+ HAVE_GLIB_2_8=yes
else
- GLIB24_LIBS="$GLIB_LIBS"
- GLIB_LIBS="\${top_builddir}/lib/glib26/libgncglib.la $GLIB_LIBS"
- GLIB_CFLAGS="-I\${top_srcdir}/lib/glib26 $GLIB_CFLAGS"
AC_MSG_RESULT(no)
- AC_SUBST(GLIB24_LIBS)
+ if test "x${native_win32}" = "xyes"; then
+ AC_MSG_ERROR([*** GLIB >= 2.8 is required to build Gnucash on Windows.])
+ else
+ GLIB26_LIBS="$GLIB_LIBS"
+ GLIB_LIBS="\${top_builddir}/lib/glib28/libgnc-glib.la $GLIB_LIBS"
+ GLIB_CFLAGS="-I\${top_srcdir}/lib/glib28 $GLIB_CFLAGS"
+ AC_SUBST(GLIB26_LIBS)
+ fi
fi
-AM_CONDITIONAL(HAVE_GLIB26, test "x$HAVE_GLIB26" = "xyes" )
+AM_CONDITIONAL(HAVE_GLIB_2_8, test "x$HAVE_GLIB_2_8" = "xyes")
AC_MSG_CHECKING(for GLIB - version >= 2.9.0)
if $PKG_CONFIG 'glib-2.0 >= 2.9.0'
@@ -511,9 +540,9 @@
AC_MSG_NOTICE([External QOF Disabled. Using Internal QOF Code.])
fi
if test x$QOF_XML_DIR = x; then
- QOF_LIB_DIR='${libdir}'
+ QOF_LIB_DIR='${pkglibdir}'
QOF_CFLAGS='-I${top_builddir}/lib/libqof/qof -I${top_srcdir}/lib/libqof/qof'
- QOF_LIBS='${top_builddir}/lib/libqof/qof/libgncqof.la'
+ QOF_LIBS='${top_builddir}/lib/libqof/qof/libgnc-qof.la'
QOF_VERSION="internal"
QOF_PREFIX="internal"
QOF_XML_DIR='${pkgdatadir}/xml/qsf'
@@ -542,7 +571,6 @@
GNC_CONFIGDIR='${sysconfdir}/gnucash'
GNC_DOC_INSTALL_DIR='${pkgdatadir}/doc'
GNC_INCLUDE_DIR='${includedir}/gnucash'
-GNC_LIBDIR='${pkglibdir}'
GNC_SCM_INSTALL_DIR='${pkgdatadir}/scm'
GNC_SHAREDIR='${pkgdatadir}'
GNC_LIBEXECDIR='${libexecdir}/gnucash'
@@ -550,7 +578,6 @@
GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts'
GNC_GLADE_DIR='${GNC_SHAREDIR}/glade'
GNC_UI_DIR='${GNC_SHAREDIR}/ui'
-GNC_MODULE_DIR='${pkglibdir}'
GNC_PIXMAP_DIR='${GNC_SHAREDIR}/pixmaps'
AC_SUBST(GNC_ACCOUNTS_DIR)
@@ -559,8 +586,6 @@
AC_SUBST(GNC_GLADE_DIR)
AC_SUBST(GNC_UI_DIR)
AC_SUBST(GNC_INCLUDE_DIR)
-AC_SUBST(GNC_LIBDIR)
-AC_SUBST(GNC_MODULE_DIR)
AC_SUBST(GNC_PIXMAP_DIR)
AC_SUBST(GNC_SCM_INSTALL_DIR)
AC_SUBST(GNC_SHAREDIR)
@@ -568,7 +593,10 @@
AC_ARG_ENABLE( debug,
[ --enable-debug compile with debugging flags set],
- CFLAGS="${CFLAGS} -g"
+ # remove any optimization flags...
+ CFLAGS=$(echo $CFLAGS | sed -e 's,-O.,,g')
+ # ...except for those the user wants.
+ CFLAGS="${CFLAGS} -g ${USER_OPTIMIZATION}"
LDFLAGS="${LDFLAGS} -g"
AC_DEFINE(DEBUG_MEMORY,1,Enable debug memory),
AC_DEFINE(DEBUG_MEMORY,0,Enable debug memory) )
@@ -811,7 +839,7 @@
then
# Check for Aqbanking library
# aqbanking-1.6.0 was released on 2005-09-22
- PKG_CHECK_MODULES(HBCI, aqbanking >= "1.6.0", [], [
+ PKG_CHECK_MODULES(HBCI, aqbanking >= "1.6.0" gwenhywfar, [], [
AC_AQBANKING(1,6,0)
if test x${have_aqbanking} != xyes;
then
@@ -1023,7 +1051,7 @@
fi
GNOME_COMPILE_WARNINGS
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6)
AS_SCRUB_INCLUDE(GTK_CFLAGS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -1124,18 +1152,6 @@
### Only test this if we're building the GUI
if test x${gnc_build_gui} = xtrue ;
then
- AC_MSG_CHECKING(for GTK - version >= 2.6.0)
- if $PKG_CONFIG 'gtk+-2.0 >= 2.6.0'
- then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_GTK26,1,[System has gtk 2.6.0 or better])
- HAVE_GTK26=yes
- else
- AC_MSG_RESULT(no)
- fi
- AM_CONDITIONAL(HAVE_GTK26, test "x$HAVE_GTK26" = "xyes" )
-
-
AC_MSG_CHECKING(for GTK - version >= 2.10.0)
if $PKG_CONFIG 'gtk+-2.0 >= 2.10.0'
then
@@ -1148,18 +1164,6 @@
AM_CONDITIONAL(HAVE_GTK_2_10, test "x$HAVE_GTK_2_10" = "xyes" )
- AC_MSG_CHECKING(for pango version >= 1.8.0)
- if $PKG_CONFIG 'pango >= 1.8.0'
- then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_PANGO18,1,[System has pango 1.8.0 or better])
- HAVE_PANGO18=yes
- else
- AC_MSG_RESULT(no)
- fi
- AM_CONDITIONAL(HAVE_PANGO18, test "x$HAVE_PANGO18" = "xyes" )
-
-
dnl @@fixme
dnl use both PKG_CHECK_MODULES and `$PKG_CONFIG`; the first importantly sets
dnl MUMBLE_{LIBS,CFLAGS}...
@@ -1254,8 +1258,8 @@
])
dnl Modules common to libgsf and libgsf-gnome
libgsf_reqs="
- gobject-2.0 >= 2.4.0
- glib-2.0 >= 2.4.0
+ gobject-2.0 >= 2.6.0
+ glib-2.0 >= 2.6.0
libxml-2.0 >= 2.4.16
"
dnl Modules required for libgsf-gnome
@@ -1532,15 +1536,15 @@
dnl *****************************
# libgsf-1 >= 1.12.2
goffice_reqs="
- glib-2.0 >= 2.4.7
- gobject-2.0 >= 2.4.7
- gmodule-2.0 >= 2.4.7
+ glib-2.0 >= 2.6.4
+ gobject-2.0 >= 2.6.4
+ gmodule-2.0 >= 2.6.4
libxml-2.0 >= 2.4.12
- pango >= 1.6.0
- pangoft2 >= 1.6.0
+ pango >= 1.8.1
+ pangoft2 >= 1.8.1
"
goffice_gtk_reqs="
- gtk+-2.0 >= 2.4.13
+ gtk+-2.0 >= 2.6.0
libglade-2.0 >= 2.3.6
libgnomeprint-2.2 >= 2.8.0
libart-2.0 >= 2.3.11
@@ -1838,9 +1842,7 @@
### ------------------------------------------------------------------------
else
### A bunch of am conditionals that need to be set
- AM_CONDITIONAL(HAVE_GTK26, false )
AM_CONDITIONAL(HAVE_GTK_2_10, false)
- AM_CONDITIONAL(HAVE_PANGO18, false )
AM_CONDITIONAL(HAVE_LIBGSF, false)
AM_CONDITIONAL(HAVE_GOFFICE, false)
AM_CONDITIONAL(WITH_LIBGSF_GNOME, false)
@@ -1951,7 +1953,7 @@
### GnuCash flags and libs configuration
GNUCASH_ENGINE_BASE_LIBS="${GLIB_LIBS}"
-GNUCASH_ENGINE_LIBS="-L${GNC_MODULE_DIR} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgncmodule"
+GNUCASH_ENGINE_LIBS="-L${pkglibdir} ${GNUCASH_ENGINE_BASE_LIBS} ${GUILE_LIBS} -lgncmod-engine -lgnc-module"
GNUCASH_ENGINE_BASE_CFLAGS="-DGNUCASH ${GLIB_CFLAGS} ${GUILE_INCS}"
GNUCASH_ENGINE_CFLAGS="${GNUCASH_ENGINE_BASE_CFLAGS}"
@@ -2056,8 +2058,11 @@
fi
AC_MSG_RESULT($warnFLAGS)
-# Extend LDFLAGS because libtool on Windows requires this argument
-LDFLAGS="${LDFLAGS} -no-undefined"
+# Adjust CFLAGS and LDFLAGS on Windows
+if test "x${platform_win32}" = "xyes"; then
+ CFLAGS="${CFLAGS} -mms-bitfields"
+ LDFLAGS="${LDFLAGS} -no-undefined -mwindows"
+fi
### --------------------------------------------------------------------------
### Adjustments -- especially executables that aren't generated via
@@ -2087,6 +2092,7 @@
accounts/de_DE/Makefile
accounts/el_GR/Makefile
accounts/es_ES/Makefile
+ accounts/fr_CA/Makefile
accounts/fr_CH/Makefile
accounts/fr_FR/Makefile
accounts/hu_HU/Makefile
@@ -2100,7 +2106,7 @@
doc/examples/Makefile
intl-scm/Makefile
lib/Makefile
- lib/glib26/Makefile
+ lib/glib28/Makefile
lib/guile-www/Makefile
lib/srfi/Makefile
lib/libc/Makefile
@@ -2216,7 +2222,7 @@
src/register/register-gnome/test/Makefile
src/report/Makefile
src/report/report-gnome/Makefile
- dnl # src/report/report-gnome/test/Makefile
+ src/report/report-gnome/test/Makefile
src/report/report-system/Makefile
src/report/report-system/test/Makefile
src/report/standard-reports/Makefile
@@ -2251,9 +2257,6 @@
dnl # non-makefiles
dnl # Please read doc/build-system before adding *anything* here
- dnl # we configure gnucash-config here because we *don't*
- dnl # want variables to be fully expanded
- gnucash-config
,
dnl # commands go here, but we don't have any right now
)
Modified: gnucash/branches/remove-group2/doc/README.dependencies
===================================================================
--- gnucash/branches/remove-group2/doc/README.dependencies 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/doc/README.dependencies 2007-02-11 19:54:51 UTC (rev 15565)
@@ -15,7 +15,6 @@
libgnomeui-devel
libgsf-devel
libjpeg-devel
- libtool-ltdl-devel
openssl-devel
If you are compiling with the --enable-ofx or --enable-hbci flags,
Deleted: gnucash/branches/remove-group2/gnucash-config.in
===================================================================
--- gnucash/branches/remove-group2/gnucash-config.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/gnucash-config.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,214 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage()
-{
- cat <<EOF
-Usage: gnucash-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--version]
- [--libs]
- [--cflags]
- [--ld-library-path]
- [--scm-module-dir]
-Libraries:
- engine
- network-utils
- app-utils
- register-core
- gnome-utils
- gnucash
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-any_lib=no
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- if test $exec_prefix_set = no ; then
- exec_prefix=$optarg
- fi
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- exec_prefix_set=yes
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --version)
- echo @VERSION@
- exit 0
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- --ld-library-path)
- echo_ld_library_path=yes
- ;;
- --scm-module-dir)
- echo_scm_module_dir=yes
- ;;
- engine)
- lib_engine=yes
- any_lib=yes
- ;;
- app-utils)
- lib_app_utils=yes
- any_lib=yes
- ;;
- network-utils)
- lib_network_utils=yes
- any_lib=yes
- ;;
- gnome-utils)
- lib_gnome_utils=yes
- any_lib=yes
- ;;
- register-core)
- lib_register_core=yes
- any_lib=yes
- ;;
- gnucash)
- lib_gnucash=yes
- any_lib=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-datadir=@datadir@
-libdir=@libdir@
-includedir=@includedir@
-pkgdatadir=${datadir}/@PACKAGE@
-pkglibdir=${libdir}/@PACKAGE@
-pkgincludedir=${includedir}/@PACKAGE@
-GNC_LIBDIR=@GNC_LIBDIR@
-GNC_MODULE_DIR=@GNC_MODULE_DIR@
-GNC_SHAREDIR=@GNC_SHAREDIR@
-
-# Trim the link and compile lines down.
-
-if test "$any_lib" = "no"; then
- lib_gnucash=yes
-fi
-
-if test "$lib_app_utils" = "yes"; then
- lib_engine=no
-fi
-
-if test "$lib_register_core" = "yes"; then
- lib_engine=no
- lib_network_utils=no
- lib_app_utils=no
- lib_gnome_utils=no
-fi
-
-if test "$lib_gnome_utils" = "yes"; then
- lib_engine=no
- lib_network_utils=no
- lib_app_utils=no
-fi
-
-if test "$lib_gnucash" = "yes"; then
- lib_engine=no
- lib_network_utils=no
- lib_app_utils=no
- lib_register_core=no
- lib_gnome_utils=no
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_cflags" = "yes"; then
- cflags=""
-
- if test "$lib_engine" = "yes"; then
- cflags="$cflags @GNUCASH_ENGINE_CFLAGS@"
- fi
-
- if test "$lib_network_utils" = "yes"; then
- cflags="$cflags @GNUCASH_NETWORK_UTILS_CFLAGS@"
- fi
-
- if test "$lib_app_utils" = "yes"; then
- cflags="$cflags @GNUCASH_APP_UTILS_CFLAGS@"
- fi
-
- if test "$lib_register_core" = "yes"; then
- cflags="$cflags @GNUCASH_REGISTER_CORE_CFLAGS@"
- fi
-
- if test "$lib_gnome_utils" = "yes"; then
- cflags="$cflags @GNUCASH_GNOME_UTILS_CFLAGS@"
- fi
-
- echo $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
- libs="-L${libdir}"
-
- if test "$lib_engine" = "yes"; then
- libs="$libs @GNUCASH_ENGINE_LIBS@"
- fi
-
- if test "$lib_network_utils" = "yes"; then
- libs="$libs @GNUCASH_NETWORK_UTILS_LIBS@"
- fi
-
- if test "$lib_app_utils" = "yes"; then
- libs="$libs @GNUCASH_APP_UTILS_LIBS@"
- fi
-
- if test "$lib_register_core" = "yes"; then
- libs="$libs @GNUCASH_REGISTER_CORE_LIBS@"
- fi
-
- if test "$lib_gnome_utils" = "yes"; then
- libs="$libs @GNUCASH_GNOME_UTILS_LIBS@"
- fi
-
- echo $libs
-fi
-
-if test "$echo_ld_library_path" = "yes"; then
- path="$libdir:$GNC_LIBDIR:$GNC_MODULE_DIR"
- echo $path
-fi
-
-if test "$echo_scm_module_dir" = "yes"; then
- echo $GNC_SHAREDIR/guile-modules
-fi
Deleted: gnucash/branches/remove-group2/gnucash.m4
===================================================================
--- gnucash/branches/remove-group2/gnucash.m4 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/gnucash.m4 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,215 +0,0 @@
-# Configure paths for GnuCash
-# Dave Peticolas <dave at krondo.com> 2001-09-07
-# Based on glib.m4 by Owen Taylor 97-11-3
-
-dnl AM_PATH_GNUCASH([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GnuCash, and define GNUCASH_CFLAGS and GNUCASH_LIBS, if "gmodule" or
-dnl gthread is specified in MODULES, pass to gnucash-config
-dnl
-AC_DEFUN([AM_PATH_GNUCASH],
-[dnl
-dnl Get the cflags and libraries from the gnucash-config script
-dnl
-AC_ARG_WITH(gnucash-prefix,[ --with-gnucash-prefix=PFX Prefix where GnuCash is installed (optional)],
- gnucash_config_prefix="$withval", gnucash_config_prefix="")
-AC_ARG_WITH(gnucash-exec-prefix,[ --with-gnucash-exec-prefix=PFX Exec prefix where GnuCash is installed (optional)],
- gnucash_config_exec_prefix="$withval", gnucash_config_exec_prefix="")
-AC_ARG_ENABLE(gnucashtest, [ --disable-gnucashtest Do not try to compile and run a test GnuCash program],
- , enable_gnucashtest=yes)
-
- if test x$gnucash_config_exec_prefix != x ; then
- gnucash_config_args="$gnucash_config_args --exec-prefix=$gnucash_config_exec_prefix"
- if test x${GNUCASH_CONFIG+set} != xset ; then
- GNUCASH_CONFIG=$gnucash_config_exec_prefix/bin/gnucash-config
- fi
- if test x${GNUCASH_ENV+set} != xset ; then
- GNUCASH_ENV=$gnucash_config_exec_prefix/bin/gnucash-env
- fi
- if test x${GNC_TEST_ENV+set} != xset ; then
- GNC_TEST__ENV=$gnucash_config_exec_prefix/bin/gnc-test-env
- fi
- fi
- if test x$gnucash_config_prefix != x ; then
- gnucash_config_args="$gnucash_config_args --prefix=$gnucash_config_prefix"
- if test x${GNUCASH_CONFIG+set} != xset ; then
- GNUCASH_CONFIG=$gnucash_config_prefix/bin/gnucash-config
- fi
- if test x${GNUCASH_ENV+set} != xset ; then
- GNUCASH_ENV=$gnucash_config_prefix/bin/gnucash-env
- fi
- if test x${GNC_TEST_ENV+set} != xset ; then
- GNC_TEST__ENV=$gnucash_config_prefix/bin/gnc-test-env
- fi
- fi
-
- if test "x$4" = "x"; then
- gnucash_config_args="$gnucash_config_args gnucash"
- else
- gnucash_config_args="$gnucash_config_args $4"
- fi
-
- AC_PATH_PROG(GNUCASH_CONFIG, gnucash-config, no)
- min_gnucash_version=ifelse([$1], ,1.7.0,$1)
- AC_MSG_CHECKING(for GnuCash - version >= $min_gnucash_version)
- no_gnucash=""
- if test "$GNUCASH_CONFIG" = "no" ; then
- no_gnucash=yes
- else
- GNUCASH_CFLAGS=`$GNUCASH_CONFIG $gnucash_config_args --cflags`
- GNUCASH_LIBS=`$GNUCASH_CONFIG $gnucash_config_args --libs`
- gnucash_config_major_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gnucash_config_minor_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gnucash_config_micro_version=`$GNUCASH_CONFIG $gnucash_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gnucashtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GNUCASH_CFLAGS"
- LIBS="$GNUCASH_LIBS $LIBS"
-dnl
-dnl Now check if the installed GNUCASH is sufficiently new. (Also sanity
-dnl checks the results of gnucash-config to some extent
-dnl
- rm -f conf.gnucashtest
- OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
- NEW_LD_PATH=`$GNUCASH_CONFIG $gnucash_config_args --ld-library-path`
- if test "$NEW_LD_PATH"x != x; then
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$NEW_LD_PATH"
- fi
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gnc-engine.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gnucashtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gnucash_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gnucash_version");
- exit(1);
- }
-
- if ((gnucash_major_version() != $gnucash_config_major_version) ||
- (gnucash_minor_version() != $gnucash_config_minor_version) ||
- (gnucash_micro_version() != $gnucash_config_micro_version))
- {
- printf("\n*** 'gnucash-config --version' returned %d.%d.%d, but GnuCash (%d.%d.%d)\n",
- $gnucash_config_major_version, $gnucash_config_minor_version, $gnucash_config_micro_version,
- gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
- printf ("*** was found! If gnucash-config was correct, then it is best\n");
- printf ("*** to remove the old version of GnuCash. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If gnucash-config was wrong, set the environment variable GNUCASH_CONFIG\n");
- printf("*** to point to the correct copy of gnucash-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
-/* The code below needs GNUCASH_*_VERSION defined in gnc-engine.h
- else if ((gnucash_major_version() != GNUCASH_MAJOR_VERSION) ||
- (gnucash_minor_version() != GNUCASH_MINOR_VERSION) ||
- (gnucash_micro_version() != GNUCASH_MICRO_VERSION))
- {
- printf("*** GnuCash header files (version %d.%d.%d) do not match\n",
- GNUCASH_MAJOR_VERSION, GNUCASH_MINOR_VERSION, GNUCASH_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
- }
-*/
- else
- {
- if ((gnucash_major_version() > major) ||
- ((gnucash_major_version() == major) && (gnucash_minor_version() > minor)) ||
- ((gnucash_major_version() == major) && (gnucash_minor_version() == minor) && (gnucash_micro_version() >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GnuCash (%d.%d.%d) was found.\n",
- gnucash_major_version(), gnucash_minor_version(), gnucash_micro_version());
- printf("*** You need a version of GnuCash newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GnuCash is always available from ftp://ftp.gnucash.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the gnucash-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GnuCash, but you can also set the GNUCASH_CONFIG environment to point to the\n");
- printf("*** correct copy of gnucash-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gnucash=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gnucash" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$GNUCASH_CONFIG" = "no" ; then
- echo "*** The gnucash-config script installed by GnuCash could not be found"
- echo "*** If GnuCash was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GNUCASH_CONFIG environment variable to the"
- echo "*** full path to gnucash-config."
- else
- if test -f conf.gnucashtest ; then
- :
- else
- echo "*** Could not run GnuCash test program, checking why..."
- CFLAGS="$CFLAGS $GNUCASH_CFLAGS"
- LIBS="$LIBS $GNUCASH_LIBS"
- AC_TRY_LINK([
-#include <gnc-engine.h>
-#include <stdio.h>
-], [ return ((gnucash_major_version()) || (gnucash_minor_version()) || (gnucash_micro_version())); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GnuCash or finding the wrong"
- echo "*** version of GnuCash. If it is not finding GnuCash, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GnuCash was incorrectly installed"
- echo "*** or that you have moved GnuCash since it was installed. In the latter case, you"
- echo "*** may want to edit the gnucash-config script: $GNUCASH_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GNUCASH_CFLAGS=""
- GNUCASH_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GNUCASH_CFLAGS)
- AC_SUBST(GNUCASH_LIBS)
- rm -f conf.gnucashtest
-
- AC_PATH_PROG(GNUCASH_ENV, gnucash-env, gnucash-env)
- AC_SUBST(GNUCASH_ENV)
- AC_PATH_PROG(GNC_TEST_ENV, gnc-test-env, gnc-test-env)
- AC_SUBST(GNC_TEST_ENV)
-
- if test "$NEW_LD_PATH"x != x; then
- export LD_LIBRARY_PATH="$OLD_LD_LIBRARY_PATH"
- fi
-])
Modified: gnucash/branches/remove-group2/goffice-config.h.in
===================================================================
--- gnucash/branches/remove-group2/goffice-config.h.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/goffice-config.h.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,12 +1,5 @@
/* goffice/goffice-config.h.in. Generated from configure.in by autoheader. */
-/* Conditionally include >2.4 pieces we use. */
-#undef HAVE_GLIB26
-#undef HAVE_GTK26
-
-/* Conditionally work around exposed-in-1.8-functionality. */
-#undef HAVE_PANGO18
-
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
Modified: gnucash/branches/remove-group2/gsf-config.h.in
===================================================================
--- gnucash/branches/remove-group2/gsf-config.h.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/gsf-config.h.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -9,9 +9,6 @@
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
-/* Conditionally include glib-2.0 > 2.4 functionality. */
-#undef HAVE_GLIB26
-
/* Is bzip2 available and enabled */
#undef HAVE_BZ2
Modified: gnucash/branches/remove-group2/lib/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,5 @@
-SUBDIRS = libc glib26 guile-www srfi
-DIST_SUBDIRS = libc glib26 guile-www srfi libgsf-1.12.3 goffice-0.0.4 libqof
+SUBDIRS = libc glib28 guile-www srfi
+DIST_SUBDIRS = libc glib28 guile-www srfi libgsf-1.12.3 goffice-0.0.4 libqof
if !HAVE_GOFFICE
if !HAVE_LIBGSF
Copied: gnucash/branches/remove-group2/lib/glib28 (from rev 15563, gnucash/trunk/lib/glib28)
Property changes on: gnucash/branches/remove-group2/lib/glib28
___________________________________________________________________
Name: svn:ignore
+ *.lo
*.la
.deps
.libs
Makefile
Makefile.in
semantic.cache
TAGS
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,16 +26,10 @@
libgoffice_1_la_SOURCES = \
goffice.c \
goffice-priv.h
-if !HAVE_GLIB26
- libgoffice_1_la_SOURCES += glib24_26-compat.c
-endif
libgoffice_1_ladir = $(goffice_include_dir)
noinst_HEADERS = \
goffice.h
-if !HAVE_GLIB26
- noinst_HEADERS += glib24_26-compat.h
-endif
# Depends on this Makefile, because it uses make variables.
goffice-paths.h: Makefile
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/drawing/god-drawing-renderer-gdk.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -182,19 +182,12 @@
make_absolute (PangoAttribute *attr, gpointer user_data)
{
DrawTextContext *draw_context = user_data;
-#if HAVE_PANGO18
if (attr->klass->type == PANGO_ATTR_SIZE &&
! ((PangoAttrSize *) attr)->absolute) {
PangoAttrSize *size_attr = (PangoAttrSize *) attr;
size_attr->size = GO_PT_TO_UN ((long long) size_attr->size) / draw_context->renderer->priv->y_units_per_pixel;
size_attr->absolute = TRUE;
}
-#else
- if (attr->klass->type == PANGO_ATTR_SIZE) {
- PangoAttrInt *size_attr = (PangoAttrInt *) attr;
- size_attr->value = GO_PT_TO_UN ((long long) size_attr->value) / draw_context->renderer->priv->y_units_per_pixel;
- }
-#endif // HAVE_PANGO18
return FALSE;
}
Deleted: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,359 +0,0 @@
-#include <goffice/glib24_26-compat.h>
-
-#include <string.h>
-
-static const guint16 days_in_year[2][14] =
-{ /* 0, jan feb mar apr may jun jul aug sep oct nov dec */
- { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
- { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-/* "Julian days" just means an absolute number of days, where Day 1 ==
- * Jan 1, Year 1
- */
-static void
-g_date_update_julian (const GDate *const_d)
-{
- GDate *d = (GDate *) const_d;
- GDateYear year;
- gint index;
-
- g_return_if_fail (d != NULL);
- g_return_if_fail (d->dmy);
- g_return_if_fail (!d->julian);
- g_return_if_fail (g_date_valid_dmy (d->day, d->month, d->year));
-
- /* What we actually do is: multiply years * 365 days in the year,
- * add the number of years divided by 4, subtract the number of
- * years divided by 100 and add the number of years divided by 400,
- * which accounts for leap year stuff. Code from Steffen Beyer's
- * DateCalc.
- */
-
- year = d->year - 1; /* we know d->year > 0 since it's valid */
-
- d->julian_days = year * 365U;
- d->julian_days += (year >>= 2); /* divide by 4 and add */
- d->julian_days -= (year /= 25); /* divides original # years by 100 */
- d->julian_days += year >> 2; /* divides by 4, which divides original by 400 */
-
- index = g_date_is_leap_year (d->year) ? 1 : 0;
-
- d->julian_days += days_in_year[index][d->month] + d->day;
-
- g_return_if_fail (g_date_valid_julian (d->julian_days));
-
- d->julian = TRUE;
-}
-
-/**
- * g_date_get_iso8601_week_of_year:
- * @date: a valid #GDate
- *
- * Returns the week of the year, where weeks are interpreted according
- * to ISO 8601.
- *
- * Returns: ISO 8601 week number of the year.
- *
- * Since: 2.6
- **/
-guint
-g_date_get_iso8601_week_of_year (const GDate *d)
-{
- guint j, d4, L, d1, w;
-
- g_return_val_if_fail (g_date_valid (d), 0);
-
- if (!d->julian)
- g_date_update_julian (d);
- g_return_val_if_fail (d->julian, 0);
-
- /* Formula taken from the Calendar FAQ; the formula was for the
- * Julian Period which starts on 1 January 4713 BC, so we add
- * 1,721,425 to the number of days before doing the formula.
- */
- j = d->julian_days + 1721425;
- d4 = (j + 31741 - (j % 7)) % 146097 % 36524 % 1461;
- L = d4 / 1460;
- d1 = ((d4 - L) % 365) + L;
- w = d1 / 7 + 1;
-
- return w;
-}
-
-/** ------------------------------------------------------------ **/
-
-/* The following is (partly) taken from the gettext package.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. */
-
-static const gchar *
-guess_category_value (const gchar *category_name)
-{
- const gchar *retval;
-
- /* The highest priority value is the `LANGUAGE' environment
- variable. This is a GNU extension. */
- retval = g_getenv ("LANGUAGE");
- if ((retval != NULL) && (retval[0] != '\0'))
- return retval;
-
- /* `LANGUAGE' is not set. So we have to proceed with the POSIX
- methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some
- systems this can be done by the `setlocale' function itself. */
-
- /* Setting of LC_ALL overwrites all other. */
- retval = g_getenv ("LC_ALL");
- if ((retval != NULL) && (retval[0] != '\0'))
- return retval;
-
- /* Next comes the name of the desired category. */
- retval = g_getenv (category_name);
- if ((retval != NULL) && (retval[0] != '\0'))
- return retval;
-
- /* Last possibility is the LANG environment variable. */
- retval = g_getenv ("LANG");
- if ((retval != NULL) && (retval[0] != '\0'))
- return retval;
-
-#ifdef G_PLATFORM_WIN32
- /* g_win32_getlocale() first checks for LC_ALL, LC_MESSAGES and
- * LANG, which we already did above. Oh well. The main point of
- * calling g_win32_getlocale() is to get the thread's locale as used
- * by Windows and the Microsoft C runtime (in the "English_United
- * States" format) translated into the Unixish format.
- */
- retval = g_win32_getlocale ();
- if ((retval != NULL) && (retval[0] != '\0'))
- return retval;
-#endif
-
- return NULL;
-}
-
-typedef struct _GLanguageNamesCache GLanguageNamesCache;
-
-struct _GLanguageNamesCache {
- gchar *languages;
- gchar **language_names;
-};
-
-static void
-language_names_cache_free (gpointer data)
-{
- GLanguageNamesCache *cache = data;
- g_free (cache->languages);
- g_strfreev (cache->language_names);
- g_free (cache);
-}
-
-static char *
-unalias_lang (char *lang)
-{
- return lang;
-}
-
-/* Mask for components of locale spec. The ordering here is from
- * least significant to most significant
- */
-enum
-{
- COMPONENT_CODESET = 1 << 0,
- COMPONENT_TERRITORY = 1 << 1,
- COMPONENT_MODIFIER = 1 << 2
-};
-
-/* Break an X/Open style locale specification into components
- */
-static guint
-explode_locale (const gchar *locale,
- gchar **language,
- gchar **territory,
- gchar **codeset,
- gchar **modifier)
-{
- const gchar *uscore_pos;
- const gchar *at_pos;
- const gchar *dot_pos;
-
- guint mask = 0;
-
- uscore_pos = strchr (locale, '_');
- dot_pos = strchr (uscore_pos ? uscore_pos : locale, '.');
- at_pos = strchr (dot_pos ? dot_pos : (uscore_pos ? uscore_pos : locale), '@');
-
- if (at_pos)
- {
- mask |= COMPONENT_MODIFIER;
- *modifier = g_strdup (at_pos);
- }
- else
- at_pos = locale + strlen (locale);
-
- if (dot_pos)
- {
- mask |= COMPONENT_CODESET;
- *codeset = g_strndup (dot_pos, at_pos - dot_pos);
- }
- else
- dot_pos = at_pos;
-
- if (uscore_pos)
- {
- mask |= COMPONENT_TERRITORY;
- *territory = g_strndup (uscore_pos, dot_pos - uscore_pos);
- }
- else
- uscore_pos = dot_pos;
-
- *language = g_strndup (locale, uscore_pos - locale);
-
- return mask;
-}
-
-/*
- * Compute all interesting variants for a given locale name -
- * by stripping off different components of the value.
- *
- * For simplicity, we assume that the locale is in
- * X/Open format: language[_territory][.codeset][@modifier]
- *
- * TODO: Extend this to handle the CEN format (see the GNUlibc docs)
- * as well. We could just copy the code from glibc wholesale
- * but it is big, ugly, and complicated, so I'm reluctant
- * to do so when this should handle 99% of the time...
- */
-static GSList *
-_g_compute_locale_variants (const gchar *locale)
-{
- GSList *retval = NULL;
-
- gchar *language;
- gchar *territory = NULL;
- gchar *codeset = NULL;
- gchar *modifier = NULL;
-
- guint mask;
- guint i;
-
- g_return_val_if_fail (locale != NULL, NULL);
-
- mask = explode_locale (locale, &language, &territory, &codeset, &modifier);
-
- /* Iterate through all possible combinations, from least attractive
- * to most attractive.
- */
- for (i = 0; i <= mask; i++)
- if ((i & ~mask) == 0)
- {
- gchar *val = g_strconcat (language,
- (i & COMPONENT_TERRITORY) ? territory : "",
- (i & COMPONENT_CODESET) ? codeset : "",
- (i & COMPONENT_MODIFIER) ? modifier : "",
- NULL);
- retval = g_slist_prepend (retval, val);
- }
-
- g_free (language);
- if (mask & COMPONENT_CODESET)
- g_free (codeset);
- if (mask & COMPONENT_TERRITORY)
- g_free (territory);
- if (mask & COMPONENT_MODIFIER)
- g_free (modifier);
-
- return retval;
-}
-
-/**
- * g_get_language_names:
- *
- * Computes a list of applicable locale names, which can be used to
- * e.g. construct locale-dependent filenames or search paths. The returned
- * list is sorted from most desirable to least desirable and always contains
- * the default locale "C".
- *
- * For example, if LANGUAGE=de:en_US, then the returned list is
- * "de", "en_US", "en", "C".
- *
- * This function consults the environment variables <envar>LANGUAGE</envar>,
- * <envar>LC_ALL</envar>, <envar>LC_MESSAGES</envar> and <envar>LANG</envar>
- * to find the list of locales specified by the user.
- *
- * Return value: a %NULL-terminated array of strings owned by GLib
- * that must not be modified or freed.
- *
- * Since: 2.6
- **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
-g_get_language_names (void)
-{
- static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
- GLanguageNamesCache *cache = g_static_private_get (&cache_private);
- const gchar *value;
-
- if (!cache)
- {
- cache = g_new0 (GLanguageNamesCache, 1);
- g_static_private_set (&cache_private, cache, language_names_cache_free);
- }
-
- value = guess_category_value ("LC_MESSAGES");
- if (!value)
- value = "C";
-
- if (!(cache->languages && strcmp (cache->languages, value) == 0))
- {
- gchar **languages;
- gchar **alist, **a;
- GSList *list, *l;
- gint i;
-
- g_free (cache->languages);
- g_strfreev (cache->language_names);
- cache->languages = g_strdup (value);
-
- alist = g_strsplit (value, ":", 0);
- list = NULL;
- for (a = alist; *a; a++)
- {
- gchar *b = unalias_lang (*a);
- list = g_slist_concat (list, _g_compute_locale_variants (b));
- }
- g_strfreev (alist);
- list = g_slist_append (list, g_strdup ("C"));
-
- cache->language_names = languages = g_new (gchar *, g_slist_length (list) + 1);
- for (l = list, i = 0; l; l = l->next, i++)
- languages[i] = l->data;
- languages[i] = NULL;
-
- g_slist_free (list);
- }
-
- return (G_CONST_RETURN gchar * G_CONST_RETURN *) cache->language_names;
-}
-
-/**
- * g_strv_length:
- * @str_array: a %NULL-terminated array of strings.
- *
- * Returns the length of the given %NULL-terminated
- * string array @str_array.
- *
- * Return value: length of @str_array.
- *
- * Since: 2.6
- **/
-guint
-g_strv_length (gchar **str_array)
-{
- guint i = 0;
-
- g_return_val_if_fail (str_array != NULL, 0);
-
- while (str_array[i])
- ++i;
-
- return i;
-}
Deleted: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/glib24_26-compat.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,39 +0,0 @@
-#ifndef GLIB24_26_COMPAT_H
-#define GLIB24_26_COMPAT_H
-
-#include <glib.h>
-
-/* from glib-2.6[.6] gdate.h */
-guint g_date_get_iso8601_week_of_year (const GDate *date);
-
-/* from glib-2.6[.6] gutils.h */
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (void);
-
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else /* !G_OS_WIN32 */
-
-/* Unix */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-/* from glib-2.6[.6] gstrfuncs.h */
-guint g_strv_length (gchar **str_array);
-
-#endif // GLIB24_26_COMPAT_H
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-chart.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,10 +41,6 @@
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
const struct {
char const *name;
GogAxisSet const axis_set;
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-object.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,10 +39,6 @@
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkwidget.h>
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
GogEditor *
gog_editor_new (void)
{
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/graph/gog-plot.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -43,10 +43,6 @@
#include <gsf/gsf-impl-utils.h>
#include <string.h>
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
#define GOG_PLOT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_PLOT_TYPE, GogPlotClass))
enum {
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/gtk/goffice-gtk.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -48,15 +48,6 @@
#include <unistd.h>
#include <errno.h>
-#ifndef HAVE_GTK26
-// +jsled: maybe not needed due to cascading imports under gtk+-2.6?
-#include <gtk/gtkimage.h>
-#endif
-
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
#define PREVIEW_HSIZE 150
#define PREVIEW_VSIZE 150
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/datetime.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -14,10 +14,6 @@
#include <math.h>
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
#define SECS_PER_DAY (24 * 60 * 60)
#define HALF_SEC (0.5 / SECS_PER_DAY)
Modified: gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c
===================================================================
--- gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/goffice-0.0.4/goffice/utils/go-libxml-extras.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,10 +17,6 @@
#include <stdlib.h>
#include <math.h>
-#ifndef HAVE_GLIB26
-#include "goffice/glib24_26-compat.h"
-#endif
-
#define CC2XML(s) ((xmlChar const *)(s))
#define CXML2C(s) ((char const *)(s))
Modified: gnucash/branches/remove-group2/lib/libc/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libc/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libc/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,7 +2,7 @@
# All header files must be listed.
noinst_HEADERS = \
- localtime_r.h setenv.h strptime.h
+ localtime_r.h setenv.h strptime.h pow.h
# No sources should be listed.
libc_missing_la_SOURCES = libc-missing-noop.c
Copied: gnucash/branches/remove-group2/lib/libc/pow.h (from rev 15563, gnucash/trunk/lib/libc/pow.h)
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -70,10 +70,6 @@
# gsf-command-context.c \
# gsf-io-context.c
-if !HAVE_GLIB26
- libgsf_1_la_SOURCES += glib24_26-compat.c
-endif
-
libgsf_1_includedir = $(includedir)/libgsf-1/gsf
noinst_HEADERS = \
gsf.h \
@@ -125,10 +121,6 @@
# gsf-command-context.h \
# gsf-io-context.h
-if !HAVE_GLIB26
- noinst_HEADERS += glib24_26-compat.h
-endif
-
install-data-local: install-libtool-import-lib
uninstall-local: uninstall-libtool-import-lib
Deleted: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,204 +0,0 @@
-/** jsled, 2005-11-08: copied from glib-2.6.6 to support libgsf compilation
- against glib-2.4.14. **/
-
-#include <gsf/glib24_26-compat.h>
-
-/* gstdio.c - wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-//#include <stdio.h>
-#include <string.h>
-//#include <stdlib.h>
-
-/** ------------------------------------------------------------ **/
-/* START gconvert.c */
-
-#include <glib/gunicode.h>
-#include <glib/gconvert.h>
-#include <glib/gthread.h>
-
-typedef struct _GFilenameCharsetCache GFilenameCharsetCache;
-
-struct _GFilenameCharsetCache {
- gboolean is_utf8;
- gchar *charset;
- gchar **filename_charsets;
-};
-
-/**
- * g_get_filename_charsets:
- * @charsets: return location for the %NULL-terminated list of encoding names
- *
- * Determines the preferred character sets used for filenames.
- * The first character set from the @charsets is the filename encoding, the
- * subsequent character sets are used when trying to generate a displayable
- * representation of a filename, see g_filename_display_name().
- *
- * On Unix, the character sets are determined by consulting the
- * environment variables <envar>G_FILENAME_ENCODING</envar> and
- * <envar>G_BROKEN_FILENAMES</envar>. On Windows, the character set
- * used in the GLib API is always UTF-8 and said environment variables
- * have no effect.
- *
- * <envar>G_FILENAME_ENCODING</envar> may be set to a comma-separated list
- * of character set names. The special token "@locale" is taken to mean the
- * character set for the current locale. If <envar>G_FILENAME_ENCODING</envar>
- * is not set, but <envar>G_BROKEN_FILENAMES</envar> is, the character set of
- * the current locale is taken as the filename encoding. If neither environment
- * variable is set, UTF-8 is taken as the filename encoding, but the character
- * set of the current locale is also put in the list of encodings.
- *
- * The returned @charsets belong to GLib and must not be freed.
- *
- * Note that on Unix, regardless of the locale character set or
- * <envar>G_FILENAME_ENCODING</envar> value, the actual file names present on a
- * system might be in any random encoding or just gibberish.
- *
- * Return value: %TRUE if the filename encoding is UTF-8.
- *
- * Since: 2.6
- */
-static gboolean
-g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets)
-{
- static const gchar *charsets[] = {
- "UTF-8",
- NULL
- };
-
-#ifdef G_OS_WIN32
- /* On Windows GLib pretends that the filename charset is UTF-8 */
- if (filename_charsets)
- *filename_charsets = charsets;
-
- return TRUE;
-#else
- gboolean result;
-
- /* Cygwin works like before */
- result = g_get_charset (&(charsets[0]));
-
- if (filename_charsets)
- *filename_charsets = charsets;
-
- return result;
-#endif
-}
-
-static gchar *
-make_valid_utf8 (const gchar *name)
-{
- GString *string;
- const gchar *remainder, *invalid;
- gint remaining_bytes, valid_bytes;
-
- string = NULL;
- remainder = name;
- remaining_bytes = strlen (name);
-
- while (remaining_bytes != 0)
- {
- if (g_utf8_validate (remainder, remaining_bytes, &invalid))
- break;
- valid_bytes = invalid - remainder;
-
- if (string == NULL)
- string = g_string_sized_new (remaining_bytes);
-
- g_string_append_len (string, remainder, valid_bytes);
- g_string_append_c (string, '?');
-
- remaining_bytes -= valid_bytes + 1;
- remainder = invalid + 1;
- }
-
- if (string == NULL)
- return g_strdup (name);
-
- g_string_append (string, remainder);
- g_string_append (string, " (invalid encoding)");
-
- g_assert (g_utf8_validate (string->str, -1, NULL));
-
- return g_string_free (string, FALSE);
-}
-
-/**
- * g_filename_display_name:
- * @filename: a pathname hopefully in the GLib file name encoding
- *
- * Converts a filename into a valid UTF-8 string. The
- * conversion is not necessarily reversible, so you
- * should keep the original around and use the return
- * value of this function only for display purposes.
- * Unlike g_filename_to_utf8(), the result is guaranteed
- * to be non-NULL even if the filename actually isn't in the GLib
- * file name encoding.
- *
- * If you know the whole pathname of the file you should use
- * g_filename_display_basename(), since that allows location-based
- * translation of filenames.
- *
- * Return value: a newly allocated string containing
- * a rendition of the filename in valid UTF-8
- *
- * Since: 2.6
- **/
-gchar *
-g_filename_display_name (const gchar *filename)
-{
- gint i;
- const gchar **charsets;
- gchar *display_name = NULL;
- gboolean is_utf8;
-
- is_utf8 = g_get_filename_charsets (&charsets);
-
- if (is_utf8)
- {
- if (g_utf8_validate (filename, -1, NULL))
- display_name = g_strdup (filename);
- }
-
- if (!display_name)
- {
- /* Try to convert from the filename charsets to UTF-8.
- * Skip the first charset if it is UTF-8.
- */
- for (i = is_utf8 ? 1 : 0; charsets[i]; i++)
- {
- display_name = g_convert (filename, -1, "UTF-8", charsets[i],
- NULL, NULL, NULL);
-
- if (display_name)
- break;
- }
- }
-
- /* if all conversions failed, we replace invalid UTF-8
- * by a question mark
- */
- if (!display_name)
- display_name = make_valid_utf8 (filename);
-
- return display_name;
-}
Deleted: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/glib24_26-compat.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,79 +0,0 @@
-/* This file has been copied from glib-2.6.6 into libgsf-1.12.3 to support
- * compilation against glib-2.4.14. -- jsled, 2005-11-08
- */
-
-#ifndef __GLIB_24_26_COMPAT_H__
-#define __GLIB_24_26_COMPAT_H__
-
-#include <glib.h>
-
-// START from gstdio.h
-/* gstdio.h - GFilename wrappers for C library functions
- *
- * Copyright 2004 Tor Lillqvist
- *
- * GLib is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * GLib 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GLib; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <sys/stat.h>
-
-/* Just pass on to the system functions, so there's no potential for data
- * format mismatches, especially with large file interfaces.
- */
-
-#define g_open open
-#define g_rename rename
-#define g_mkdir mkdir
-#define g_stat stat
-#define g_lstat lstat
-#define g_unlink unlink
-#define g_remove remove
-#define g_rmdir rmdir
-#define g_fopen fopen
-#define g_freopen freopen
-
-// END from gstdio.h
-
-// START from gconvert.h
-gchar *g_filename_display_name (const gchar *filename); // G_GNUC_MALLOC;
-// END from gconvert.h
-
-/* from glib-2.6[.6] gutils.h */
-#ifdef G_OS_WIN32
-
-/* On Win32, the canonical directory separator is the backslash, and
- * the search path separator is the semicolon. Note that also the
- * (forward) slash works as directory separator.
- */
-#define G_DIR_SEPARATOR '\\'
-#define G_DIR_SEPARATOR_S "\\"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/')
-#define G_SEARCHPATH_SEPARATOR ';'
-#define G_SEARCHPATH_SEPARATOR_S ";"
-
-#else /* !G_OS_WIN32 */
-
-/* Unix */
-
-#define G_DIR_SEPARATOR '/'
-#define G_DIR_SEPARATOR_S "/"
-#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR)
-#define G_SEARCHPATH_SEPARATOR ':'
-#define G_SEARCHPATH_SEPARATOR_S ":"
-
-#endif /* !G_OS_WIN32 */
-
-#endif /* __GLIB_24_26_COMPAT_H__ */
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-memory.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,11 +26,7 @@
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-shared-memory.h>
-#ifdef HAVE_GLIB26
#include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
#ifdef HAVE_MMAP
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-input-stdio.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,11 +24,7 @@
#include <gsf/gsf-input-impl.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-utils.h>
-#ifdef HAVE_GLIB26
#include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
#include <stdio.h>
#include <errno.h>
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-stdio.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,11 +26,7 @@
#include <gsf/gsf-output-stdio.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-utils.h>
-#ifdef HAVE_GLIB26
#include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
#include <errno.h>
#ifdef HAVE_UNISTD_H
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-outfile-zip.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,10 +30,6 @@
#include <time.h>
#include <zlib.h>
-#ifndef HAVE_GLIB26
-#include <gsf/glib24_26-compat.h>
-#endif
-
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "libgsf:zip"
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-output-stdio.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,11 +24,7 @@
#include <gsf/gsf-output-impl.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-utils.h>
-#ifdef HAVE_GLIB26
#include <glib/gstdio.h>
-#else
-#include "glib24_26-compat.h"
-#endif // HAVE_GLIB26
#include <stdio.h>
#include <string.h>
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/gsf/gsf-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,10 +29,6 @@
#include <stdio.h>
#include <string.h>
-#ifndef HAVE_GLIB26
-#include <gsf/glib24_26-compat.h>
-#endif
-
/*
* Glib gets this wrong, really. ARM's floating point format is a weird
* mixture.
Modified: gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c
===================================================================
--- gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libgsf-1.12.3/tests/test-cp-zip.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,3 @@
-#ifndef HAVE_GLIB26
- #include <gsf/glib24_26-compat.h>
-#endif
-
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* test-cp-zip.c: Test gsf-outfile-zip by cloning a file the hard way
Modified: gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/backend/file/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
SUBDIRS = .
-lib_LTLIBRARIES = libgncqof-backend-qsf.la
+pkglib_LTLIBRARIES = libgncqof-backend-qsf.la
AM_CFLAGS = \
-I.. -I../.. \
Modified: gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/backend/file/qsf-backend.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -23,6 +23,7 @@
#include "config.h"
#include <glib.h>
+#include <glib/gstdio.h>
#include "qof.h"
#include "qofbackend-p.h"
#include "qof-backend-qsf.h"
@@ -205,7 +206,7 @@
if (!path) { return TRUE; }
if (0 == safe_strcmp(path, QOF_STDOUT)) { return TRUE; }
- if (stat(path, &sbuf) <0) { return FALSE; }
+ if (g_stat(path, &sbuf) <0) { return FALSE; }
if (sbuf.st_size == 0) { return TRUE; }
if(is_our_qsf_object(path)) { return TRUE; }
else if(is_qsf_object(path)) { return TRUE; }
@@ -251,7 +252,7 @@
{
FILE *f;
- f = fopen(qsf_be->fullpath, "a+");
+ f = g_fopen(qsf_be->fullpath, "a+");
if(f) {fclose(f); }
else
{
@@ -472,7 +473,7 @@
params = qsf_be->params;
params->book = book;
path = g_strdup(qsf_be->fullpath);
- f = fopen(path, "r");
+ f = g_fopen(path, "r");
if(!f) { qof_backend_set_error(be, ERR_FILEIO_READ_ERROR); }
fclose(f);
params->filepath = g_strdup(path);
@@ -1287,5 +1288,6 @@
prov->check_data_type = qsf_determine_file_type;
prov->provider_free = qsf_provider_free;
qof_backend_register_provider (prov);
+ g_module_make_resident (module);
return NULL;
}
Modified: gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libgncqof.la
+lib_LTLIBRARIES = libgnc-qof.la
-libgncqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
-libgncqof_la_LIBADD= \
+libgnc_qof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
+libgnc_qof_la_LIBADD= \
$(GLIB_LIBS) \
$(REGEX_LIBS) \
$(top_builddir)/lib/libc/libc-missing.la
@@ -10,7 +10,7 @@
$(GLIB_CFLAGS) \
-I$(top_srcdir)/lib/libc
-libgncqof_la_SOURCES = \
+libgnc_qof_la_SOURCES = \
deprecated.c \
gnc-date.c \
gnc-numeric.c \
@@ -94,3 +94,13 @@
BUILT_SOURCES = qofla-dir.h
CLEANFILES = $(BUILT_SOURCES)
+
+## For testing the qofmath128 routines
+# run "make check" (to build the test program) and then run test-qofmath
+check_PROGRAMS = test-qofmath
+test_qofmath_SOURCES=gnc-numeric.c
+test_qofmath_CPPFLAGS=$(libgnc_qof_la_CPPFLAGS) -DTEST_128_BIT_MULT
+test_qofmath_LDFLAGS=$(libgnc_qof_la_LDFLAGS)
+test_qofmath_LDADD=$(libgnc_qof_la_LIBADD)
+
+INCLUDES = -DG_LOG_DOMAIN=\"qof\"
Modified: gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/deprecated.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,23 +31,6 @@
an initializer, and can't be declared with 'static' because that
would give it internal linkage. (this is why it is deprecated) */
gint __attribute__ ((unused)) gnc_trace_num_spaces = 0;
-void gnc_log_init (void) { qof_log_init(); }
-void gnc_set_log_level(QofLogModule log_module, gncLogLevel level)
-{
- qof_log_set_level(log_module, (QofLogLevel)level);
-}
-void gnc_set_log_level_global(gncLogLevel level)
-{
- qof_log_set_level_registered((QofLogLevel)level);
-}
-void qof_log_set_level_global(QofLogLevel level)
-{
- qof_log_set_level_registered((QofLogLevel)level);
-}
-void gnc_set_logfile (FILE *outfile)
-{
- qof_log_set_file(outfile);
-}
const char * gnc_log_prettify (const char *name)
{
return qof_log_prettify(name);
@@ -55,10 +38,7 @@
void gnc_start_clock (int a, QofLogModule b, gncLogLevel c, const char *d, const char *e, ...) { }
void gnc_report_clock (int a, QofLogModule b, gncLogLevel c, const char *d, const char *e, ...) { }
void gnc_report_clock_total (int a, QofLogModule b, gncLogLevel c, const char *d, const char *e, ...) { }
-gboolean gnc_should_log(QofLogModule log_module, gncLogLevel log_level)
-{
- return qof_log_check(log_module, log_level);
-}
+
gint
gnc_engine_register_event_handler (GNCEngineEventHandler handler,
gpointer user_data)
Modified: gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/deprecated.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -66,21 +66,6 @@
/** \deprecated use qof_log_check instead. */
gboolean gnc_should_log(QofLogModule log_module, gncLogLevel log_level);
-/** \deprecated */
-#define GNC_LOG_FATAL QOF_LOG_FATAL
-/** \deprecated */
-#define GNC_LOG_ERROR QOF_LOG_ERROR
-/** \deprecated */
-#define GNC_LOG_WARNING QOF_LOG_WARNING
-/** \deprecated */
-#define GNC_LOG_INFO QOF_LOG_INFO
-/** \deprecated */
-#define GNC_LOG_DEBUG QOF_LOG_DEBUG
-/** \deprecated */
-#define GNC_LOG_DETAIL QOF_LOG_DETAIL
-/** \deprecated */
-#define GNC_LOG_TRACE QOF_LOG_TRACE
-
/** \deprecated use qof_start_clock */
void gnc_start_clock (int, QofLogModule, gncLogLevel, const char*, const char*, ...);
/** \deprecated use qof_report_clock */
Modified: gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -297,41 +297,6 @@
return(tm->tm_mday == date_get_last_mday(tm));
}
-/* Add a number of months to a time value
-
- Add a number of months to a time value, and normalize. Optionally
- also track the last day of the month, i.e. 1/31 -> 2/28 -> 3/30.
-
-param tm: base time value
-param months: The number of months to add to this time
-param track_last_day: Coerce the date value if necessary.
-
-return void
-*/
-void date_add_months (struct tm *tm, int months, gboolean track_last_day)
-{
- gboolean was_last_day;
- int new_last_mday;
-
- /* Have to do this now */
- was_last_day = date_is_last_mday(tm);
-
- /* Add in the months and normalize */
- tm->tm_mon += months;
- while (tm->tm_mon > 11) {
- tm->tm_mon -= 12;
- tm->tm_year++;
- }
-
- if (!track_last_day)
- return;
-
- /* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
- new_last_mday = date_get_last_mday(tm);
- if (was_last_day || (tm->tm_mday > new_last_mday))
- tm->tm_mday = new_last_mday;
-}
-
/* Return the set dateFormat.
return QofDateFormat: enumeration indicating preferred format
@@ -1429,61 +1394,5 @@
return mktime(&tm);
}
-gboolean
-qof_date_add_days(Timespec *ts, gint days)
-{
- struct tm tm;
- time_t tt;
-
- g_return_val_if_fail(ts, FALSE);
- tt = timespecToTime_t(*ts);
-#ifdef HAVE_GMTIME_R
- tm = *gmtime_r(&tt, &tm);
-#else
- tm = *gmtime(&tt);
-#endif
- tm.tm_mday += days;
- /* let mktime normalise the months and year
- because we aren't tracking last_day_of_month */
- tt = mktime(&tm);
- if(tt < 0) { return FALSE; }
- timespecFromTime_t(ts, tt);
- return TRUE;
-}
-
-gboolean
-qof_date_add_months(Timespec *ts, gint months, gboolean track_last_day)
-{
- struct tm tm;
- time_t tt;
- gint new_last_mday;
- gboolean was_last_day;
-
- g_return_val_if_fail(ts, FALSE);
- tt = timespecToTime_t(*ts);
-#ifdef HAVE_GMTIME_R
- tm = *gmtime_r(&tt, &tm);
-#else
- tm = *gmtime(&tt);
-#endif
- was_last_day = date_is_last_mday(&tm);
- tm.tm_mon += months;
- while (tm.tm_mon > 11) {
- tm.tm_mon -= 12;
- tm.tm_year++;
- }
- if (track_last_day) {
- /* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
- new_last_mday = date_get_last_mday(&tm);
- if (was_last_day || (tm.tm_mday > new_last_mday)) {
- tm.tm_mday = new_last_mday;
- }
- }
- tt = mktime(&tm);
- if(tt < 0) { return FALSE; }
- timespecFromTime_t(ts, tt);
- return TRUE;
-}
-
/********************** END OF FILE *********************************\
\********************************************************************/
Modified: gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/gnc-date.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -243,28 +243,6 @@
* routine might return incorrect values for dates before 1970. */
void gnc_timespec2dmy (Timespec ts, gint *day, gint *month, gint *year);
-/** \brief Add a number of days to a Timespec and normalise.
-
-Together with qof_date_add_months, replaces date_add_months.
-
-\return FALSE on error, otherwise TRUE.
-*/
-gboolean qof_date_add_days(Timespec *ts, gint days);
-
-/** \brief Add a number of months to a Timespec and normalise.
-
-Optionally track the last day of the month so that adding one
-month to 31st January returns 28th February (29th in a leap year)
-and adding three months returns 30th April.
-
-\return FALSE on error, otherwise TRUE.
-*/
-gboolean qof_date_add_months(Timespec *ts, gint months, gboolean track_last_day);
-
-/** \deprecated Add a number of months to a time value and normalize. Optionally
- * also track the last day of the month, i.e. 1/31 -> 2/28 -> 3/31. */
-void date_add_months (struct tm *tm, gint months, gboolean track_last_day);
-
/** \warning hack alert XXX FIXME -- these date routines return incorrect
* values for dates before 1970. Most of them are good only up
* till 2038. This needs fixing ...
Modified: gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/gnc-numeric.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,6 +26,9 @@
#include <glib.h>
#include <math.h>
+#ifdef G_OS_WIN32
+#include <pow.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Modified: gnucash/branches/remove-group2/lib/libqof/qof/guid.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/guid.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/guid.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,8 +31,8 @@
#include <ctype.h>
#include <dirent.h>
#include <glib.h>
+#include <glib/gstdio.h>
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
#ifdef HAVE_SYS_TIMES_H
@@ -206,7 +206,7 @@
FILE *fp;
memset(&stats, 0, sizeof(stats));
- if (stat(filename, &stats) != 0)
+ if (g_stat(filename, &stats) != 0)
return 0;
md5_process_bytes(&stats, sizeof(stats), &guid_context);
@@ -215,7 +215,7 @@
if (max_size <= 0)
return total;
- fp = fopen (filename, "r");
+ fp = g_fopen (filename, "r");
if (fp == NULL)
return total;
@@ -235,16 +235,16 @@
init_from_dir(const char *dirname, unsigned int max_files)
{
char filename[1024];
- struct dirent *de;
+ const gchar *de;
struct stat stats;
size_t total;
int result;
- DIR *dir;
+ GDir *dir;
if (max_files <= 0)
return 0;
- dir = opendir (dirname);
+ dir = g_dir_open(dirname, 0, NULL);
if (dir == NULL)
return 0;
@@ -252,20 +252,20 @@
do
{
- de = readdir(dir);
+ de = g_dir_read_name(dir);
if (de == NULL)
break;
- md5_process_bytes(de->d_name, strlen(de->d_name), &guid_context);
- total += strlen(de->d_name);
+ md5_process_bytes(de, strlen(de), &guid_context);
+ total += strlen(de);
result = snprintf(filename, sizeof(filename),
- "%s/%s", dirname, de->d_name);
+ "%s/%s", dirname, de);
if ((result < 0) || (result >= (int)sizeof(filename)))
continue;
memset(&stats, 0, sizeof(stats));
- if (stat(filename, &stats) != 0)
+ if (g_stat(filename, &stats) != 0)
continue;
md5_process_bytes(&stats, sizeof(stats), &guid_context);
total += sizeof(stats);
@@ -273,7 +273,7 @@
max_files--;
} while (max_files > 0);
- closedir(dir);
+ g_dir_close(dir);
return total;
}
@@ -519,7 +519,7 @@
{
FILE *fp;
- fp = fopen ("/dev/urandom", "r");
+ fp = g_fopen ("/dev/urandom", "r");
if (fp == NULL)
return;
Modified: gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/kvp_frame.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -65,7 +65,7 @@
#include "gnc-numeric.h"
#include "guid.h"
-#define QOF_MOD_KVP "qof-kvp"
+#define QOF_MOD_KVP "qof.kvp"
/** Opaque frame structure */
typedef struct _KvpFrame KvpFrame;
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qof.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qof.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qof.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -103,7 +103,7 @@
#include "deprecated.h"
/** allow easy logging of QSF debug messages */
-#define QOF_MOD_QSF "gncqof-backend-qsf"
+#define QOF_MOD_QSF "qof.backend.qsf"
/** allow easy loading of the QSF backend */
#define QSF_BACKEND_LIB "gncqof-backend-qsf"
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -392,10 +392,12 @@
g_return_val_if_fail(g_module_supported(), FALSE);
fullpath = g_module_build_path(directory, module_name);
backend = g_module_open(fullpath, G_MODULE_BIND_LAZY);
- if (!backend) {
+ if (!backend) {
g_message ("%s: %s\n", PACKAGE, g_module_error ());
return FALSE;
}
+
+ /* the module should have done that already in g_module_check_init */
g_module_make_resident(backend);
return TRUE;
}
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofbackend.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -46,7 +46,7 @@
#include "qofinstance.h"
-#define QOF_MOD_BACKEND "qof-backend"
+#define QOF_MOD_BACKEND "qof.backend"
/** \brief The errors that can be reported to the GUI & other front-end users
* \warning (GnuCash) If you modify QofBackendError, please update
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofbookmerge.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,7 +24,7 @@
#ifndef QOFBOOKMERGE_H
#define QOFBOOKMERGE_H
-#define QOF_MOD_MERGE "qof-merge"
+#define QOF_MOD_MERGE "qof.merge"
/** @addtogroup BookMerge
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofchoice.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -93,7 +93,7 @@
#include "qofclass.h"
#include "qofobject.h"
-#define QOF_MOD_CHOICE "qof-choice"
+#define QOF_MOD_CHOICE "qof.choice"
/** \note Choice
@{
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofclass.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -71,7 +71,7 @@
#include "qofid.h"
-#define QOF_MOD_CLASS "qof-class"
+#define QOF_MOD_CLASS "qof.class"
/** \name Core types
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofid.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofid.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofid.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -106,7 +106,7 @@
if ((da) && (!(db))) { \
val = 1; \
} \
- val; /* block assumes value of last statment */ \
+ val; /* block assumes value of last statement */ \
})
/** return TRUE if object is of the given type */
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qoflog.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -4,9 +4,10 @@
* Mon Nov 21 14:41:59 2005
* Author: Rob Clark (rclark at cs.hmc.edu)
* Copyright (C) 1997-2003 Linas Vepstas <linas at linas.org>
- * Copyright 2005 Neil Williams
- * linux at codehelp.co.uk
+ * Copyright 2005 Neil Williams <linux at codehelp.co.uk>
+ * Copyright 2007 Joshua Sled <jsled at asynchronous.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
@@ -27,14 +28,24 @@
#include "config.h"
#include <glib.h>
+#include <glib/gstdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#else
#warning unistd required.
#endif
#include <stdarg.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "qof.log"
+
+#ifndef HAVE_LOCALTIME_R
+#include "localtime_r.h"
+#endif
+
#include "qof.h"
#include "qoflog.h"
@@ -43,137 +54,159 @@
#define NUM_CLOCKS 10
static FILE *fout = NULL;
-static gchar* filename = NULL;
static gchar* function_buffer = NULL;
-static const int MAX_TRACE_FILENAME = 100;
+static gint qof_log_num_spaces = 0;
static GHashTable *log_table = NULL;
-static gint qof_log_num_spaces = 0;
+static GLogFunc previous_handler = NULL;
-/* uses the enum_as_string macro.
-Lookups are done on the string. */
-AS_STRING_FUNC(QofLogLevel, LOG_LEVEL_LIST)
-
-FROM_STRING_FUNC(QofLogLevel, LOG_LEVEL_LIST)
-
void
-qof_log_add_indent(void)
+qof_log_indent(void)
{
- qof_log_num_spaces += QOF_LOG_INDENT_WIDTH;
+ qof_log_num_spaces += QOF_LOG_INDENT_WIDTH;
}
-gint
-qof_log_get_indent(void)
+void
+qof_log_dedent(void)
{
- return qof_log_num_spaces;
+ qof_log_num_spaces
+ = (qof_log_num_spaces < QOF_LOG_INDENT_WIDTH)
+ ? 0
+ : qof_log_num_spaces - QOF_LOG_INDENT_WIDTH;
}
void
-qof_log_drop_indent(void)
+qof_log_set_file(FILE *outfile)
{
- qof_log_num_spaces = (qof_log_num_spaces < QOF_LOG_INDENT_WIDTH) ?
- 0 : qof_log_num_spaces - QOF_LOG_INDENT_WIDTH;
+ if (!outfile) { fout = stderr; return; }
+ fout = outfile;
}
-static void
-fh_printer (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
+void
+qof_log_init(void)
{
- FILE *fh = user_data;
- fprintf (fh, "%*s%s\n", qof_log_num_spaces, "", message);
- fflush(fh);
+ qof_log_init_filename(NULL);
}
-void
-qof_log_init (void)
+static void
+log4glib_handler(const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+ gpointer user_data)
{
- if(!fout) /* allow qof_log_set_file */
- {
- fout = fopen ("/tmp/qof.trace", "w");
- }
+ if (G_LIKELY(!qof_log_check(log_domain, log_level)))
+ return;
- if(!fout && (filename = (gchar *)g_malloc(MAX_TRACE_FILENAME))) {
- snprintf(filename, MAX_TRACE_FILENAME-1, "/tmp/qof.trace.%d",
- getpid());
- fout = fopen (filename, "w");
- g_free(filename);
- }
+ {
+ gboolean last_char_is_newline;
+ char timestamp_buf[10];
+ time_t now;
+ struct tm now_tm;
+ gchar *level_str = qof_log_level_to_string(log_level);
+ now = time(NULL);
+ localtime_r(&now, &now_tm);
+ strftime(timestamp_buf, 9, "%T", &now_tm);
- if(!fout)
- fout = stderr;
+ fprintf(fout, "* %s %*s <%s> %*s%s%s",
+ timestamp_buf,
+ 5, level_str,
+ (log_domain == NULL ? "" : log_domain),
+ qof_log_num_spaces, "",
+ message,
+ (g_str_has_suffix(message, "\n") ? "" : "\n"));
+ fflush(fout);
+ }
- g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, fh_printer, fout);
+ /* chain? ignore? Only chain if it's going to be quiet...
+ else
+ {
+ // chain
+ previous_handler(log_domain, log_level, message, NULL);
+ }
+ */
}
void
-qof_log_set_level(QofLogModule log_module, QofLogLevel level)
+qof_log_init_filename(const gchar* log_filename)
{
- gchar* level_string;
+ if (log_table == NULL)
+ log_table = g_hash_table_new(g_str_hash, g_str_equal);
- if(!log_module || level == 0) { return; }
- level_string = g_strdup(QofLogLevelasString(level));
- if(!log_table)
- {
- log_table = g_hash_table_new(g_str_hash, g_str_equal);
- }
- g_hash_table_insert(log_table, (gpointer)log_module, level_string);
-}
+ if (log_filename)
+ {
+ int fd;
+ gchar *fname;
-static void
-log_module_foreach(gpointer key, gpointer value, gpointer data)
-{
- g_hash_table_insert(log_table, key, data);
+ if (fout != NULL && fout != stderr && fout != stdout)
+ fclose(fout);
+
+ fname = g_strconcat(log_filename, ".XXXXXX", NULL);
+
+ if ((fd = g_mkstemp(fname)) != -1)
+ {
+ g_rename(fname, log_filename);
+ fout = fdopen(fd, "w");
+ }
+ else
+ {
+ fout = stderr;
+ }
+ g_free(fname);
+ }
+
+ if (!fout)
+ fout = stderr;
+
+ // @@fixme really, the userdata is a struct { log_table, fout, previous_handler }
+ if (previous_handler == NULL)
+ previous_handler = g_log_set_default_handler(log4glib_handler, log_table);
}
void
-qof_log_set_level_registered(QofLogLevel level)
+qof_log_shutdown (void)
{
- gchar* level_string;
+ if (fout && fout != stderr && fout != stdout)
+ {
+ fclose(fout);
+ fout = NULL;
+ }
- if(!log_table || level == 0) { return; }
- level_string = g_strdup(QofLogLevelasString(level));
- g_hash_table_foreach(log_table, log_module_foreach, level_string);
-}
+ if (function_buffer)
+ {
+ g_free(function_buffer);
+ function_buffer = NULL;
+ }
-void
-qof_log_set_file (FILE *outfile)
-{
- if(!outfile) { fout = stderr; return; }
- fout = outfile;
+ if (log_table != NULL)
+ {
+ g_hash_table_destroy(log_table);
+ log_table = NULL;
+ }
+
+ if (previous_handler != NULL)
+ {
+ g_log_set_default_handler(previous_handler, NULL);
+ previous_handler = NULL;
+ }
}
void
-qof_log_init_filename (const gchar* logfilename)
+qof_log_set_level(QofLogModule log_module, QofLogLevel level)
{
- if(!logfilename)
+ if (!log_module || level == 0) { return; }
+ if (!log_table)
{
- fout = stderr;
+ log_table = g_hash_table_new(g_str_hash, g_str_equal);
}
- else
- {
- filename = g_strdup(logfilename);
- fout = fopen(filename, "w");
- }
- qof_log_init();
+ g_hash_table_insert(log_table, (gpointer)log_module, GINT_TO_POINTER((gint)level));
}
-void
-qof_log_shutdown (void)
-{
- if(fout && fout != stderr) { fclose(fout); }
- if(filename) { g_free(filename); }
- if(function_buffer) { g_free(function_buffer); }
- g_hash_table_destroy(log_table);
-}
-
const char *
qof_log_prettify (const char *name)
{
gchar *p, *buffer;
gint length;
-
- if (!name) { return ""; }
+
+ if (!name) { return ""; }
buffer = g_strndup(name, QOF_LOG_MAX_CHARS - 1);
length = strlen(buffer);
p = g_strstr_len(buffer, length, "(");
@@ -188,6 +221,176 @@
return function_buffer;
}
+void
+qof_log_init_filename_special(const char *log_to_filename)
+{
+ if (g_ascii_strcasecmp("stderr", log_to_filename) == 0)
+ {
+ qof_log_set_file(stderr);
+ }
+ else if (g_ascii_strcasecmp("stdout", log_to_filename) == 0)
+ {
+ qof_log_set_file(stdout);
+ }
+ else
+ {
+ qof_log_init_filename(log_to_filename);
+ }
+}
+
+void
+qof_log_parse_log_config(const char *filename)
+{
+ const gchar *levels_group = "levels", *output_group = "output";
+ GError *err;
+ GKeyFile *conf = g_key_file_new();
+
+ if (!g_key_file_load_from_file(conf, filename, G_KEY_FILE_NONE, &err))
+ {
+ g_warning("unable to parse [%s]: %s", filename, err->message);
+ g_error_free(err);
+ return;
+ }
+
+ g_debug("parsing log config from [%s]", filename);
+ if (g_key_file_has_group(conf, levels_group))
+ {
+ gsize num_levels;
+ int key_idx;
+ gchar **levels;
+
+ levels = g_key_file_get_keys(conf, levels_group, &num_levels, NULL);
+
+ for (key_idx = 0; key_idx < num_levels && levels[key_idx] != NULL; key_idx++)
+ {
+ QofLogLevel level;
+ gchar *logger_name = NULL, *level_str = NULL;
+
+ logger_name = g_strdup(levels[key_idx]);
+ level_str = g_key_file_get_string(conf, levels_group, logger_name, NULL);
+ level = qof_log_level_from_string(level_str);
+
+ g_debug("setting log [%s] to level [%s=%d]", logger_name, level_str, level);
+ qof_log_set_level(logger_name, level);
+
+ g_free(level_str);
+ }
+ g_strfreev(levels);
+ }
+
+ if (g_key_file_has_group(conf, output_group))
+ {
+ gsize num_outputs;
+ int output_idx;
+ gchar **outputs;
+
+ outputs = g_key_file_get_keys(conf, output_group, &num_outputs, NULL);
+ for (output_idx = 0; output_idx < num_outputs && outputs[output_idx] != NULL; output_idx++)
+ {
+ gchar *key = outputs[output_idx];
+ gchar *value;
+
+ if (g_ascii_strcasecmp("to", key) != 0)
+ {
+ g_warning("unknown key [%s] in [outputs], skipping", key);
+ continue;
+ }
+
+ value = g_key_file_get_string(conf, output_group, key, NULL);
+ g_debug("setting [output].to=[%s]", value);
+ qof_log_init_filename_special(value);
+ g_free(value);
+ }
+ g_strfreev(outputs);
+ }
+
+ g_key_file_free(conf);
+}
+
+gboolean
+qof_log_check(QofLogModule log_domain, QofLogLevel log_level)
+{
+//#define _QLC_DBG(x) x
+#define _QLC_DBG(x)
+ GHashTable *log_levels = log_table;
+ gchar *domain_copy = g_strdup(log_domain == NULL ? "" : log_domain);
+ gchar *dot_pointer = domain_copy;
+ static const QofLogLevel default_log_thresh = QOF_LOG_WARNING;
+ QofLogLevel longest_match_level = default_log_thresh;
+
+ {
+ gpointer match_level;
+ if ((match_level = g_hash_table_lookup(log_levels, "")) != NULL)
+ longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
+ }
+
+ _QLC_DBG({ printf("trying [%s] (%d):", log_domain, g_hash_table_size(log_levels)); });
+ if (G_LIKELY(log_levels))
+ {
+ // e.g., "a.b.c" -> "a\0b.c" -> "a.b\0c", "a.b.c"
+ gpointer match_level;
+ while ((dot_pointer = g_strstr_len(dot_pointer, strlen(dot_pointer), ".")) != NULL)
+ {
+ *dot_pointer = '\0';
+ _QLC_DBG({ printf(" [%s]", domain_copy); });
+ if (g_hash_table_lookup_extended(log_levels, domain_copy, NULL, &match_level))
+ {
+ longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
+ _QLC_DBG(printf("*"););
+ }
+ *dot_pointer = '.';
+ dot_pointer++;
+ }
+
+ _QLC_DBG({ printf(" [%s]", domain_copy); });
+ if (g_hash_table_lookup_extended(log_levels, domain_copy, NULL, &match_level))
+ {
+ longest_match_level = (QofLogLevel)GPOINTER_TO_INT(match_level);
+ _QLC_DBG({ printf("*"); });
+ }
+ }
+ _QLC_DBG({ printf(" found [%d]\n", longest_match_level); });
+ g_free(domain_copy);
+
+ return log_level <= longest_match_level;
+}
+
+void
+qof_log_set_default(QofLogLevel log_level)
+{
+ qof_log_set_level("", log_level);
+ qof_log_set_level("qof", log_level);
+}
+
+gchar*
+qof_log_level_to_string(QofLogLevel log_level)
+{
+ gchar *level_str = "unknw";
+ switch (log_level)
+ {
+ case G_LOG_LEVEL_ERROR: level_str = "ERROR"; break;
+ case G_LOG_LEVEL_CRITICAL:level_str = "CRIT"; break;
+ case G_LOG_LEVEL_WARNING: level_str = "WARN"; break;
+ case G_LOG_LEVEL_MESSAGE: level_str = "MESSG"; break;
+ case G_LOG_LEVEL_INFO: level_str = "INFO"; break;
+ case G_LOG_LEVEL_DEBUG: level_str = "DEBUG"; break;
+ default: level_str = "OTHER"; break;
+ }
+ return level_str;
+}
+
+QofLogLevel
+qof_log_level_from_string(gchar *str)
+{
+ if (g_ascii_strncasecmp("error", str, 5) == 0) return QOF_LOG_FATAL;
+ if (g_ascii_strncasecmp("crit", str, 4) == 0) return QOF_LOG_ERROR;
+ if (g_ascii_strncasecmp("warn", str, 4) == 0) return QOF_LOG_WARNING;
+ if (g_ascii_strncasecmp("mess", str, 4) == 0) return G_LOG_LEVEL_MESSAGE;
+ if (g_ascii_strncasecmp("info", str, 4) == 0) return QOF_LOG_INFO;
+ if (g_ascii_strncasecmp("debug", str, 5) == 0) return QOF_LOG_DEBUG;
+ return QOF_LOG_DEBUG;
+}
+
static
struct timeval qof_clock[NUM_CLOCKS] = {
{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
@@ -305,67 +508,3 @@
fprintf (fout, "\n");
fflush (fout);
}
-
-gboolean
-qof_log_check(QofLogModule log_module, QofLogLevel log_level)
-{
- gchar* log_string;
- QofLogLevel maximum; /* Any positive log_level less than this will be logged. */
-
- log_string = NULL;
- if (log_level > QOF_LOG_TRACE) log_level = QOF_LOG_TRACE;
- if(!log_table || log_module == NULL || log_level < 0) { return FALSE; }
- log_string = (gchar*)g_hash_table_lookup(log_table, log_module);
- /* if log_module not found, do not log. */
- if(!log_string) { return FALSE; }
- maximum = QofLogLevelfromString(log_string);
- if(log_level <= maximum) { return TRUE; }
- return FALSE;
-}
-
-void qof_log_set_default(QofLogLevel log_level)
-{
- qof_log_set_level(QOF_MOD_BACKEND, log_level);
- qof_log_set_level(QOF_MOD_CLASS, log_level);
- qof_log_set_level(QOF_MOD_ENGINE, log_level);
- qof_log_set_level(QOF_MOD_OBJECT, log_level);
- qof_log_set_level(QOF_MOD_KVP, log_level);
- qof_log_set_level(QOF_MOD_MERGE, log_level);
- qof_log_set_level(QOF_MOD_QUERY, log_level);
- qof_log_set_level(QOF_MOD_SESSION, log_level);
- qof_log_set_level(QOF_MOD_CHOICE, log_level);
- qof_log_set_level(QOF_MOD_UTIL, log_level);
-}
-
-struct hash_s
-{
- QofLogCB cb;
- gpointer data;
-};
-
-static void hash_cb (gpointer key, gpointer value, gpointer data)
-{
- struct hash_s *iter;
-
- iter = (struct hash_s*)data;
- if(!iter) { return; }
- (iter->cb)(key, value, iter->data);
-}
-
-void qof_log_module_foreach(QofLogCB cb, gpointer data)
-{
- struct hash_s iter;
-
- if(!cb) { return; }
- iter.cb = cb;
- iter.data = data;
- g_hash_table_foreach(log_table, hash_cb, (gpointer)&iter);
-}
-
-gint qof_log_module_count(void)
-{
- if(!log_table) { return 0; }
- return g_hash_table_size(log_table);
-}
-
-/* ************************ END OF FILE **************************** */
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qoflog.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,11 +1,10 @@
/***************************************************************************
* qof-log.h
*
- * Mon Nov 21 14:35:26 2005
* Author: Rob Clark (rclark at cs.hmc.edu)
* Copyright (C) 1998-2003 Linas Vepstas <linas at linas.org>
- * Copyright 2005 Neil Williams
- * linux at codehelp.co.uk
+ * Copyright 2005 Neil Williams <linux at codehelp.co.uk>
+ * Copyright 2007 Joshua Sled <jsled at asynchronous.org>
****************************************************************************/
/*
* This program is free software; you can redistribute it and/or modify
@@ -36,107 +35,80 @@
#include <stdarg.h>
#include <stdio.h>
+#include <glib.h>
#include "qofutil.h"
-#define QOF_MOD_ENGINE "qof-engine"
+#define QOF_MOD_ENGINE "qof.engine"
#define LOG_LEVEL_LIST(_) \
- _(QOF_LOG_FATAL, = 0) \
- _(QOF_LOG_ERROR, = 1) \
- _(QOF_LOG_WARNING, = 2) \
- _(QOF_LOG_INFO, = 3) \
- _(QOF_LOG_DEBUG, = 4) \
- _(QOF_LOG_DETAIL, = 5) \
- _(QOF_LOG_TRACE, = 6)
+ _(QOF_LOG_FATAL, = G_LOG_LEVEL_ERROR) \
+ _(QOF_LOG_ERROR, = G_LOG_LEVEL_CRITICAL) \
+ _(QOF_LOG_WARNING, = G_LOG_LEVEL_WARNING) \
+ _(QOF_LOG_INFO, = G_LOG_LEVEL_INFO) \
+ _(QOF_LOG_DEBUG, = G_LOG_LEVEL_DEBUG)
DEFINE_ENUM (QofLogLevel, LOG_LEVEL_LIST)
-AS_STRING_DEC(QofLogLevel, LOG_LEVEL_LIST) /**< Convert QofLogLevel to a string.
+gchar* qof_log_level_to_string(QofLogLevel lvl);
+QofLogLevel qof_log_level_from_string(gchar *str);
-The macro correlates the enum value and an
-exact copy as a string, removing the need to
-keep two separate lists in sync.
-*/
+/** indents once for each ENTER macro **/
+void qof_log_indent(void);
-FROM_STRING_DEC(QofLogLevel, LOG_LEVEL_LIST) /**< Convert the
-log_string to a QofLogLevel
+/**
+ * drops back one indent for each LEAVE macro, capped at 0.
+ **/
+void qof_log_dedent(void);
-Only for use as a partner to ::QofLogLevelasString
-*/
-
-/** indents once for each ENTER macro */
-void qof_log_add_indent(void);
-
-/** gets the running total of the indent */
-gint qof_log_get_indent(void);
-
-/** drops back one indent for each LEAVE macro
-
-indent is reset to zero if less than a single indent would exist.
-*/
-void qof_log_drop_indent(void);
-
-/** Initialize the error logging subsystem
-
-\deprecated Applications need to call
-qof_log_set_file to set the output, otherwise
-the default of \a /tmp/qof.trace will be used.
-
-Instead, use qof_log_init_filename
-which sets the filename and initialises the
-logging subsystem in one operation.
-*/
+/**
+ * Initialize the error logging subsystem. Defaults to a level-threshold of
+ * "warning", and logging to stderr.
+ **/
void qof_log_init (void);
-/** Set the logging level of the given log_module.
-
-Registers the log_module with the qof_log hashtable and
-sets an initial value for the loglevel for that log_module.
-*/
+/**
+ * Set the logging level of the given log_module.
+ **/
void qof_log_set_level(QofLogModule module, QofLogLevel level);
-/** Set the logging level for all registered log_modules.
-
-\note Unless a log_module has been registered using
-qof_log_set_level, it will be unaffected by this change because
-there will be no entry in the hashtable.
-
-"silent" log_modules are supported by the qof_log_set_level_registered
-function which only moderates log_levels for those modules actually
-registered. The advantage is that a developer can omit existing
-log_modules from the init code and cut down the amount of unwanted logging.
-
-e.g. if you are working in one section of the code and do not want
-the extra log information created by allowing the default modules
-to log as well. This makes the log itself easier to use when working
-in a small area of the codebase. Silent log_modules can also be
-useful where no default currently exists - again to isolate certain
-sections of the default log output - and using qof_log_set_level_registered
-allows these silent log_modules to be retained in the code without
-being logged by other developers etc.
-*/
-void qof_log_set_level_registered(QofLogLevel level);
-
-/** Specify an alternate log output, to pipe or file.
-By default, all logging goes to /tmp/qof.trace
-
-Needs to be called \b before qof_log_init()
-\deprecated
-*/
+/**
+ * Specify an alternate log output, to pipe or file.
+ **/
void qof_log_set_file (FILE *outfile);
-/** Specify a filename for log output.
-
-Calls qof_log_init() for you.
-*/
+/**
+ * Specify a filename for log output.
+ **/
void qof_log_init_filename (const gchar* logfilename);
+/**
+ * If {@param log_to_filename} is "stderr" or "stdout" (exactly,
+ * case-insensitive), then those special files are used; otherwise, the
+ * literal filename as given, as {@link qof_log_init_filename}.
+ **/
+void qof_log_init_filename_special(const char *log_to_filename);
+
+/** Parse a log-configuration file. A GKeyFile-format file of the schema::
+ *
+ * [levels]
+ * # log.ger.path=level
+ * gnc.engine.sx=debug
+ * gnc.gui.sx=debug
+ * gnc.gui.freqspec=debug
+ * [output]
+ * # to=["stderr"|"stdout"|filename]
+ * to=stderr
+ **/
+void qof_log_parse_log_config(const char *filename);
+
/** Be nice, close the logfile if possible. */
void qof_log_shutdown (void);
-/** qof_log_prettify() cleans up subroutine names. AIX/xlC has the habit
+/**
+ * qof_log_prettify() cleans up subroutine names. AIX/xlC has the habit
* of printing signatures not names; clean this up. On other operating
- * systems, truncate name to QOF_LOG_MAX_CHARS chars. */
+ * systems, truncate name to QOF_LOG_MAX_CHARS chars.
+ **/
const gchar * qof_log_prettify (const gchar *name);
/** Do not log log_modules that have not been enabled. */
@@ -148,103 +120,70 @@
typedef void (*QofLogCB) (QofLogModule log_module, QofLogLevel* log_level,
gpointer user_data);
-/** Iterate over each known log_module
+#define PRETTY_FUNC_NAME qof_log_prettify(__FUNCTION__)
-Only log_modules with log_levels set will
-be available.
-*/
-void qof_log_module_foreach(QofLogCB cb, gpointer data);
-
-/** Number of log_modules registered*/
-gint qof_log_module_count(void);
-
-#define FUNK qof_log_prettify(__FUNCTION__)
-
-/** Log error/warning/info messages to stderr or to a file.
- * This logging infrastructure is meant for validating the
- * correctness of the execution of the code. 'Info' level
- * messages help trace program flow. 'Error' messages are
- * meant to indicate internal data inconsistencies.
- *
- * Messages can be logged to stdout, stderr, or to any desired
- * file.
- */
-
/** Log a fatal error */
-#define FATAL(format, args...) do { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \
- "Fatal Error: %s(): " format, FUNK , ## args); \
+#define FATAL(format, args...) do { \
+ g_log (log_module, G_LOG_LEVEL_FATAL, \
+ "[%s()] " format, PRETTY_FUNC_NAME , ## args); \
} while (0)
/** Log a serious error */
-#define PERR(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_ERROR)) { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
- "Error: %s(): " format, FUNK , ## args); \
- } \
+#define PERR(format, args...) do { \
+ g_log (log_module, G_LOG_LEVEL_CRITICAL, \
+ "[%s()] " format, PRETTY_FUNC_NAME , ## args); \
} while (0)
/** Log a warning */
-#define PWARN(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_WARNING)) { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, \
- "Warning: %s(): " format, FUNK , ## args); \
- } \
+#define PWARN(format, args...) do { \
+ g_log (log_module, G_LOG_LEVEL_WARNING, \
+ "[%s()] " format, PRETTY_FUNC_NAME , ## args); \
} while (0)
/** Print an informational note */
-#define PINFO(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_INFO)) { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, \
- "Info: %s(): " format, \
- FUNK , ## args); \
- } \
+#define PINFO(format, args...) do { \
+ g_log (log_module, G_LOG_LEVEL_INFO, \
+ "[%s] " format, PRETTY_FUNC_NAME , ## args); \
} while (0)
/** Print a debugging message */
-#define DEBUG(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_DEBUG)) { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
- "Debug: %s(): " format, \
- FUNK , ## args); \
- } \
+#define DEBUG(format, args...) do { \
+ g_log (log_module, G_LOG_LEVEL_DEBUG, \
+ "[%s] " format, PRETTY_FUNC_NAME , ## args); \
} while (0)
/** Print a function entry debugging message */
-#define ENTER(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_DEBUG)) { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
- "Enter in %s: %s()" format, __FILE__, \
- FUNK , ## args); \
- qof_log_add_indent(); \
- } \
+#define ENTER(format, args...) do { \
+ if (qof_log_check(log_module, G_LOG_LEVEL_DEBUG)) { \
+ g_log (log_module, G_LOG_LEVEL_DEBUG, \
+ "[enter %s:%s()] " format, __FILE__, \
+ PRETTY_FUNC_NAME , ## args); \
+ qof_log_indent(); \
+ } \
} while (0)
-/** Print a function exit debugging message */
-#define LEAVE(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_DEBUG)) { \
- qof_log_drop_indent(); \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
- "Leave: %s()" format, \
- FUNK , ## args); \
- } \
-} while (0)
+#define gnc_leave_return_val_if_fail(test, val) do { \
+ if (! (test)) { LEAVE(""); } \
+ g_return_val_if_fail(test, val); \
+} while (0);
-/** Print a function trace debugging message */
-#define TRACE(format, args...) do { \
- if (qof_log_check (log_module, QOF_LOG_TRACE)) { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
- "Trace: %s(): " format, FUNK , ## args); \
- } \
-} while (0)
+#define gnc_leave_return_if_fail(test) do { \
+ if (! (test)) { LEAVE(""); } \
+ g_return_if_fail(test); \
+} while (0);
-#define DEBUGCMD(x) do { \
- if (qof_log_check (log_module, QOF_LOG_DEBUG)) { \
- (x); \
- } \
+/** Print a function exit debugging message */
+#define LEAVE(format, args...) do { \
+ if (qof_log_check(log_module, G_LOG_LEVEL_DEBUG)) { \
+ qof_log_dedent(); \
+ g_log (log_module, G_LOG_LEVEL_DEBUG, \
+ "[leave %s()] " format, \
+ PRETTY_FUNC_NAME , ## args); \
+ } \
} while (0)
/* -------------------------------------------------------- */
+
/** Infrastructure to make timing measurements for critical pieces
* of code. Used for only for performance tuning & debugging.
*/
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofmath128.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -329,10 +329,13 @@
#ifdef TEST_128_BIT_MULT
+
static void pr (gint64 a, gint64 b)
{
qofint128 prod = mult128 (a,b);
- printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " (0x%llx %llx) %hd\n",
+ printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " = %"
+ G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " (0x%"
+ G_GINT64_MODIFIER "x %" G_GINT64_MODIFIER "x) %hd\n",
a, b, prod.hi, prod.lo, prod.hi, prod.lo, prod.isbig);
}
@@ -341,15 +344,24 @@
qofint128 prod = mult128 (a,b);
qofint128 quot = div128 (prod, c);
gint64 rem = rem128 (prod, c);
- printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " + %" G_GINT64_FORMAT " (0x%llx %llx) %hd\n",
+ printf ("%" G_GINT64_FORMAT " * %" G_GINT64_FORMAT " / %" G_GINT64_FORMAT
+ " = %" G_GUINT64_FORMAT " %" G_GUINT64_FORMAT " + %"
+ G_GINT64_FORMAT " (0x%" G_GINT64_MODIFIER "x %"
+ G_GINT64_MODIFIER "x) %hd\n",
a, b, c, quot.hi, quot.lo, rem, quot.hi, quot.lo, quot.isbig);
}
int main ()
{
+ gint64 x;
+ qofint128 n;
+ gint64 d;
+ qofint128 quot;
+ int i;
+
pr (2,2);
- gint64 x = 1<<30;
+ x = 1<<30;
x <<= 2;
pr (x,x);
@@ -366,7 +378,7 @@
pr (x,x);
pr (x,-x);
- pr (1000000, 10000000000000);
+ pr (1000000, G_GINT64_CONSTANT(10000000000000));
prd (x,x,2);
prd (x,x,3);
@@ -384,17 +396,16 @@
prd (1111,x,11);
/* Really test division */
- qofint128 n;
n.hi = 0xdd91;
n.lo = 0x6c5abefbb9e13480ULL;
- gint64 d = 0x2ae79964d3ae1d04ULL;
+ d = 0x2ae79964d3ae1d04ULL;
- int i;
for (i=0; i<20; i++) {
- qofint128 quot = div128 (n, d);
- printf ("%d result = %llx %llx\n", i, quot.hi, quot.lo);
+ quot = div128 (n, d);
+ printf ("%d result = %" G_GINT64_MODIFIER "x %" G_GINT64_MODIFIER "x\n",
+ i, quot.hi, quot.lo);
d >>=1;
n = shift128 (n);
}
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofobject.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -58,7 +58,7 @@
*/
#define QOF_OBJECT_VERSION 3
-#define QOF_MOD_OBJECT "qof-object"
+#define QOF_MOD_OBJECT "qof.object"
typedef struct _QofObject QofObject;
typedef void (*QofForeachCB) (gpointer obj, gpointer user_data);
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofquery.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -709,7 +709,8 @@
}
/* Maybe log this sucker */
- if (qof_log_check (log_module, QOF_LOG_DETAIL)) qof_query_print (q);
+ if (qof_log_check (log_module, QOF_LOG_DEBUG))
+ qof_query_print (q);
/* Now run the query over all the objects and save the results */
{
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofquery.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -79,7 +79,7 @@
#include "qofquerycore.h"
#include "qofchoice.h"
-#define QOF_MOD_QUERY "qof-query"
+#define QOF_MOD_QUERY "qof.query"
/** A Query */
typedef struct _QofQuery QofQuery;
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofsession.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -103,7 +103,7 @@
#include "qofclass.h"
#include "qofobject.h"
-#define QOF_MOD_SESSION "qof-session"
+#define QOF_MOD_SESSION "qof.session"
/* PROTOTYPES ******************************************************/
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofsql.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -884,7 +884,7 @@
qof_query_set_book (query->qof_query, query->book);
/* Maybe log this sucker */
- if (gnc_should_log (log_module, GNC_LOG_DETAIL))
+ if (qof_should_log (log_module, QOF_LOG_DEBUG))
{
qof_query_print (query->qof_query);
}
@@ -911,7 +911,7 @@
qof_query_set_book (query->qof_query, query->book);
/* Maybe log this sucker */
- if (gnc_should_log (log_module, GNC_LOG_DETAIL))
+ if (qof_should_log (log_module, QOF_LOG_DEBUG))
{
qof_query_print (query->qof_query);
}
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofutil.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -545,6 +545,7 @@
void
qof_init (void)
{
+ qof_log_init();
qof_util_get_string_cache ();
guid_init ();
qof_object_initialize ();
@@ -559,6 +560,7 @@
qof_object_shutdown ();
guid_shutdown ();
qof_util_string_cache_destroy ();
+ qof_log_shutdown();
}
/* ************************ END OF FILE ***************************** */
Modified: gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h
===================================================================
--- gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/lib/libqof/qof/qofutil.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -56,7 +56,7 @@
# endif
#endif
-#define QOF_MOD_UTIL "qof-utilities"
+#define QOF_MOD_UTIL "qof.utilities"
/** \name typedef enum as string macros
@{
Modified: gnucash/branches/remove-group2/macros/ac_pkg_swig.m4
===================================================================
--- gnucash/branches/remove-group2/macros/ac_pkg_swig.m4 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/macros/ac_pkg_swig.m4 2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,7 +28,7 @@
AC_DEFUN([AC_PROG_SWIG],[
AC_PATH_PROG([SWIG],[swig])
if test -z "$SWIG" ; then
- AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+ AC_MSG_ERROR([cannot find 'swig' program. You should look at http://www.swig.org])
SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
elif test -n "$1" ; then
AC_MSG_CHECKING([for SWIG version])
Modified: gnucash/branches/remove-group2/macros/binreloc.m4
===================================================================
--- gnucash/branches/remove-group2/macros/binreloc.m4 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/macros/binreloc.m4 2007-02-11 19:54:51 UTC (rev 15565)
@@ -20,8 +20,10 @@
AC_CHECK_FILE([/proc/self/maps])
AC_CACHE_CHECK([whether everything is installed to the same prefix],
[br_cv_valid_prefixes], [
+ # datarootdir variables was introduced with autoconf-2.60
if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
- "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+ \( "$datadir" = '${prefix}/share' -o \( "$datadir" = '${datarootdir}' -a "$datarootdir" = '${prefix}/share' \) \) -a \
+ "$libdir" = '${exec_prefix}/lib' -a \
"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
then
br_cv_valid_prefixes=yes
Modified: gnucash/branches/remove-group2/packaging/gnucash.spec.in
===================================================================
--- gnucash/branches/remove-group2/packaging/gnucash.spec.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/gnucash.spec.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -50,7 +50,6 @@
BuildRequires: bzip2-devel, expat-devel, guile-devel
BuildRequires: libglade2-devel, libgsf-devel
BuildRequires: libjpeg-devel, openssl-devel
-BuildRequires: libtool-ltdl-devel
%description
GnuCash is a personal finance manager. A check-book like
@@ -207,7 +206,6 @@
%files devel
%defattr(444,root,root,755)
%{_includedir}/gnucash
-%{_datadir}/aclocal/gnucash.m4
%if %{_with_ofx}
%files ofx
Modified: gnucash/branches/remove-group2/packaging/win32/README
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/README 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/README 2007-02-11 19:54:51 UTC (rev 15565)
@@ -7,7 +7,7 @@
Before you start with the automated build, you have to complete these
steps manually. The directory variables are set in custom.sh.
-* Download MSYS (but *only* msys, no mingw and no msysdtk)
+* Download MSYS (but *only* msys; no mingw and no msysdtk)
from http://www.mingw.org/download.shtml -> Current -> MSYS -> (bin, *.exe)
to $DOWNLOAD_DIR
@@ -18,24 +18,34 @@
from http://www.mingw.org/download.shtml -> Current -> mingwPORT -> (bin, wget-*)
to $DOWNLOAD_DIR
-* Adjust installer.sh and/or custom.sh. Especially in the latter you
- can comment out those build steps that have been completed already
- and/or should not be performed now. If you want verbose output of
- any script step, change the first line in install.sh and add the
- "-x" switch.
+* Adjust custom.sh (install.sh doesn't need to be changed). In
+ custom.sh you should adapt the directory variables. If you want to,
+ you could also comment out those build steps that have been
+ completed already and/or should not be performed now, although the
+ script is quite intelligent not to duplicate already completed
+ work. If you want verbose output of any script step, change the
+ first line in install.sh and add the "-x" switch.
-Start/Enter any MSYS shell. Let the automated build begin by:
+Start/Enter any MSYS shell window. Let the automated build begin by:
$INSTALLER_DIR/install.sh
Good luck!
+To generate a self-installing setup.exe file that contains
+*everything*, run the following command after install.sh has
+completed:
+
+ $INSTALLER_DIR/dist.sh
+
More information is collected on http://wiki.gnucash.org/wiki/Windows
+
--------------------------
Cross-compiling a Windows/mingw32 executable of GnuCash on a Linux
-host system.
+host system. (Note: This used to work unchangedly in Sept'2006 but
+probably not any longer.)
These steps need to be performed:
@@ -53,13 +63,12 @@
adjust the directories in custom.sh according to your
preferred installation, especially $GLOBAL_DIR.
-3. Download the binary windows packages for "guile" and "g-wrap"
- from http://www.tu-harburg.de/~et2cs/gnc/ and unpack them into
- the directories $GUILE_DIR and $GWRAP_DIR as given in
- custom.sh. (This is done because the build system for guile and
- g-wrap doesn't support cross-compiling.)
+3. Download a binary windows packages for "guile" e.g. from
+ http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
+ directory $GUILE_DIR as given in custom.sh. (This is done because
+ the build system for guile doesn't support cross-compiling.)
-4. Call install.sh which will read the directory settings from
+4. Call install.sh, which will read the directory settings from
custom.sh. It should download, compile, and install everything
automatically. Eventually the windows gnucash is installed into
$GNUCASH_DIR.
Modified: gnucash/branches/remove-group2/packaging/win32/custom.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/custom.sh 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/custom.sh 2007-02-11 19:54:51 UTC (rev 15565)
@@ -9,6 +9,8 @@
GNUCASH_DIR=$GLOBAL_DIR\\gnucash
REPOS_URL="http://svn.gnucash.org/repo/gnucash/trunk"
REPOS_DIR=$GNUCASH_DIR\\repos
+# keep this pointing from BUILD_DIR to REPOS_DIR
+REL_REPOS_DIR=..\\repos
BUILD_DIR=$GNUCASH_DIR\\build
INSTALL_DIR=$GNUCASH_DIR\\inst
@@ -37,14 +39,21 @@
fi
####
+# If "yes", build without optimizations (-O0) and ease debugging
+DISABLE_OPTIMIZATIONS=no
+
MSYS_DIR=$GLOBAL_DIR\\msys
-WGET_DIR=$GLOBAL_DIR\\wget
+# tools here means binaries runnable without other DLLs or data files
+TOOLS_DIR=$GLOBAL_DIR\\tools
+WGET_DIR=$TOOLS_DIR
#WGET=
SF_MIRROR="http://heanet.dl.sourceforge.net/sourceforge"
GTK_MIRROR="ftp.gtk.org/pub"
GNOME_MIRROR="ftp.gnome.org/pub/gnome"
+GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32"
+GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies"
DTK_URL="$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
@@ -52,20 +61,17 @@
MINGW_DIR=$GLOBAL_DIR\\mingw
UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
-UNZIP_DIR=$GLOBAL_DIR\\unzip
+UNZIP_DIR=$TOOLS_DIR
# do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
-REGEX_BIN_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-bin.zip"
-REGEX_LIB_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-lib.zip"
+REGEX_URL="$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
+REGEX_DEV_URL="$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip"
REGEX_DIR=$GLOBAL_DIR\\regex
READLINE_BIN_URL="$SF_MIRROR/gnuwin32/readline-5.0-bin.zip"
READLINE_LIB_URL="$SF_MIRROR/gnuwin32/readline-5.0-lib.zip"
READLINE_DIR=$GLOBAL_DIR\\readline
-INDENT_BIN_URL="$SF_MIRROR/gnuwin32/indent-2.2.9-bin.zip"
-INDENT_DIR=$GLOBAL_DIR\\indent
-
ACTIVE_PERL_URL="http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
ACTIVE_PERL_DIR=$GLOBAL_DIR\\active-perl
@@ -78,22 +84,24 @@
SLIB_URL="http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
GUILE_DIR=$GLOBAL_DIR\\guile
-OPENSSL_URL="http://www.slproweb.com/download/Win32OpenSSL-0_9_8d.exe"
+OPENSSL_BIN_URL="$SF_MIRROR/gnuwin32/openssl-0.9.7c-bin.zip"
+OPENSSL_LIB_URL="$SF_MIRROR/gnuwin32/openssl-0.9.7c-lib.zip"
OPENSSL_DIR=$GLOBAL_DIR\\openssl
PEXPORTS_URL="http://www.emmestech.com/software/cygwin/pexports-0.43/pexports-0.43.zip"
-PEXPORTS_DIR=$GLOBAL_DIR\\pexports
+PEXPORTS_DIR=$TOOLS_DIR
+EXETYPE_SCRIPT=`pwd`/exetype.pl
+EXETYPE_DIR=$TOOLS_DIR
+
LIBXML2_URL="http://www.zlatkovic.com/pub/libxml/libxml2-2.6.27.win32.zip"
LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS
-GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32"
-GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies"
GETTEXT_URL="$GNOME_WIN32_DEPS_URL/gettext-0.14.5.zip"
GETTEXT_DEV_URL="$GNOME_WIN32_DEPS_URL/gettext-dev-0.14.5.zip"
LIBICONV_URL="$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.4.zip"
-GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.4.zip"
+GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.9.zip"
+GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.9.zip"
LIBJPEG_URL="$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip"
LIBPNG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
ZLIB_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
@@ -103,16 +111,16 @@
EXPAT_URL="$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip"
FONTCONFIG_URL="$GNOME_WIN32_DEPS_URL/fontconfig-2.3.2-tml-20060825.zip"
FONTCONFIG_DEV_URL="$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.3.2-tml-20060825.zip"
-FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.1.10.zip"
-FREETYPE_DEV_URL="$SF_MIRROR/gnuwin32/freetype-2.1.10-lib.zip"
+FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.2.1.zip"
+FREETYPE_DEV_URL="$GNOME_WIN32_DEPS_URL/freetype-dev-2.2.1.zip"
ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.3.zip"
ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.3.zip"
-PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.5.zip"
-PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.5.zip"
+PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.9.zip"
+PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.9.zip"
LIBART_LGPL_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.17.zip"
LIBART_LGPL_DEV_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.17.zip"
-GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.6.zip"
-GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.6.zip"
+GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.9.zip"
+GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.9.zip"
INTLTOOL_URL="$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.0.zip"
ORBIT2_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-2.13.3.zip"
ORBIT2_DEV_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-dev-2.13.3.zip"
@@ -124,8 +132,8 @@
GCONF_DEV_URL="$GNOME_WIN32_URL/GConf/2.14/GConf-dev-2.14.0.zip"
LIBBONOBO_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-2.16.0.zip"
LIBBONOBO_DEV_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-dev-2.16.0.zip"
-GNOME_VFS_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2.zip"
-GNOME_VFS_DEV_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2.zip"
+GNOME_VFS_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2-no-openssl.zip"
+GNOME_VFS_DEV_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2-no-openssl.zip"
LIBGNOME_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-2.16.0-1.zip"
LIBGNOME_DEV_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-dev-2.16.0.zip"
LIBGNOMECANVAS_URL="$GNOME_WIN32_URL/libgnomecanvas/2.14/libgnomecanvas-2.14.0.zip"
@@ -140,8 +148,8 @@
LIBGNOMEPRINT_DEV_URL="$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip"
LIBGNOMEPRINTUI_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip"
LIBGNOMEPRINTUI_DEV_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip"
-GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.0.zip"
-GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.0.zip"
+GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip"
+GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip"
GNOME_DIR=$GLOBAL_DIR\\gnome
SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip"
@@ -158,12 +166,29 @@
GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
GLADE_DIR=$GLOBAL_DIR\\glade
-INNO_URL="http://files.jrsoftware.org/ispack/ispack-5.1.9.exe"
+INNO_URL="http://files.jrsoftware.org/is/5/isetup-5.1.9.exe"
INNO_DIR=$GLOBAL_DIR\\inno
SVN_URL="http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
SVN_DIR=$GLOBAL_DIR\\svn
+# OFX import in gnucash and ofx directconnect support for aqbanking
+OPENSP_URL="$SF_MIRROR/openjade/OpenSP-1.5.2.tar.gz"
+OPENSP_DIR=$GLOBAL_DIR\\opensp
+OPENSP_PATCH=`pwd`/opensp-1.5.2-patch.diff
+
+LIBOFX_URL="$SF_MIRROR/libofx/libofx-0.8.3.tar.gz"
+LIBOFX_DIR=$GLOBAL_DIR\\libofx
+LIBOFX_PATCH=`pwd`/libofx-0.8.3-patch.diff
+
+## online banking: gwenhywfar+aqbanking
+GWENHYWFAR_URL="$SF_MIRROR/gwenhywfar/gwenhywfar-2.5.3.tar.gz"
+GWENHYWFAR_DIR=$GLOBAL_DIR\\gwenhywfar
+
+AQBANKING_URL="$SF_MIRROR/aqbanking/aqbanking-2.2.7.tar.gz"
+AQBANKING_DIR=$GLOBAL_DIR\\aqbanking
+##
+
# There is no reason to ever need to comment these out!
# * commented out glade, as it is not needed to run gnucash
if test x$cross_compile != xyes ; then
@@ -174,7 +199,6 @@
fi
add_step inst_regex
add_step inst_readline
-add_step inst_indent
if test x$cross_compile != xyes ; then
add_step inst_active_perl
fi
@@ -184,12 +208,19 @@
add_step inst_openssl
fi
add_step inst_pexports
+add_step inst_exetype
add_step inst_libxml2
add_step inst_gnome
add_step inst_swig
add_step inst_libgsf
add_step inst_goffice
#add_step inst_glade
+add_step inst_opensp
+add_step inst_libofx
+## Online banking:
+add_step inst_gwenhywfar
+add_step inst_aqbanking
+##
if test x$cross_compile != xyes ; then
add_step inst_inno
fi
Modified: gnucash/branches/remove-group2/packaging/win32/dist.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/dist.sh 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/dist.sh 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,22 +25,28 @@
_AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
_GUILE_UDIR=`unix_path $GUILE_DIR`
_WIN_UDIR=`unix_path $WINDIR`
+ _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
_LIBXML2_UDIR=`unix_path $LIBXML2_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
+ _OPENSP_UDIR=`unix_path $OPENSP_DIR`
+ _LIBOFX_UDIR=`unix_path $LIBOFX_DIR`
+ _GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
+ _AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
_GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_INNO_UDIR=`unix_path $INNO_DIR`
add_to_env $_UNZIP_UDIR/bin PATH # unzip
add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
+ add_to_env $_EXETYPE_UDIR/bin PATH # exetype
}
function dist_regex() {
setup RegEx
- smart_wget $REGEX_BIN_URL $DOWNLOAD_DIR
- unzip -q $LAST_FILE bin/regex.dll -d $DIST_DIR
+ smart_wget $REGEX_URL $DOWNLOAD_DIR
+ unzip -q $LAST_FILE bin/libgnurx-0.dll -d $DIST_DIR
}
function dist_autotools() {
@@ -61,8 +67,9 @@
function dist_openssl() {
setup OpenSSL
+ _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
mkdir -p $DIST_UDIR/bin
- cp -a $_WIN_UDIR/system32/lib{eay,ssl}*.dll $DIST_UDIR/bin
+ cp -a $_OPENSSL_UDIR/bin/lib{eay,ssl}*.dll $DIST_UDIR/bin
}
function dist_libxml2() {
@@ -127,6 +134,32 @@
cp -a $_GOFFICE_UDIR/share/{goffice,pixmaps} $DIST_UDIR/share
}
+function dist_libofx() {
+ setup OpenSP and LibOFX
+ cp -a ${_OPENSP_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_OPENSP_UDIR}/share/OpenSP ${DIST_UDIR}/share
+ cp -a ${_LIBOFX_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+ cp -a ${_LIBOFX_UDIR}/share/libofx ${DIST_UDIR}/share
+}
+
+function dist_gwenhywfar() {
+ setup gwenhywfar
+ cp -a ${_GWENHYWFAR_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ mkdir -p ${DIST_UDIR}/etc
+ cp -a ${_GWENHYWFAR_UDIR}/etc/* ${DIST_UDIR}/etc
+ cp -a ${_GWENHYWFAR_UDIR}/lib/gwenhywfar ${DIST_UDIR}/lib
+}
+
+function dist_aqbanking() {
+ setup aqbanking
+ cp -a ${_AQBANKING_UDIR}/bin/*.exe ${DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/bin/*.dll ${DIST_UDIR}/bin
+ cp -a ${_AQBANKING_UDIR}/lib/aqbanking ${DIST_UDIR}/lib
+ cp -a ${_AQBANKING_UDIR}/share/aqbanking ${DIST_UDIR}/share
+ cp -a ${_AQBANKING_UDIR}/share/aqhbci ${DIST_UDIR}/share
+}
+
function dist_gnucash() {
setup GnuCash
mkdir -p $DIST_UDIR/bin
@@ -134,10 +167,10 @@
mkdir -p $DIST_UDIR/etc/gconf/schemas
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/lib/{bin,locale} $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/lib/lib*.{dll,la} $DIST_UDIR/lib
+ cp -a $_INSTALL_UDIR/lib/locale $DIST_UDIR/lib
+ cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
mkdir -p $DIST_UDIR/lib/gnucash
- cp -a $_INSTALL_UDIR/lib/gnucash/lib*.{dll,la} $DIST_UDIR/lib/gnucash
+ cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,pixmaps,xml} $DIST_UDIR/share
@@ -152,15 +185,27 @@
--install-schema-file $file >/dev/null
echo "done"
done
+ gconftool-2 --shutdown
+ exetype $DIST_UDIR/libexec/gconfd-2.exe windows
+
# Strip redirections in distributed libtool .la files
- for file in `find $DIST_UDIR/lib -name '*.la'`; do
+ for file in $DIST_UDIR/lib/*.la; do
cat $file | sed 's,^libdir=,#libdir=,' > $file.new
mv $file.new $file
done
- echo "You can now run the Inno Setup Compiler for creating the setup.exe:"
- echo ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/gnucash.iss
+ echo "Now running the Inno Setup Compiler for creating the setup.exe"
+ ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/gnucash.iss
+
+ # And changing output filename
+ SVN_REV=`grep GNUCASH_SVN_REV ${_BUILD_UDIR}/src/gnome-utils/gnc-svninfo.h | cut -d" " -f3 | cut -d\" -f2 `
+ SETUP_FILENAME="gnucash-2.0.99-svn-r${SVN_REV}-setup.exe"
+ qpushd ${_GNUCASH_UDIR}
+ mv gnucash-2.0.99-setup.exe ${SETUP_FILENAME}
+ qpopd
+ echo "Final resulting Setup program is:"
+ echo ${_GNUCASH_UDIR}/${SETUP_FILENAME}
}
prepare
@@ -172,6 +217,9 @@
dist_gnome
dist_libgsf
dist_goffice
+dist_libofx
+dist_gwenhywfar
+dist_aqbanking
dist_gnucash
finish
qpopd
Copied: gnucash/branches/remove-group2/packaging/win32/exetype.pl (from rev 15563, gnucash/trunk/packaging/win32/exetype.pl)
Modified: gnucash/branches/remove-group2/packaging/win32/functions
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/functions 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/functions 2007-02-11 19:54:51 UTC (rev 15565)
@@ -79,6 +79,9 @@
fi
}
+function assert_one_dir() {
+ [ -d $@ ] || die "Detected multiple directories where only one was expected; please delete all but the latest one: $@"
+}
### Local Variables: ***
### mode: shell-script ***
Modified: gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/gnucash.iss.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -76,12 +76,37 @@
; Define the registry keys Setup should create (HKCU = HKEY_CURRENT_USER)
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Registry]
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"
-Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"
+Root: HKCU; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "pkglibdir"; ValueData: "{app}\lib\@PACKAGE@"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\GnuCash\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+; Additionally, we have to install the paths for gwenhywfar
+Root: HKCU; Subkey: "Software\Gwenhywfar"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "prefix"; ValueData: "{app}"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "libdir"; ValueData: "{app}\lib"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "plugindir"; ValueData: "{app}\lib\gwenhywfar\plugins\38"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Gwenhywfar\Paths"; ValueType: string; ValueName: "localedir"; ValueData: "{app}\share\locale"; Flags: uninsdeletevalue
+
+; And we also need some registry keys for aqbanking
+Root: HKCU; Subkey: "Software\Aqbanking"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "providerdir"; ValueData: "{app}\lib\aqbanking\plugins\16\providers"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "bankinfodir"; ValueData: "{app}\lib\aqbanking\plugins\16\bankinfo"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "importerdir"; ValueData: "{app}\lib\aqbanking\plugins\16\imexporters"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "pkgdatadir"; ValueData: "{app}\share\aqbanking"; Flags: uninsdeletevalue
+Root: HKCU; Subkey: "Software\Aqbanking\Paths"; ValueType: string; ValueName: "sysconfdir"; ValueData: "{app}\etc"; Flags: uninsdeletevalue
+
+; And even one for aqhbci
+Root: HKCU; Subkey: "Software\AqHbci"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\AqHbci\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\AqHbci\Paths"; ValueType: string; ValueName: "xmldatadir"; ValueData: "{app}\share\aqhbci\xml"; Flags: uninsdeletevalue
+
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -89,6 +114,7 @@
Type: files; Name: "{app}\bin\gnucash.bat"
Type: files; Name: "{app}\bin\guile.bat"
Type: files; Name: "{app}\share\guile\1.6\slibcat"
+Type: filesandordirs; Name: "{app}\share\guile"
Type: filesandordirs; Name: "{app}\etc\gconf"
Type: dirifempty; Name: "{app}\etc"
@@ -125,7 +151,7 @@
{ Create the gnucash.bat file; #10 is the linefeed character and #13 CR }
FileName := appdir + '\bin\gnucash.bat' ;
- FileString := 'set PATH=' + appdir + '\bin;' + libdir + '\bin;%PATH%'#13#10 ;
+ FileString := 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;
FileString := FileString + 'set GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
Modified: gnucash/branches/remove-group2/packaging/win32/install.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/install.sh 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/install.sh 2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,14 +37,14 @@
level1=$(basename ${_REPOS_UDIR})
level2=$(basename $(dirname ${_REPOS_UDIR}))"/"$level1
for mydir in $level0 $level1 $level2; do
- if [ -f $mydir/gnucash.m4 ]; then
+ if [ -f $mydir/make-gnucash-patch.in ]; then
die "Do not save install.sh in the repository or one its parent directories"
fi
done
- # Remove old empty install-sh files
- if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh &>/dev/null | wc -l)" -eq 0 ]; then
- rm -f ${_REPOS_UDIR}/install-sh
- fi
+# # Remove old empty install-sh files
+# if [ -f ${_REPOS_UDIR}/install-sh -a "$(cat ${_REPOS_UDIR}/install-sh &>/dev/null | wc -l)" -eq 0 ]; then
+# rm -f ${_REPOS_UDIR}/install-sh
+# fi
# Partially remove RegEx-GNU if installed
_REGEX_UDIR=`unix_path $REGEX_DIR`
if [ -f ${_REGEX_UDIR}/contrib/regex-0.12-GnuWin32.README ]; then
@@ -59,20 +59,24 @@
TMP_UDIR=`unix_path $TMP_DIR`
mkdir -p $TMP_UDIR
mkdir -p $DOWNLOAD_UDIR
+
+ if [ "$DISABLE_OPTIMIZATIONS" = "yes" ]; then
+ export CFLAGS="$CFLAGS -g -O0"
+ fi
}
function inst_wget() {
setup Wget
_WGET_UDIR=`unix_path $WGET_DIR`
+ add_to_env $_WGET_UDIR/bin PATH
if quiet $_WGET_UDIR/wget --version || quiet wget --version
then
echo "already installed. skipping."
else
- mkdir -p $_WGET_UDIR
- tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $WGET_DIR
- cp $_WGET_UDIR/*/*/wget.exe $WGET_DIR
+ mkdir -p $_WGET_UDIR/bin
+ tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $_WGET_UDIR
+ cp $_WGET_UDIR/*/*/wget.exe $_WGET_UDIR/bin
fi
- add_to_env $_WGET_UDIR PATH
quiet wget --version || die "wget unavailable"
}
@@ -84,8 +88,7 @@
echo "msys dtk already installed. skipping."
else
smart_wget $DTK_URL $DOWNLOAD_DIR
- echo "!!! When asked for an installation path, specify $MSYS_DIR !!!"
- $LAST_FILE
+ $LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
for file in \
/bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
/share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool}
@@ -118,21 +121,21 @@
function inst_unzip() {
setup Unzip
_UNZIP_UDIR=`unix_path $UNZIP_DIR`
+ add_to_env $_UNZIP_UDIR/bin PATH
if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
then
echo "unzip already installed. skipping."
else
smart_wget $UNZIP_URL $DOWNLOAD_DIR
- echo "!!! When asked for an installation path, specify $UNZIP_DIR !!!"
- $LAST_FILE
+ $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
fi
- add_to_env $_UNZIP_UDIR/bin PATH
quiet unzip --help || die "unzip unavailable"
}
function inst_regex() {
setup RegEx
_REGEX_UDIR=`unix_path $REGEX_DIR`
+ add_to_env -lregex REGEX_LDFLAGS
add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS
add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS
add_to_env $_REGEX_UDIR/bin PATH
@@ -141,10 +144,10 @@
echo "regex already installed. skipping."
else
mkdir -p $_REGEX_UDIR
- wget_unpacked $REGEX_BIN_URL $DOWNLOAD_DIR $REGEX_DIR
- wget_unpacked $REGEX_LIB_URL $DOWNLOAD_DIR $REGEX_DIR
+ wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR
+ wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR
fi
- quiet ${LD} $REGEX_LDFLAGS -lregex -o $TMP_UDIR/ofile || die "regex not installed correctly"
+ quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly"
}
function inst_readline() {
@@ -164,20 +167,6 @@
quiet ${LD} $READLINE_LDFLAGS -lreadline -o $TMP_UDIR/ofile || die "readline not installed correctly"
}
-function inst_indent() {
- setup Indent
- _INDENT_UDIR=`unix_path $INDENT_DIR`
- add_to_env $_INDENT_UDIR/bin PATH
- if quiet which indent
- then
- echo "indent already installed. skipping."
- else
- mkdir -p $_INDENT_UDIR
- wget_unpacked $INDENT_BIN_URL $DOWNLOAD_DIR $INDENT_DIR
- fi
- quiet which indent || die "indent unavailable"
-}
-
function inst_active_perl() {
setup ActivePerl \(intltool\)
_ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
@@ -208,12 +197,14 @@
else
wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/autoconf-*
qpushd $TMP_UDIR/autoconf-*
echo "building autoconf..."
./configure --prefix=$_AUTOTOOLS_UDIR
make
make install
qpopd
+ assert_one_dir $TMP_UDIR/automake-*
qpushd $TMP_UDIR/automake-*
echo "building automake..."
./configure --prefix=$_AUTOTOOLS_UDIR
@@ -226,9 +217,10 @@
echo "libtool/libtoolize already installed. skipping."
else
wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libtool-*
qpushd $TMP_UDIR/libtool-*
echo "building libtool..."
- ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR
+ ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR --disable-static
make
make install
qpopd
@@ -258,6 +250,7 @@
smart_wget $SLIB_URL $DOWNLOAD_DIR
_SLIB_BALL=$LAST_FILE
tar -xzpf $_GUILE_BALL -C $TMP_UDIR
+ assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-*
qpushd ice-9
cp boot-9.scm boot-9.scm.bak
@@ -275,6 +268,7 @@
touch upstream/ltdl.c.diff
qpopd
./configure ${HOST_XCOMPILE} \
+ --disable-static \
--disable-elisp \
--disable-networking \
--disable-dependency-tracking \
@@ -283,7 +277,7 @@
-C --prefix=$_GUILE_WFSDIR \
ac_cv_func_regcomp_rx=yes \
CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \
- LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex"
+ LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}"
cp config.status config.status.bak
cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status
./config.status
@@ -291,7 +285,7 @@
cp Makefile Makefile.bak
cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile
qpopd
- make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex -no-undefined -avoid-version"
+ make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version"
make install
qpopd
_SLIB_DIR=$_GUILE_UDIR/share/guile/1.*
@@ -318,15 +312,24 @@
function inst_openssl() {
setup OpenSSL
- if [ -f $WINDIR\\system32\\libssl32.dll ]
- then
+ _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
+ add_to_env $_OPENSSL_UDIR/bin PATH
+ # Make sure the files of Win32OpenSSL-0_9_8d are really gone!
+ if test -f $_OPENSSL_UDIR/unins000.exe ; then
+ die "Wrong version of OpenSSL installed! Run $_OPENSSL_UDIR/unins000.exe and start install.sh again."
+ fi
+ if [ -f $WINDIR\\system32\\libssl32.dll -o -f $WINDIR\\system32\\libeay32.dll ] ; then
+ die "You have uninstalled the Win32OpenSSL-0_9_8d version of OpenSSL, but its DLLs libssl32.dll, libeay32.dll, and ssleay32.dll are still existing in $WINDIR\\system32. You have to delete (or rename) them manually. However, if you know these DLLs are needed by some other package, please contact the gnucash authors so that we can adapt this script."
+ fi
+
+ if test -f ${_OPENSSL_UDIR}/lib/libssl.dll.a ; then
echo "openssl already installed. skipping."
else
- smart_wget $OPENSSL_URL $DOWNLOAD_DIR
- echo "!!! When asked for an installation path, specify $OPENSSL_DIR !!!"
- $LAST_FILE
+ mkdir -p ${_OPENSSL_UDIR}
+ wget_unpacked $OPENSSL_BIN_URL $DOWNLOAD_DIR $OPENSSL_DIR
+ wget_unpacked $OPENSSL_LIB_URL $DOWNLOAD_DIR $OPENSSL_DIR
fi
- [ -f $WINDIR\\system32\\libssl32.dll ] || die "openssl not installed correctly"
+ test -f ${_OPENSSL_UDIR}/lib/libssl.dll.a || die "openssl not installed correctly"
}
function inst_pexports() {
@@ -339,19 +342,33 @@
else
wget_unpacked $PEXPORTS_URL $DOWNLOAD_DIR $PEXPORTS_DIR
qpushd $PEXPORTS_DIR
- mv pexports-* mydir
- mv mydir/* .
- rmdir mydir
+ mkdir -p $_PEXPORTS_UDIR/bin
+ cp pexports-*/bin/* $_PEXPORTS_UDIR/bin
if test x$cross_compile = xyes ; then
- cd src
+ cd pexports-*/src
make
- cp pexports.exe ../bin/pexports
+ cp pexports.exe ../../bin/pexports
fi
qpopd
fi
quiet which pexports || die "pexports unavailable"
}
+function inst_exetype() {
+ setup exetype
+ _EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
+ add_to_env $_EXETYPE_UDIR/bin PATH
+ if quiet which exetype
+ then
+ echo "exetype already installed. skipping."
+ else
+ mkdir -p $_EXETYPE_UDIR/bin
+ cp $EXETYPE_SCRIPT $_EXETYPE_UDIR/bin/exetype
+ fi
+ quiet which exetype || die "exetype unavailable"
+}
+
+
function inst_libxml2() {
setup LibXML2
_LIBXML2_UDIR=`unix_path $LIBXML2_DIR`
@@ -464,6 +481,10 @@
mv libz.dll.a ../lib
qpopd
fi
+ if [ ! -f libexec/gconfd-2.console.exe ]; then
+ cp libexec/gconfd-2.exe libexec/gconfd-2.console.exe
+ exetype libexec/gconfd-2.exe windows
+ fi
# work around a bug in msys bash, adding 0x01 smilies
cat > bin/pkg-config-msys.sh <<EOF
#!/bin/sh
@@ -475,20 +496,6 @@
fi
\${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res
EOF
- _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'`
- cat > lib/pkgconfig/freetype2.pc <<EOF
-prefix=/ignore
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: FreeType 2
-Description: A free, high-quality, and portable font engine.
-Version: $_FREETYPE_VERSION
-Requires:
-Libs: -L\${libdir} -lfreetype -lz
-Cflags: -I\${includedir}/freetype2
-EOF
qpopd
fi
if test x$cross_compile = xyes ; then
@@ -537,9 +544,11 @@
echo "libgsf already installed. skipping."
else
wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libgsf-*
qpushd $TMP_UDIR/libgsf-*
./configure ${HOST_XCOMPILE} \
--prefix=$_LIBGSF_UDIR \
+ --disable-static \
--without-python \
CPPFLAGS="${GNOME_CPPFLAGS}" \
LDFLAGS="${GNOME_LDFLAGS}"
@@ -553,6 +562,7 @@
function inst_goffice() {
setup GOffice
_GOFFICE_UDIR=`unix_path $GOFFICE_DIR`
+ add_to_env $_GOFFICE_UDIR/bin PATH
add_to_env $_GOFFICE_UDIR/lib/pkgconfig PKG_CONFIG_PATH
if quiet ${PKG_CONFIG} --exists libgoffice-0.3
then
@@ -561,6 +571,7 @@
rm -rf $TMP_UDIR/goffice-*
wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
mydir=`pwd`
+ assert_one_dir $TMP_UDIR/goffice-*
qpushd $TMP_UDIR/goffice-*
[ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
patch -p1 < $GOFFICE_PATCH
@@ -589,6 +600,7 @@
echo "glade already installed. skipping."
else
wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/glade3-*
qpushd $TMP_UDIR/glade3-*
./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
make
@@ -607,13 +619,165 @@
echo "Inno Setup Compiler already installed. Skipping."
else
smart_wget $INNO_URL $DOWNLOAD_DIR
- echo "!!! When asked for the installation path, specify $INNO_DIR !!!"
- echo "!!! Also, you can deselect all optional components."
- $LAST_FILE
+ $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
fi
quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
}
+function inst_opensp() {
+ setup Opensp
+ _OPENSP_UDIR=`unix_path ${OPENSP_DIR}`
+ add_to_env ${_OPENSP_UDIR}/bin PATH
+ if test -f ${_OPENSP_UDIR}/bin/libosp-5.dll
+ then
+ echo "Opensp already installed. Skipping."
+ else
+ wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/OpenSP-*
+ qpushd $TMP_UDIR/OpenSP-*
+ [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
+ patch -p0 < $OPENSP_PATCH
+ automake lib/Makefile
+ ./configure \
+ --prefix=${_OPENSP_UDIR} \
+ --disable-doc-build --disable-static
+ # On many windows machines, none of the programs will
+ # build, but we only need the library, so ignore the rest.
+ make all-am
+ make -C lib
+ make -i
+ make -i install
+ qpopd
+ fi
+ test -f ${_OPENSP_UDIR}/bin/libosp-5.dll || die "Opensp not installed correctly"
+}
+
+function inst_libofx() {
+ setup Libofx
+ _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
+ add_to_env ${_LIBOFX_UDIR}/bin PATH
+ add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ if quiet ${PKG_CONFIG} --exists libofx
+ then
+ echo "Libofx already installed. Skipping."
+ else
+ wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/libofx-*
+ qpushd $TMP_UDIR/libofx-*
+ [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \
+ patch -p1 < $LIBOFX_PATCH
+ ./configure \
+ --prefix=${_LIBOFX_UDIR} \
+ --with-opensp-includes=${_OPENSP_UDIR}/include/OpenSP \
+ --with-opensp-libs=${_OPENSP_UDIR}/lib \
+ CPPFLAGS="-DOS_WIN32" \
+ --disable-static
+ make LDFLAGS="${LDFLAGS} -no-undefined"
+ make install
+ qpopd
+ fi
+ quiet ${PKG_CONFIG} --exists libofx || die "Libofx not installed correctly"
+}
+
+function inst_gwenhywfar() {
+ setup Gwenhywfar
+ _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
+ add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
+ add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env "-I $_GWENHYWFAR_UDIR/share/aclocal" ACLOCAL_FLAGS
+ if quiet ${PKG_CONFIG} --exists gwenhywfar
+ then
+ echo "Gwenhywfar already installed. Skipping."
+ else
+ wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/gwenhywfar-*
+ qpushd $TMP_UDIR/gwenhywfar-*
+ ./configure \
+ --with-openssl-includes=$_OPENSSL_UDIR/include \
+ ssl_libraries="-L${_OPENSSL_UDIR}/lib" \
+ ssl_lib="-lcrypto -lssl" \
+ --prefix=$_GWENHYWFAR_UDIR \
+ CPPFLAGS="${REGEX_CPPFLAGS}" \
+ LDFLAGS="${REGEX_LDFLAGS}"
+ make
+ make check
+ make install
+ qpopd
+ fi
+ ${PKG_CONFIG} --exists gwenhywfar || die "Gwenhywfar not installed correctly"
+}
+
+function inst_qt4() {
+ # This section is not a full install, but the .la creation is
+ # already useful in itself and that's why it has already been
+ # added.
+
+ _QTDIR=`unix_path ${QTDIR}`
+ # This section creates .la files for the Qt-4 DLLs so that
+ # libtool correctly links to the DLLs.
+ if test ! -f ${_QTDIR}/lib/libQtCore4.la ; then
+ qpushd ${_QTDIR}/lib
+ for A in lib*.a; do
+ LIBBASENAME=`basename ${A} .a`
+ OUTFILE="${LIBBASENAME}.la"
+ BASENAME=`echo ${LIBBASENAME} | sed -e"s/lib//" `
+ DLLNAME="${BASENAME}.dll"
+
+ # Create la file
+ echo "# Generated by foo bar libtool" > $OUTFILE
+ echo "dlname='../bin/${DLLNAME}'" >> $OUTFILE
+ echo "library_names='${DLLNAME}'" >> $OUTFILE
+ echo "libdir='${_QTDIR}/bin'" >> $OUTFILE
+ done
+ qpopd
+ fi
+}
+
+function inst_aqbanking() {
+ setup AqBanking
+ _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
+ add_to_env ${_AQBANKING_UDIR}/bin PATH
+ add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
+ add_to_env "-I $_AQBANKING_UDIR/share/aclocal" ACLOCAL_FLAGS
+ if quiet ${PKG_CONFIG} --exists aqbanking
+ then
+ echo "AqBanking already installed. Skipping."
+ else
+ wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
+ assert_one_dir $TMP_UDIR/aqbanking-*
+ qpushd $TMP_UDIR/aqbanking-*
+ if test x$aqbanking_with_qt = xyes; then
+ inst_qt4
+ _QTDIR=`unix_path ${QTDIR}`
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
+ ./configure \
+ --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-frontends="cbanking qbanking" \
+ --with-backends="aqdtaus aqhbci aqofxconnect" \
+ CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+ LDFLAGS="${_AQ_LDFLAGS}" \
+ qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
+ qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
+ --prefix=${_AQBANKING_UDIR}
+ make qt4-port
+ make clean
+ else
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
+ ./configure \
+ --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+ --with-frontends="cbanking" \
+ --with-backends="aqdtaus aqhbci aqofxconnect" \
+ CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+ LDFLAGS="${_AQ_LDFLAGS}" \
+ --prefix=${_AQBANKING_UDIR}
+ fi
+ make LDFLAGS="${_AQ_LDFLAGS} -no-undefined"
+ make install
+ qpopd
+ fi
+ ${PKG_CONFIG} --exists aqbanking || die "AqBanking not installed correctly"
+}
+
function inst_svn() {
setup Subversion
_SVN_UDIR=`unix_path $SVN_DIR`
@@ -623,8 +787,7 @@
echo "subversion already installed. skipping."
else
smart_wget $SVN_URL $DOWNLOAD_DIR
- echo "!!! When asked for an installation path, specify $SVN_DIR !!!"
- $LAST_FILE
+ $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
fi
}
@@ -648,8 +811,16 @@
_INSTALL_WFSDIR=`win_fs_path $INSTALL_DIR`
_INSTALL_UDIR=`unix_path $INSTALL_DIR`
_BUILD_UDIR=`unix_path $BUILD_DIR`
+ _REL_REPOS_UDIR=`unix_path $REL_REPOS_DIR`
mkdir -p $_BUILD_UDIR
+ add_to_env $_INSTALL_UDIR/bin PATH
+ # When aqbanking is enabled, uncomment this:
+ AQBANKING_OPTIONS="--enable-hbci --with-aqbanking-dir=${_AQBANKING_UDIR}"
+ AQBANKING_UPATH="${_OPENSSL_UDIR}/bin:${_GWENHYWFAR_UDIR}/bin:${_AQBANKING_UDIR}/bin"
+ AQBANKING_PATH="${OPENSSL_DIR}\\bin;${GWENHYWFAR_DIR}\\bin;${AQBANKING_DIR}\\bin"
+ LIBOFX_OPTIONS="--enable-ofx --with-ofx-prefix=${_LIBOFX_UDIR}"
+
qpushd $REPOS_DIR
if test "x$cross_compile" = xyes ; then
# Set these variables manually because of cross-compiling
@@ -664,10 +835,12 @@
qpopd
qpushd $BUILD_DIR
- $_REPOS_UDIR/configure ${HOST_XCOMPILE} ${TARGET_XCOMPILE} \
+ $_REL_REPOS_UDIR/configure ${HOST_XCOMPILE} ${TARGET_XCOMPILE} \
--prefix=$_INSTALL_WFSDIR \
--enable-debug \
--enable-schemas-install=no \
+ ${LIBOFX_OPTIONS} \
+ ${AQBANKING_OPTIONS} \
--enable-binreloc \
CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} -D_WIN32" \
LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS}" \
@@ -675,10 +848,6 @@
# Windows DLLs don't need relinking
grep -v "need_relink=yes" libtool > libtool.new ; mv libtool.new libtool
- # Exclude (for now) the test subdirectories from the build
- # because executable linking is so painfully slow on mingw
- perl -pi.instbak -e's#^(SUBDIRS.* )test( .*)?$#\1\2#' `find src -name Makefile`
- find src -name Makefile.instbak -exec rm {} \;
make
@@ -686,17 +855,25 @@
qpushd src/bin
rm gnucash
make PATH_SEPARATOR=";" \
- bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib/bin:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin" \
+ bindir="${_INSTALL_UDIR}/bin:${_INSTALL_UDIR}/lib:${_INSTALL_UDIR}/lib/gnucash:${_GOFFICE_UDIR}/bin:${_LIBGSF_UDIR}/bin:${_GNOME_UDIR}/bin:${_LIBXML2_UDIR}/bin:${_GUILE_UDIR}/bin:${_REGEX_UDIR}/bin:${_AUTOTOOLS_UDIR}/bin:${AQBANKING_UPATH}" \
gnucash
qpopd
make install
qpopd
- qpushd $_INSTALL_UDIR/lib/gnucash
- # Remove the dependency_libs line from the installed .la files
- # because otherwise loading the modules literally takes hours.
- for A in *.la; do grep -v dependency_libs $A > tmp ; mv tmp $A; done
+ qpushd $_INSTALL_UDIR/lib
+ # Move modules that are compiled without -module to lib/gnucash and
+ # correct the 'dlname' in the libtool archives. We do not use these
+ # files to dlopen the modules, so actually this is unneeded.
+ # Also, in all installed .la files, remove the dependency_libs line
+ mv bin/*.dll gnucash || true
+ for A in gnucash/*.la; do
+ sed '/dependency_libs/d;s#../bin/##' $A > tmp ; mv tmp $A
+ done
+ for A in *.la; do
+ sed '/dependency_libs/d' $A > tmp ; mv tmp $A
+ done
qpopd
qpushd $_INSTALL_UDIR/etc/gconf/schemas
@@ -710,7 +887,7 @@
# Create a startup script that works without the msys shell
qpushd $_INSTALL_UDIR/bin
- echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;%PATH%" > gnucash.bat
+ echo "set PATH=${INSTALL_DIR}\\bin;${INSTALL_DIR}\\lib;${INSTALL_DIR}\\lib\\gnucash;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;${AQBANKING_PATH};%PATH%" > gnucash.bat
echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
echo "set GNC_MODULE_PATH=${INSTALL_DIR}\\lib\\gnucash" >> gnucash.bat
echo "set GUILE_LOAD_PATH=${INSTALL_DIR}\\share\\gnucash\\guile-modules;${INSTALL_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat
Copied: gnucash/branches/remove-group2/packaging/win32/libofx-0.8.3-patch.diff (from rev 15563, gnucash/trunk/packaging/win32/libofx-0.8.3-patch.diff)
Copied: gnucash/branches/remove-group2/packaging/win32/opensp-1.5.2-patch.diff (from rev 15563, gnucash/trunk/packaging/win32/opensp-1.5.2-patch.diff)
Modified: gnucash/branches/remove-group2/packaging/win32/reset.sh
===================================================================
--- gnucash/branches/remove-group2/packaging/win32/reset.sh 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/packaging/win32/reset.sh 2007-02-11 19:54:51 UTC (rev 15565)
@@ -33,7 +33,7 @@
basedir=`unix_path $GLOBAL_DIR`
qpushd $basedir
-rm -rf regex readline indent guile pexports gnome swig autotools
+rm -rf regex readline guile pexports gnome swig autotools
rm -rf libgsf goffice glade gnucash tmp
rm -f /etc/profile.d/installer.sh
Modified: gnucash/branches/remove-group2/po/de.po
===================================================================
--- gnucash/branches/remove-group2/po/de.po 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/po/de.po 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: gnucash-2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 22:29+0200\n"
-"PO-Revision-Date: 2006-07-04 22:30+0200\n"
+"POT-Creation-Date: 2007-01-28 21:37+0100\n"
+"PO-Revision-Date: 2007-01-29 15:00+0100\n"
"Last-Translator: Christian Stimming <stimming at tuhh.de>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
@@ -62,83 +62,100 @@
#. Translators: For the following strings, the single letters
#. after the colon are abbreviations of the word before the
#. colon. You should only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:515
+#: ../src/app-utils/gnc-ui-util.c:508
msgid "not cleared:n"
msgstr "not cleared:n"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:517
+#: ../src/app-utils/gnc-ui-util.c:510
msgid "cleared:c"
msgstr "cleared:b"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:519
+#: ../src/app-utils/gnc-ui-util.c:512
msgid "reconciled:y"
msgstr "reconciled:j"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:521
+#: ../src/app-utils/gnc-ui-util.c:514
msgid "frozen:f"
msgstr "frozen:f"
#. Translators: Please only translate the letter *after* the colon.
-#: ../src/app-utils/gnc-ui-util.c:523
+#: ../src/app-utils/gnc-ui-util.c:516
msgid "void:v"
msgstr "void:u"
-#: ../src/app-utils/gnc-ui-util.c:564 ../src/gnome/dialog-chart-export.c:44
+#: ../src/app-utils/gnc-ui-util.c:557 ../src/gnome/dialog-chart-export.c:44
msgid "Opening Balances"
msgstr "Anfangsbestand"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/app-utils/gnc-ui-util.c:567
-#: ../src/import-export/qif/qif-defaults.c:60 ../intl-scm/guile-strings.c:1840
-#: ../intl-scm/guile-strings.c:3082 ../intl-scm/guile-strings.c:3084
-#: ../intl-scm/guile-strings.c:3104 ../intl-scm/guile-strings.c:3106
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/app-utils/gnc-ui-util.c:560
+#: ../src/import-export/qif/qif-defaults.c:60 ../intl-scm/guile-strings.c:3174
+#: ../intl-scm/guile-strings.c:4324 ../intl-scm/guile-strings.c:5750
+#: ../intl-scm/guile-strings.c:5752 ../intl-scm/guile-strings.c:5772
+#: ../intl-scm/guile-strings.c:5774 ../intl-scm/guile-strings.c:5794
+#: ../intl-scm/guile-strings.c:5796
msgid "Retained Earnings"
msgstr "Gewinnrücklagen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../src/app-utils/gnc-ui-util.c:640 ../src/engine/Account.c:2141
-#: ../src/register/ledger-core/split-register.c:2029
-#: ../intl-scm/guile-strings.c:1838
+#: ../src/app-utils/gnc-ui-util.c:633 ../src/engine/Account.c:2144
+#: ../src/register/ledger-core/split-register.c:2051
+#: ../intl-scm/guile-strings.c:3172 ../intl-scm/guile-strings.c:4322
msgid "Equity"
msgstr "Eigenkapital"
-#: ../src/app-utils/gnc-ui-util.c:700 ../src/gnome/dialog-chart-export.c:45
-#: ../src/gnome/druid-hierarchy.c:905 ../src/gnome/glade/account.glade.h:48
-#: ../src/gnome-utils/dialog-account.c:267
+#: ../src/app-utils/gnc-ui-util.c:693 ../src/gnome/dialog-chart-export.c:45
+#: ../src/gnome/druid-hierarchy.c:921 ../src/gnome/glade/account.glade.h:41
+#: ../src/gnome-utils/dialog-account.c:269
msgid "Opening Balance"
msgstr "Anfangsbestand"
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../src/app-utils/guile-util.c:1099
-#: ../src/register/ledger-core/split-register.c:1879
-#: ../intl-scm/guile-strings.c:1268 ../intl-scm/guile-strings.c:1456
-#: ../intl-scm/guile-strings.c:2260 ../intl-scm/guile-strings.c:2572
+#: ../src/app-utils/guile-util.c:1086
+#: ../src/register/ledger-core/split-register.c:1901
+#: ../intl-scm/guile-strings.c:1980 ../intl-scm/guile-strings.c:2166
+#: ../intl-scm/guile-strings.c:2604 ../intl-scm/guile-strings.c:2790
+#: ../intl-scm/guile-strings.c:3594 ../intl-scm/guile-strings.c:3906
+#: ../intl-scm/guile-strings.c:4744 ../intl-scm/guile-strings.c:5056
msgid "Debit"
msgstr "Soll"
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../src/app-utils/guile-util.c:1137
-#: ../src/register/ledger-core/split-register.c:1902
-#: ../src/register/ledger-core/split-register.c:1977
-#: ../src/register/ledger-core/split-register.c:1993
-#: ../src/register/ledger-core/split-register.c:2011
-#: ../intl-scm/guile-strings.c:1270 ../intl-scm/guile-strings.c:1458
-#: ../intl-scm/guile-strings.c:2262 ../intl-scm/guile-strings.c:2574
+#: ../src/app-utils/guile-util.c:1121
+#: ../src/register/ledger-core/split-register.c:1924
+#: ../src/register/ledger-core/split-register.c:1999
+#: ../src/register/ledger-core/split-register.c:2015
+#: ../src/register/ledger-core/split-register.c:2033
+#: ../intl-scm/guile-strings.c:1982 ../intl-scm/guile-strings.c:2168
+#: ../intl-scm/guile-strings.c:2606 ../intl-scm/guile-strings.c:2792
+#: ../intl-scm/guile-strings.c:3596 ../intl-scm/guile-strings.c:3908
+#: ../intl-scm/guile-strings.c:4746 ../intl-scm/guile-strings.c:5058
msgid "Credit"
msgstr "Haben"
-#: ../src/app-utils/option-util.c:1734
+#: ../src/app-utils/option-util.c:1699
#, c-format
msgid ""
"There is a problem with option %s:%s.\n"
@@ -155,178 +172,179 @@
"wird verwendet. "
#: ../src/backend/postgres/PostgresBackend.c:1988
-#: ../src/backend/postgres/putil.c:78 ../src/backend/postgres/putil.c:104
-#: ../src/backend/postgres/putil.c:146
+#: ../src/backend/postgres/putil.c:79 ../src/backend/postgres/putil.c:105
+#: ../src/backend/postgres/putil.c:147
#, c-format
msgid "From the Postgresql Server: %s"
msgstr "Fehlermeldung vom Postgresql Server: %s"
-#: ../src/backend/postgres/putil.c:56 ../src/backend/postgres/upgrade.c:398
+#: ../src/backend/postgres/putil.c:57 ../src/backend/postgres/upgrade.c:398
msgid "Backend connection is not available"
msgstr "Postgresql-Verbindung nicht verfügbar"
-#: ../src/backend/postgres/putil.c:65
+#: ../src/backend/postgres/putil.c:66
msgid "Query could not be executed"
msgstr "SQL-Abfrage konnte nicht ausgeführt werden"
-#: ../src/bin/gnucash-bin.c:73
+#: ../src/bin/gnucash-bin.c:82
msgid "This is a development version. It may or may not work.\n"
msgstr ""
"Diese Version befindet sich noch in Entwicklung.\n"
"Sie kann funktionieren, muss aber nicht.\n"
-#: ../src/bin/gnucash-bin.c:74
+#: ../src/bin/gnucash-bin.c:83
msgid "Report bugs and other problems to gnucash-devel at gnucash.org.\n"
msgstr ""
"Fehler und andere Probleme werden auf gnucash-devel at gnucash.org diskutiert.\n"
-#: ../src/bin/gnucash-bin.c:75
+#: ../src/bin/gnucash-bin.c:84
msgid "You can also lookup and file bug reports at http://bugzilla.gnome.org\n"
msgstr ""
"Fehlerberichte können auf http://bugzilla.gnome.org eingeschickt werden.\n"
-#: ../src/bin/gnucash-bin.c:76
+#: ../src/bin/gnucash-bin.c:85
msgid "The last stable version was "
msgstr "Die letzte stabile Version war: "
-#: ../src/bin/gnucash-bin.c:77
+#: ../src/bin/gnucash-bin.c:86
msgid "The next stable version will be "
msgstr "Die nächste stabile Version wird sein: "
-#: ../src/bin/gnucash-bin.c:218 ../src/bin/gnucash-bin.c:266
+#: ../src/bin/gnucash-bin.c:204
msgid "Show GnuCash version"
msgstr "GnuCash Version anzeigen"
-#: ../src/bin/gnucash-bin.c:220 ../src/bin/gnucash-bin.c:268
+#: ../src/bin/gnucash-bin.c:206
msgid "Enable debugging mode"
msgstr "Debug-Modus aktivieren"
#. Translators: This is the command line option autohelp
#. text; see popt(3)
-#: ../src/bin/gnucash-bin.c:224 ../src/bin/gnucash-bin.c:272
+#: ../src/bin/gnucash-bin.c:210
msgid "Set the logging level from 0 (least) to 6 (most)"
msgstr "Logging-Level wählen, von 0 (am wenigsten) bis 6 (am meisten)"
-#. Translators: Argument description for autohelp; see popt(3)
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:226 ../src/bin/gnucash-bin.c:275
+#: ../src/bin/gnucash-bin.c:213
msgid "LOGLEVEL"
msgstr "LOGLEVEL"
-#: ../src/bin/gnucash-bin.c:228 ../src/bin/gnucash-bin.c:277
+#: ../src/bin/gnucash-bin.c:215
msgid "Do not load the last file opened"
msgstr "Zuletzt geöffnete Datei nicht öffnen"
-#: ../src/bin/gnucash-bin.c:230 ../src/bin/gnucash-bin.c:279
+#: ../src/bin/gnucash-bin.c:217
msgid "Set configuration path"
msgstr "Konfigurations-Pfad setzen"
-#. Translators: Argument description for autohelp; see popt(3)
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:232 ../src/bin/gnucash-bin.c:282
+#: ../src/bin/gnucash-bin.c:220
msgid "CONFIGPATH"
msgstr "CONFIGPFAD"
-#: ../src/bin/gnucash-bin.c:234 ../src/bin/gnucash-bin.c:284
+#: ../src/bin/gnucash-bin.c:222
msgid "Set shared data file search path"
msgstr "Systemweiten Suchpfad für architekturunabhängige Dateien setzen"
-#. Translators: Argument description for autohelp; see popt(3)
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:236 ../src/bin/gnucash-bin.c:287
+#: ../src/bin/gnucash-bin.c:225
msgid "SHAREPATH"
msgstr "SHAREPFAD"
#. src/scm/command-line.scm
-#: ../src/bin/gnucash-bin.c:238 ../src/bin/gnucash-bin.c:289
-#: ../intl-scm/guile-strings.c:6
+#: ../src/bin/gnucash-bin.c:227 ../intl-scm/guile-strings.c:6
msgid "Set the search path for documentation files"
msgstr "Suchpfad für Hilfedateien setzen"
-#. Translators: Argument description for autohelp; see popt(3)
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:240 ../src/bin/gnucash-bin.c:292
+#: ../src/bin/gnucash-bin.c:230
msgid "DOCPATH"
msgstr "DOCPFAD"
-#: ../src/bin/gnucash-bin.c:242 ../src/bin/gnucash-bin.c:294
+#: ../src/bin/gnucash-bin.c:232
msgid "Add price quotes to given GnuCash datafile"
msgstr "Börsenkurse zu angegebener Datei hinzufügen"
-#. Translators: Argument description for autohelp; see popt(3)
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:244 ../src/bin/gnucash-bin.c:297
+#: ../src/bin/gnucash-bin.c:235
msgid "FILE"
msgstr "DATEI"
-#: ../src/bin/gnucash-bin.c:246 ../src/bin/gnucash-bin.c:299
+#: ../src/bin/gnucash-bin.c:237
msgid ""
"Regular expression determining which namespace commodities will be retrieved"
msgstr ""
"Regulärer Ausdruck für den Namensstandard, in dem die Aktienkurse geholt "
"werden sollen"
-#. Translators: Argument description for autohelp; see popt(3)
#. Translators: Argument description for autohelp; see
#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../src/bin/gnucash-bin.c:248 ../src/bin/gnucash-bin.c:302
+#: ../src/bin/gnucash-bin.c:240
msgid "REGEXP"
msgstr "REGEXP"
#. Translators: %s is the version number
-#: ../src/bin/gnucash-bin.c:322
+#: ../src/bin/gnucash-bin.c:259
#, c-format
msgid "GnuCash %s development version"
msgstr "GnuCash Entwicklungsversion %s"
#. Translators: %s is the version number
-#: ../src/bin/gnucash-bin.c:325
+#: ../src/bin/gnucash-bin.c:262
#, c-format
msgid "GnuCash %s"
msgstr "GnuCash %s"
#. Translators: 1st %s is the build date; 2nd %s is the SVN
#. revision number
-#: ../src/bin/gnucash-bin.c:329
+#: ../src/bin/gnucash-bin.c:266
#, c-format
msgid "Built %s from r%s"
msgstr "Build vom %s, Revision r%s"
-#: ../src/bin/gnucash-bin.c:405
+#: ../src/bin/gnucash-bin.c:337
msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
msgstr ""
"Keine Kurse abgerufen. Modul Finance::Quote ist nicht korrekt installiert.\n"
#. Install Price Quote Sources
-#: ../src/bin/gnucash-bin.c:458
+#: ../src/bin/gnucash-bin.c:419
msgid "Checking Finance::Quote..."
msgstr "Modul Finance::Quote prüfen..."
-#: ../src/bin/gnucash-bin.c:465
+#: ../src/bin/gnucash-bin.c:426
msgid "Loading data..."
msgstr "Daten laden..."
#. src/app-utils/prefs.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-core/gncInvoice.c:589
-#: ../src/business/business-gnome/business-gnome-utils.c:219
-#: ../src/business/business-gnome/dialog-invoice.c:2410
-#: ../src/business/business-gnome/dialog-invoice.c:2492
-#: ../src/business/business-gnome/glade/invoice.glade.h:13
+#: ../src/business/business-core/gncInvoice.c:594
+#: ../src/business/business-gnome/business-gnome-utils.c:221
+#: ../src/business/business-gnome/dialog-invoice.c:2405
+#: ../src/business/business-gnome/dialog-invoice.c:2487
+#: ../src/business/business-gnome/glade/invoice.glade.h:12
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:316
-#: ../src/register/ledger-core/split-register.c:2008
-#: ../intl-scm/guile-strings.c:82 ../intl-scm/guile-strings.c:2656
-#: ../intl-scm/guile-strings.c:3364 ../intl-scm/guile-strings.c:3462
-#: ../intl-scm/guile-strings.c:3678 ../intl-scm/guile-strings.c:3906
+#: ../src/register/ledger-core/split-register.c:2030
+#: ../intl-scm/guile-strings.c:130 ../intl-scm/guile-strings.c:3990
+#: ../intl-scm/guile-strings.c:5140 ../intl-scm/guile-strings.c:6090
+#: ../intl-scm/guile-strings.c:6188 ../intl-scm/guile-strings.c:6404
+#: ../intl-scm/guile-strings.c:6614 ../intl-scm/guile-strings.c:6712
+#: ../intl-scm/guile-strings.c:6928 ../intl-scm/guile-strings.c:7158
+#: ../intl-scm/guile-strings.c:7398
msgid "Invoice"
msgstr "Rechnung"
@@ -334,62 +352,70 @@
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-core/gncInvoice.c:591
-#: ../src/business/business-gnome/business-gnome-utils.c:213
-#: ../src/business/business-gnome/dialog-invoice.c:2398
-#: ../intl-scm/guile-strings.c:108 ../intl-scm/guile-strings.c:3366
-#: ../intl-scm/guile-strings.c:3464 ../intl-scm/guile-strings.c:3680
-#: ../intl-scm/guile-strings.c:3908
+#: ../src/business/business-core/gncInvoice.c:596
+#: ../src/business/business-gnome/business-gnome-utils.c:215
+#: ../src/business/business-gnome/dialog-invoice.c:2393
+#: ../intl-scm/guile-strings.c:156 ../intl-scm/guile-strings.c:6092
+#: ../intl-scm/guile-strings.c:6190 ../intl-scm/guile-strings.c:6406
+#: ../intl-scm/guile-strings.c:6616 ../intl-scm/guile-strings.c:6714
+#: ../intl-scm/guile-strings.c:6930 ../intl-scm/guile-strings.c:7160
+#: ../intl-scm/guile-strings.c:7400
msgid "Bill"
msgstr "Rechnung"
#. src/app-utils/prefs.scm
#. src/report/standard-reports/net-barchart.scm
-#: ../src/business/business-core/gncInvoice.c:593 ../src/engine/Account.c:2140
-#: ../intl-scm/guile-strings.c:78 ../intl-scm/guile-strings.c:1242
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../src/business/business-core/gncInvoice.c:598 ../src/engine/Account.c:2143
+#: ../intl-scm/guile-strings.c:126 ../intl-scm/guile-strings.c:1954
+#: ../intl-scm/guile-strings.c:2578
msgid "Expense"
msgstr "Aufwendungen"
#. Set memo. action?
-#: ../src/business/business-core/gncInvoice.c:1028
+#: ../src/business/business-core/gncInvoice.c:1033
msgid "Extra to Charge Card"
msgstr "Zusätzliche Kosten Kreditkarte"
-#: ../src/business/business-core/gncInvoice.c:1067
+#: ../src/business/business-core/gncInvoice.c:1072
msgid "Generated from an invoice. Try unposting the invoice."
msgstr ""
"Aus einer Rechnung erzeugt. Für Änderungen müssen Sie die Buchung der "
"Rechnung löschen."
#. Translators: This is the memo of an auto-created split
-#: ../src/business/business-core/gncInvoice.c:1085
+#: ../src/business/business-core/gncInvoice.c:1090
msgid "Automatic Payment Forward"
msgstr "Automatische Zahlungsweiterleitung"
-#: ../src/business/business-core/gncInvoice.c:1086
+#: ../src/business/business-core/gncInvoice.c:1091
msgid "Auto Split"
msgstr "Automatische Buchung"
#. src/app-utils/prefs.scm
-#: ../src/business/business-core/gncInvoice.c:1279
-#: ../src/business/business-core/gncInvoice.c:1373
+#: ../src/business/business-core/gncInvoice.c:1284
+#: ../src/business/business-core/gncInvoice.c:1378
#: ../src/business/business-ledger/gncEntryLedgerModel.c:140
-#: ../src/gnome/druid-loan.c:1780 ../src/gnome/druid-loan.c:2280
-#: ../src/gnome/druid-loan.c:2343 ../src/gnome/druid-loan.c:2357
-#: ../src/register/ledger-core/split-register.c:2004
-#: ../src/register/ledger-core/split-register.c:2009
-#: ../src/register/ledger-core/split-register.c:2018
-#: ../intl-scm/guile-strings.c:64 ../intl-scm/guile-strings.c:80
-#: ../intl-scm/guile-strings.c:110
+#: ../src/gnome/druid-loan.c:1789 ../src/gnome/druid-loan.c:2293
+#: ../src/gnome/druid-loan.c:2356 ../src/gnome/druid-loan.c:2370
+#: ../src/register/ledger-core/split-register.c:2026
+#: ../src/register/ledger-core/split-register.c:2031
+#: ../src/register/ledger-core/split-register.c:2040
+#: ../intl-scm/guile-strings.c:112 ../intl-scm/guile-strings.c:128
+#: ../intl-scm/guile-strings.c:158
msgid "Payment"
msgstr "Zahlung"
-#: ../src/business/business-core/gncInvoice.c:1400
+#: ../src/business/business-core/gncInvoice.c:1405
msgid "Pre-Payment"
msgstr "Vorauszahlung"
-#: ../src/business/business-core/gncInvoice.c:1497
+#: ../src/business/business-core/gncInvoice.c:1502
msgid " (posted)"
msgstr " (gebucht)"
@@ -397,55 +423,53 @@
msgid " (closed)"
msgstr " (geschlossen)"
-#: ../src/business/business-gnome/business-gnome-utils.c:67
-#: ../src/business/business-gnome/business-gnome-utils.c:250
-#: ../src/business/business-gnome/dialog-invoice.c:1014
-#: ../src/business/business-gnome/dialog-invoice.c:1085
+#: ../src/business/business-gnome/business-gnome-utils.c:69
+#: ../src/business/business-gnome/business-gnome-utils.c:252
+#: ../src/business/business-gnome/dialog-invoice.c:1006
+#: ../src/business/business-gnome/dialog-invoice.c:1077
#: ../src/gnome-utils/gnc-general-select.c:217
-#: ../src/import-export/qif-import/qif.glade.h:77
+#: ../src/import-export/qif-import/qif.glade.h:67
msgid "Select..."
msgstr "Auswählen..."
-#: ../src/business/business-gnome/business-gnome-utils.c:70
+#: ../src/business/business-gnome/business-gnome-utils.c:72
#: ../src/gnome-utils/gnc-general-select.c:219
msgid "Edit..."
msgstr "Bearbeiten..."
-#: ../src/business/business-gnome/business-gnome-utils.c:216
+#: ../src/business/business-gnome/business-gnome-utils.c:218
msgid "Voucher"
msgstr "Auslagenerstattung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/business/business-gnome/business-gnome-utils.c:459
-#: ../src/engine/FreqSpec.c:724 ../src/gnome/glade/sched-xact.glade.h:122
-#: ../intl-scm/guile-strings.c:2298 ../intl-scm/guile-strings.c:2324
-#: ../intl-scm/guile-strings.c:2384 ../intl-scm/guile-strings.c:2386
-#: ../intl-scm/guile-strings.c:2492 ../intl-scm/guile-strings.c:2508
+#: ../src/business/business-gnome/business-gnome-utils.c:455
+#: ../src/engine/FreqSpec.c:724 ../src/gnome/glade/sched-xact.glade.h:139
+#: ../intl-scm/guile-strings.c:3632 ../intl-scm/guile-strings.c:3658
+#: ../intl-scm/guile-strings.c:3718 ../intl-scm/guile-strings.c:3720
+#: ../intl-scm/guile-strings.c:3826 ../intl-scm/guile-strings.c:3842
+#: ../intl-scm/guile-strings.c:4782 ../intl-scm/guile-strings.c:4808
+#: ../intl-scm/guile-strings.c:4868 ../intl-scm/guile-strings.c:4870
+#: ../intl-scm/guile-strings.c:4976 ../intl-scm/guile-strings.c:4992
#, c-format
msgid "None"
msgstr "Keine"
-#: ../src/business/business-gnome/business-gnome-utils.c:635
+#: ../src/business/business-gnome/business-gnome-utils.c:631
msgid "Yes"
msgstr "Ja"
-#: ../src/business/business-gnome/business-gnome-utils.c:640
+#: ../src/business/business-gnome/business-gnome-utils.c:636
msgid "No"
msgstr "Nein"
-#: ../src/business/business-gnome/business-gnome-utils.c:645
+#: ../src/business/business-gnome/business-gnome-utils.c:641
msgid "Use Global"
msgstr "Voreinstellung benutzen"
-#. src/business/business-utils/business-utils.scm
-#: ../src/business/business-gnome/businessmod-gnome.c:122
-#: ../intl-scm/guile-strings.c:3160
-msgid "Business"
-msgstr "Geschäft"
-
#: ../src/business/business-gnome/business-urls.c:58
#: ../src/business/business-gnome/business-urls.c:190
-#: ../src/gnome/top-level.c:191
+#: ../src/gnome/top-level.c:192
#, c-format
msgid "Badly formed URL %s"
msgstr "Fehlerhafte URL %s"
@@ -487,21 +511,21 @@
msgid "No such Account entity: %s"
msgstr "Ungültige Konto Entity: %s"
-#: ../src/business/business-gnome/dialog-billterms.c:256
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:119
+#: ../src/business/business-gnome/dialog-billterms.c:262
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:129
msgid "Negative amounts are not allowed."
msgstr "Negative Beträge sind hier nicht möglich."
-#: ../src/business/business-gnome/dialog-billterms.c:261
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:126
+#: ../src/business/business-gnome/dialog-billterms.c:267
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:136
msgid "Percentage amount must be between 0 and 100."
msgstr "Die Prozentzahl muss zwischen 0 und 100 liegen."
-#: ../src/business/business-gnome/dialog-billterms.c:284
+#: ../src/business/business-gnome/dialog-billterms.c:290
msgid "You must provide a name for this Billing Term."
msgstr "Sie müssen einen Namen für diese Zahlungsbedingungen angeben."
-#: ../src/business/business-gnome/dialog-billterms.c:290
+#: ../src/business/business-gnome/dialog-billterms.c:296
#, c-format
msgid ""
"You must provide a unique name for this Billing Term. Your choice \"%s\" is "
@@ -511,32 +535,36 @@
"Ihre Auswahl »%s« wird bereits benutzt."
#. src/report/standard-reports/price-scatter.scm
-#: ../src/business/business-gnome/dialog-billterms.c:495
-#: ../src/business/business-gnome/glade/billterms.glade.h:11
-#: ../src/gnome/glade/sched-xact.glade.h:68
-#: ../src/gnome-utils/gnc-date-delta.c:217 ../intl-scm/guile-strings.c:1168
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/business/business-gnome/dialog-billterms.c:465
+#: ../src/business/business-gnome/glade/billterms.glade.h:9
+#: ../src/gnome/glade/sched-xact.glade.h:75
+#: ../src/gnome-utils/gnc-date-delta.c:214 ../intl-scm/guile-strings.c:1880
+#: ../intl-scm/guile-strings.c:2504
msgid "Days"
msgstr "Tage"
-#: ../src/business/business-gnome/dialog-billterms.c:498
-#: ../src/business/business-gnome/glade/billterms.glade.h:22
+#: ../src/business/business-gnome/dialog-billterms.c:468
+#: ../src/business/business-gnome/glade/billterms.glade.h:21
msgid "Proximo"
msgstr "Im nächsten Monat"
#. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/dialog-billterms.c:501
-#: ../src/engine/FreqSpec.c:983 ../intl-scm/guile-strings.c:3420
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/dialog-billterms.c:471
+#: ../src/engine/FreqSpec.c:983 ../intl-scm/guile-strings.c:6146
+#: ../intl-scm/guile-strings.c:6670
#, c-format
msgid "Unknown"
msgstr "Unbekannt"
-#: ../src/business/business-gnome/dialog-billterms.c:625
+#: ../src/business/business-gnome/dialog-billterms.c:592
#, c-format
msgid "Term \"%s\" is in use. You cannot delete it."
msgstr "Zahlungsbedingung »%s« ist in Benutzung. Sie können sie nicht löschen."
-#: ../src/business/business-gnome/dialog-billterms.c:631
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:556
+#: ../src/business/business-gnome/dialog-billterms.c:598
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:542
#, c-format
msgid "Are you sure you want to delete \"%s\"?"
msgstr "Sind Sie sicher, dass Sie »%s« löschen möchten?"
@@ -583,7 +611,7 @@
#: ../src/business/business-gnome/dialog-employee.c:301
#: ../src/business/business-gnome/dialog-job.c:230
#: ../src/business/business-gnome/dialog-vendor.c:287
-#: ../src/gnome-utils/dialog-account.c:1349
+#: ../src/gnome-utils/dialog-account.c:1300
msgid "<No name>"
msgstr "<Kein Name>"
@@ -592,7 +620,7 @@
msgstr "Kunde bearbeiten"
#: ../src/business/business-gnome/dialog-customer.c:374
-#: ../src/business/business-gnome/glade/customer.glade.h:16
+#: ../src/business/business-gnome/glade/customer.glade.h:15
msgid "New Customer"
msgstr "Neuer Kunde"
@@ -611,10 +639,10 @@
#: ../src/business/business-gnome/dialog-customer.c:785
#: ../src/business/business-gnome/dialog-employee.c:684
+#: ../src/business/business-gnome/dialog-invoice.c:2197
#: ../src/business/business-gnome/dialog-invoice.c:2202
-#: ../src/business/business-gnome/dialog-invoice.c:2207
-#: ../src/business/business-gnome/dialog-invoice.c:2214
-#: ../src/business/business-gnome/dialog-invoice.c:2460
+#: ../src/business/business-gnome/dialog-invoice.c:2209
+#: ../src/business/business-gnome/dialog-invoice.c:2455
#: ../src/business/business-gnome/dialog-job.c:516
msgid "Process Payment"
msgstr "Zahlung verarbeiten"
@@ -632,10 +660,11 @@
msgid "Customer ID"
msgstr "Kundennummer"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
#: ../src/business/business-gnome/dialog-customer.c:800
#: ../src/business/business-gnome/dialog-vendor.c:663
-#: ../intl-scm/guile-strings.c:3162
+#: ../intl-scm/guile-strings.c:5870 ../intl-scm/guile-strings.c:5888
msgid "Company Name"
msgstr "Firmenname"
@@ -645,14 +674,17 @@
msgstr "Kontaktadresse"
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
#: ../src/business/business-gnome/dialog-customer.c:808
-#: ../src/business/business-gnome/dialog-invoice.c:2323
-#: ../src/business/business-gnome/dialog-invoice.c:2468
+#: ../src/business/business-gnome/dialog-invoice.c:2318
+#: ../src/business/business-gnome/dialog-invoice.c:2463
#: ../src/business/business-gnome/dialog-job.c:540
#: ../src/business/business-gnome/dialog-order.c:826
#: ../src/business/business-gnome/dialog-vendor.c:671
-#: ../intl-scm/guile-strings.c:3396 ../intl-scm/guile-strings.c:3746
+#: ../intl-scm/guile-strings.c:6122 ../intl-scm/guile-strings.c:6646
+#: ../intl-scm/guile-strings.c:6996 ../intl-scm/guile-strings.c:7236
msgid "Company"
msgstr "Firma"
@@ -688,7 +720,7 @@
msgstr "Mitarbeiter bearbeiten"
#: ../src/business/business-gnome/dialog-employee.c:310
-#: ../src/business/business-gnome/glade/employee.glade.h:19
+#: ../src/business/business-gnome/glade/employee.glade.h:18
msgid "New Employee"
msgstr "Neuer Mitarbeiter"
@@ -709,7 +741,7 @@
msgstr "Mitarbeiter Benutzername"
#: ../src/business/business-gnome/dialog-employee.c:696
-#: ../src/business/business-gnome/dialog-invoice.c:2304
+#: ../src/business/business-gnome/dialog-invoice.c:2299
msgid "Employee Name"
msgstr "Mitarbeitername"
@@ -717,15 +749,16 @@
msgid "Username"
msgstr "Benutzername"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
#: ../src/business/business-gnome/dialog-employee.c:706
-#: ../src/gnome/dialog-scheduledxaction.c:2573
-#: ../src/gnome/glade/sched-xact.glade.h:118
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:10
-#: ../src/gnome-utils/gnc-dense-cal.c:280
+#: ../src/gnome/dialog-sx-editor.c:1674
+#: ../src/gnome/glade/sched-xact.glade.h:136
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:9
+#: ../src/gnome-utils/gnc-dense-cal.c:263
#: ../src/gnome-utils/gnc-tree-model-budget.c:96
#: ../src/gnome-utils/gnc-tree-view-commodity.c:405
-#: ../intl-scm/guile-strings.c:3720
+#: ../intl-scm/guile-strings.c:6970 ../intl-scm/guile-strings.c:7210
msgid "Name"
msgstr "Name"
@@ -738,31 +771,31 @@
#. * label in the frame and means
#. * e.g. customer i.e. the company being
#. * invoiced.
-#: ../src/business/business-gnome/dialog-invoice.c:344
+#: ../src/business/business-gnome/dialog-invoice.c:340
#: ../src/business/business-gnome/dialog-order.c:174
msgid "You need to supply Billing Information."
msgstr "Sie müssen Rechnungsdaten eingeben."
-#: ../src/business/business-gnome/dialog-invoice.c:499
+#: ../src/business/business-gnome/dialog-invoice.c:495
msgid "Are you sure you want to delete the selected entry?"
msgstr "Sind Sie sicher, dass Sie den gewählten Posten löschen möchten?"
-#: ../src/business/business-gnome/dialog-invoice.c:501
+#: ../src/business/business-gnome/dialog-invoice.c:497
msgid ""
"This entry is attached to an order and will be deleted from that as well!"
msgstr ""
"Dieser Posten ist mit einer Bestellung verbunden und würde dadurch auch von "
"der Bestellung gelöscht."
-#: ../src/business/business-gnome/dialog-invoice.c:609
+#: ../src/business/business-gnome/dialog-invoice.c:605
msgid "The Invoice must have at least one Entry."
msgstr "Die Rechnung muss mindestens einen Posten enthalten."
-#: ../src/business/business-gnome/dialog-invoice.c:616
+#: ../src/business/business-gnome/dialog-invoice.c:612
msgid "You may not post an invoice with a negative total value."
msgstr "Sie können keine Rechnung buchen, die einen negativen Saldo hat."
-#: ../src/business/business-gnome/dialog-invoice.c:623
+#: ../src/business/business-gnome/dialog-invoice.c:619
msgid "You may not post an expense voucher with a negative total cash value."
msgstr ""
"Sie können keine Auslagenerstattung buchen, die einen negativen Saldo hat."
@@ -770,293 +803,334 @@
#. Ok, we can post this invoice. Ask for verification, set the due date,
#. * post date, and posted account
#.
-#: ../src/business/business-gnome/dialog-invoice.c:630
+#: ../src/business/business-gnome/dialog-invoice.c:626
msgid "Do you really want to post the invoice?"
msgstr "Wollen Sie diese Rechnung wirklich buchen?"
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:631
+#: ../src/business/business-gnome/dialog-invoice.c:627
#: ../src/register/ledger-core/split-register-model.c:109
-#: ../intl-scm/guile-strings.c:3400 ../intl-scm/guile-strings.c:3596
-#: ../intl-scm/guile-strings.c:3916
+#: ../intl-scm/guile-strings.c:6126 ../intl-scm/guile-strings.c:6322
+#: ../intl-scm/guile-strings.c:6650 ../intl-scm/guile-strings.c:6846
+#: ../intl-scm/guile-strings.c:7168 ../intl-scm/guile-strings.c:7408
msgid "Due Date"
msgstr "Fälligkeitsdatum"
-#: ../src/business/business-gnome/dialog-invoice.c:632
+#: ../src/business/business-gnome/dialog-invoice.c:628
msgid "Post Date"
msgstr "Buchungsdatum"
-#: ../src/business/business-gnome/dialog-invoice.c:633
+#: ../src/business/business-gnome/dialog-invoice.c:629
msgid "Post to Account"
msgstr "Buchen nach Konto"
-#: ../src/business/business-gnome/dialog-invoice.c:634
+#: ../src/business/business-gnome/dialog-invoice.c:630
msgid "Accumulate Splits?"
msgstr "Buchungen kumulieren?"
-#: ../src/business/business-gnome/dialog-invoice.c:928
-#: ../src/gnome/window-reconcile.c:1051
+#: ../src/business/business-gnome/dialog-invoice.c:920
+#: ../src/gnome/window-reconcile.c:1050
msgid "Total:"
msgstr "Betrag:"
-#: ../src/business/business-gnome/dialog-invoice.c:933
+#: ../src/business/business-gnome/dialog-invoice.c:925
msgid "Subtotal:"
msgstr "Zwischensumme:"
-#: ../src/business/business-gnome/dialog-invoice.c:934
+#: ../src/business/business-gnome/dialog-invoice.c:926
msgid "Tax:"
msgstr "Steuern:"
-#: ../src/business/business-gnome/dialog-invoice.c:938
+#: ../src/business/business-gnome/dialog-invoice.c:930
msgid "Total Cash:"
msgstr "Betrag Bar:"
-#: ../src/business/business-gnome/dialog-invoice.c:939
+#: ../src/business/business-gnome/dialog-invoice.c:931
msgid "Total Charge:"
msgstr "Gesamt Belastung:"
-#: ../src/business/business-gnome/dialog-invoice.c:1555
-#: ../src/business/business-gnome/glade/invoice.glade.h:19
+#: ../src/business/business-gnome/dialog-invoice.c:1547
+#: ../src/business/business-gnome/glade/invoice.glade.h:18
msgid "New Invoice"
msgstr "Neue Rechnung"
-#: ../src/business/business-gnome/dialog-invoice.c:1559
+#: ../src/business/business-gnome/dialog-invoice.c:1551
msgid "Edit Invoice"
msgstr "Rechnung bearbeiten"
-#: ../src/business/business-gnome/dialog-invoice.c:1562
+#: ../src/business/business-gnome/dialog-invoice.c:1554
msgid "View Invoice"
msgstr "Rechnung anzeigen"
-#: ../src/business/business-gnome/dialog-invoice.c:1570
+#: ../src/business/business-gnome/dialog-invoice.c:1562
msgid "New Bill"
msgstr "Neue Rechnung"
-#: ../src/business/business-gnome/dialog-invoice.c:1574
+#: ../src/business/business-gnome/dialog-invoice.c:1566
msgid "Edit Bill"
msgstr "Rechnung bearbeiten"
-#: ../src/business/business-gnome/dialog-invoice.c:1577
+#: ../src/business/business-gnome/dialog-invoice.c:1569
msgid "View Bill"
msgstr "Rechnung anzeigen"
-#: ../src/business/business-gnome/dialog-invoice.c:1585
+#: ../src/business/business-gnome/dialog-invoice.c:1577
msgid "New Expense Voucher"
msgstr "Neue Auslagenerstattung"
-#: ../src/business/business-gnome/dialog-invoice.c:1589
+#: ../src/business/business-gnome/dialog-invoice.c:1581
msgid "Edit Expense Voucher"
msgstr "Auslagenerstattung bearbeiten"
-#: ../src/business/business-gnome/dialog-invoice.c:1592
+#: ../src/business/business-gnome/dialog-invoice.c:1584
msgid "View Expense Voucher"
msgstr "Auslagenerstattung anzeigen"
-#: ../src/business/business-gnome/dialog-invoice.c:2201
+#: ../src/business/business-gnome/dialog-invoice.c:2196
msgid "View/Edit Invoice"
msgstr "Rechnung anzeigen/bearbeiten"
-#: ../src/business/business-gnome/dialog-invoice.c:2206
-#: ../src/business/business-gnome/dialog-invoice.c:2459
+#: ../src/business/business-gnome/dialog-invoice.c:2201
+#: ../src/business/business-gnome/dialog-invoice.c:2454
msgid "View/Edit Bill"
msgstr "Rechnung anzeigen/bearbeiten"
#. Translators: The terms 'Voucher' and 'Expense Voucher' are used
#. interchangeably in gnucash and mean the same thing.
-#: ../src/business/business-gnome/dialog-invoice.c:2213
+#: ../src/business/business-gnome/dialog-invoice.c:2208
msgid "View/Edit Voucher"
msgstr "Auslagenerstattung anzeigen/bearbeiten"
-#: ../src/business/business-gnome/dialog-invoice.c:2223
+#: ../src/business/business-gnome/dialog-invoice.c:2218
msgid "Invoice Owner"
msgstr "Rechnungsmandant"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2226
-#: ../intl-scm/guile-strings.c:3296 ../intl-scm/guile-strings.c:3638
-#: ../intl-scm/guile-strings.c:3872
+#: ../src/business/business-gnome/dialog-invoice.c:2221
+#: ../intl-scm/guile-strings.c:6022 ../intl-scm/guile-strings.c:6364
+#: ../intl-scm/guile-strings.c:6546 ../intl-scm/guile-strings.c:6888
+#: ../intl-scm/guile-strings.c:7124 ../intl-scm/guile-strings.c:7364
msgid "Invoice Notes"
msgstr "Bemerkungen Rechnung"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2229
-#: ../src/business/business-gnome/dialog-invoice.c:2259
-#: ../src/business/business-gnome/dialog-invoice.c:2289
-#: ../src/business/business-gnome/dialog-invoice.c:2314
+#: ../src/business/business-gnome/dialog-invoice.c:2224
+#: ../src/business/business-gnome/dialog-invoice.c:2254
+#: ../src/business/business-gnome/dialog-invoice.c:2284
+#: ../src/business/business-gnome/dialog-invoice.c:2309
#: ../src/business/business-gnome/dialog-job.c:528
#: ../src/business/business-gnome/dialog-job.c:538
#: ../src/business/business-gnome/dialog-order.c:824
-#: ../src/business/business-gnome/glade/invoice.glade.h:5
-#: ../src/business/business-gnome/glade/job.glade.h:3
-#: ../intl-scm/guile-strings.c:3290 ../intl-scm/guile-strings.c:3632
-#: ../intl-scm/guile-strings.c:3690 ../intl-scm/guile-strings.c:3866
+#: ../src/business/business-gnome/glade/invoice.glade.h:4
+#: ../src/business/business-gnome/glade/job.glade.h:2
+#: ../intl-scm/guile-strings.c:6016 ../intl-scm/guile-strings.c:6358
+#: ../intl-scm/guile-strings.c:6416 ../intl-scm/guile-strings.c:6540
+#: ../intl-scm/guile-strings.c:6882 ../intl-scm/guile-strings.c:6940
+#: ../intl-scm/guile-strings.c:7118 ../intl-scm/guile-strings.c:7358
msgid "Billing ID"
msgstr "Rechnungsnummer"
-#: ../src/business/business-gnome/dialog-invoice.c:2232
-#: ../src/business/business-gnome/dialog-invoice.c:2262
-#: ../src/business/business-gnome/dialog-invoice.c:2292
+#: ../src/business/business-gnome/dialog-invoice.c:2227
+#: ../src/business/business-gnome/dialog-invoice.c:2257
+#: ../src/business/business-gnome/dialog-invoice.c:2287
msgid "Is Paid?"
msgstr "Bezahlt?"
-#: ../src/business/business-gnome/dialog-invoice.c:2235
-#: ../src/business/business-gnome/dialog-invoice.c:2265
-#: ../src/business/business-gnome/dialog-invoice.c:2295
-#: ../src/business/business-gnome/glade/invoice.glade.h:10
+#: ../src/business/business-gnome/dialog-invoice.c:2230
+#: ../src/business/business-gnome/dialog-invoice.c:2260
+#: ../src/business/business-gnome/dialog-invoice.c:2290
+#: ../src/business/business-gnome/glade/invoice.glade.h:9
#: ../src/gnome/dialog-find-transactions.c:117
msgid "Date Posted"
msgstr "Buchungsdatum"
-#: ../src/business/business-gnome/dialog-invoice.c:2238
-#: ../src/business/business-gnome/dialog-invoice.c:2268
-#: ../src/business/business-gnome/dialog-invoice.c:2298
+#: ../src/business/business-gnome/dialog-invoice.c:2233
+#: ../src/business/business-gnome/dialog-invoice.c:2263
+#: ../src/business/business-gnome/dialog-invoice.c:2293
msgid "Is Posted?"
msgstr "Ist Gebucht?"
-#: ../src/business/business-gnome/dialog-invoice.c:2241
-#: ../src/business/business-gnome/dialog-invoice.c:2271
-#: ../src/business/business-gnome/dialog-invoice.c:2301
+#: ../src/business/business-gnome/dialog-invoice.c:2236
+#: ../src/business/business-gnome/dialog-invoice.c:2266
+#: ../src/business/business-gnome/dialog-invoice.c:2296
#: ../src/business/business-gnome/dialog-order.c:814
-#: ../src/business/business-gnome/glade/invoice.glade.h:9
-#: ../src/business/business-gnome/glade/order.glade.h:7
+#: ../src/business/business-gnome/glade/invoice.glade.h:8
+#: ../src/business/business-gnome/glade/order.glade.h:6
msgid "Date Opened"
msgstr "Eröffnungsdatum"
-#: ../src/business/business-gnome/dialog-invoice.c:2244
-#: ../src/business/business-gnome/dialog-invoice.c:2274
+#: ../src/business/business-gnome/dialog-invoice.c:2239
+#: ../src/business/business-gnome/dialog-invoice.c:2269
msgid "Company Name "
msgstr "Firmenname "
-#: ../src/business/business-gnome/dialog-invoice.c:2248
-#: ../src/business/business-gnome/glade/invoice.glade.h:15
+#: ../src/business/business-gnome/dialog-invoice.c:2243
+#: ../src/business/business-gnome/glade/invoice.glade.h:14
msgid "Invoice ID"
msgstr "Rechnungsnummer"
-#: ../src/business/business-gnome/dialog-invoice.c:2253
+#: ../src/business/business-gnome/dialog-invoice.c:2248
msgid "Bill Owner"
msgstr "Rechnungsmandant"
-#: ../src/business/business-gnome/dialog-invoice.c:2256
+#: ../src/business/business-gnome/dialog-invoice.c:2251
msgid "Bill Notes"
msgstr "Bemerkungen Rechnung"
-#: ../src/business/business-gnome/dialog-invoice.c:2278
+#: ../src/business/business-gnome/dialog-invoice.c:2273
msgid "Bill ID"
msgstr "Rechnungsnummer"
-#: ../src/business/business-gnome/dialog-invoice.c:2283
+#: ../src/business/business-gnome/dialog-invoice.c:2278
msgid "Voucher Owner"
msgstr "Auslagenerstattung Mandant"
-#: ../src/business/business-gnome/dialog-invoice.c:2286
+#: ../src/business/business-gnome/dialog-invoice.c:2281
msgid "Voucher Notes"
msgstr "Bemerkungen Auslagenerstattung"
-#: ../src/business/business-gnome/dialog-invoice.c:2308
+#: ../src/business/business-gnome/dialog-invoice.c:2303
msgid "Voucher ID"
msgstr "Nummer Auslagenerstattung"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
#. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2316
-#: ../src/gnome-utils/gnc-tree-view-account.c:519
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/dialog-invoice.c:2311
+#: ../src/gnome-utils/gnc-tree-view-account.c:515
#: ../src/gnome-utils/gnc-tree-view-price.c:459
#: ../src/register/ledger-core/split-register-model.c:198
-#: ../intl-scm/guile-strings.c:1944 ../intl-scm/guile-strings.c:3404
+#: ../intl-scm/guile-strings.c:3278 ../intl-scm/guile-strings.c:4428
+#: ../intl-scm/guile-strings.c:6130 ../intl-scm/guile-strings.c:6654
msgid "Type"
msgstr "Art"
-#: ../src/business/business-gnome/dialog-invoice.c:2318
+#: ../src/business/business-gnome/dialog-invoice.c:2313
#: ../src/register/ledger-core/split-register-model.c:152
msgid "Paid"
msgstr "Bezahlt"
-#: ../src/business/business-gnome/dialog-invoice.c:2321
+#: ../src/business/business-gnome/dialog-invoice.c:2316
msgid "Posted"
msgstr "Gebucht"
-#: ../src/business/business-gnome/dialog-invoice.c:2326
+#: ../src/business/business-gnome/dialog-invoice.c:2321
#: ../src/business/business-gnome/dialog-order.c:831
-#: ../src/gnome/glade/lots.glade.h:21
+#: ../src/gnome/lot-viewer.c:610
msgid "Opened"
msgstr "Geöffnet"
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2328
+#: ../src/business/business-gnome/dialog-invoice.c:2323
#: ../src/business/business-gnome/dialog-order.c:833
-#: ../src/business/business-gnome/glade/payment.glade.h:5
-#: ../src/gnome/glade/lots.glade.h:19 ../src/gnome/reconcile-list.c:222
+#: ../src/business/business-gnome/glade/payment.glade.h:4
+#: ../src/gnome/glade/lots.glade.h:15 ../src/gnome/reconcile-list.c:222
#: ../src/register/ledger-core/split-register-model.c:123
-#: ../intl-scm/guile-strings.c:1278 ../intl-scm/guile-strings.c:1480
-#: ../intl-scm/guile-strings.c:2182 ../intl-scm/guile-strings.c:2244
-#: ../intl-scm/guile-strings.c:2436 ../intl-scm/guile-strings.c:2556
-#: ../intl-scm/guile-strings.c:2592
+#: ../intl-scm/guile-strings.c:1988 ../intl-scm/guile-strings.c:2190
+#: ../intl-scm/guile-strings.c:2612 ../intl-scm/guile-strings.c:2814
+#: ../intl-scm/guile-strings.c:3516 ../intl-scm/guile-strings.c:3578
+#: ../intl-scm/guile-strings.c:3770 ../intl-scm/guile-strings.c:3890
+#: ../intl-scm/guile-strings.c:3926 ../intl-scm/guile-strings.c:4666
+#: ../intl-scm/guile-strings.c:4728 ../intl-scm/guile-strings.c:4920
+#: ../intl-scm/guile-strings.c:5040 ../intl-scm/guile-strings.c:5076
msgid "Num"
msgstr "Nr"
-#: ../src/business/business-gnome/dialog-invoice.c:2397
+#: ../src/business/business-gnome/dialog-invoice.c:2392
msgid "Find Bill"
msgstr "Rechnung suchen"
-#: ../src/business/business-gnome/dialog-invoice.c:2403
+#: ../src/business/business-gnome/dialog-invoice.c:2398
msgid "Find Expense Voucher"
msgstr "Auslagenerstattung suchen"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2404
-#: ../intl-scm/guile-strings.c:3368 ../intl-scm/guile-strings.c:3682
-#: ../intl-scm/guile-strings.c:3910
+#: ../src/business/business-gnome/dialog-invoice.c:2399
+#: ../intl-scm/guile-strings.c:6094 ../intl-scm/guile-strings.c:6408
+#: ../intl-scm/guile-strings.c:6618 ../intl-scm/guile-strings.c:6932
+#: ../intl-scm/guile-strings.c:7162 ../intl-scm/guile-strings.c:7402
msgid "Expense Voucher"
msgstr "Auslagenerstattung"
-#: ../src/business/business-gnome/dialog-invoice.c:2409
+#: ../src/business/business-gnome/dialog-invoice.c:2404
msgid "Find Invoice"
msgstr "Rechnung suchen"
#. src/report/report-system/options-utilities.scm
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/dialog-invoice.c:2466
-#: ../src/business/business-gnome/glade/payment.glade.h:2
-#: ../src/gnome/glade/lots.glade.h:8 ../src/gnome/reconcile-list.c:215
-#: ../src/import-export/generic-import.glade.h:12
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/dialog-invoice.c:2461
+#: ../src/business/business-gnome/glade/payment.glade.h:1
+#: ../src/gnome/glade/lots.glade.h:6 ../src/gnome/reconcile-list.c:215
+#: ../src/import-export/generic-import.glade.h:10
#: ../src/import-export/hbci/glade/hbci.glade.h:8
-#: ../src/import-export/qif-import/qif.glade.h:5
-#: ../intl-scm/guile-strings.c:778 ../intl-scm/guile-strings.c:1288
-#: ../intl-scm/guile-strings.c:1502 ../intl-scm/guile-strings.c:2206
-#: ../intl-scm/guile-strings.c:2258 ../intl-scm/guile-strings.c:2360
-#: ../intl-scm/guile-strings.c:2488 ../intl-scm/guile-strings.c:2622
-#: ../intl-scm/guile-strings.c:2660 ../intl-scm/guile-strings.c:3408
+#: ../src/import-export/import-main-matcher.c:420
+#: ../src/import-export/import-match-picker.c:334
+#: ../src/import-export/import-match-picker.c:374
+#: ../src/import-export/qif-import/druid-qif-import.c:2171
+#: ../src/import-export/qif-import/druid-qif-import.c:2203
+#: ../intl-scm/guile-strings.c:1290 ../intl-scm/guile-strings.c:1998
+#: ../intl-scm/guile-strings.c:2212 ../intl-scm/guile-strings.c:2622
+#: ../intl-scm/guile-strings.c:2836 ../intl-scm/guile-strings.c:3540
+#: ../intl-scm/guile-strings.c:3592 ../intl-scm/guile-strings.c:3694
+#: ../intl-scm/guile-strings.c:3822 ../intl-scm/guile-strings.c:3956
+#: ../intl-scm/guile-strings.c:3994 ../intl-scm/guile-strings.c:4690
+#: ../intl-scm/guile-strings.c:4742 ../intl-scm/guile-strings.c:4844
+#: ../intl-scm/guile-strings.c:4972 ../intl-scm/guile-strings.c:5106
+#: ../intl-scm/guile-strings.c:5144 ../intl-scm/guile-strings.c:6134
+#: ../intl-scm/guile-strings.c:6658
msgid "Amount"
msgstr "Betrag"
-#: ../src/business/business-gnome/dialog-invoice.c:2470
+#: ../src/business/business-gnome/dialog-invoice.c:2465
msgid "Due"
msgstr "Fällig"
-#: ../src/business/business-gnome/dialog-invoice.c:2512
+#: ../src/business/business-gnome/dialog-invoice.c:2507
msgid "Due Bills Reminder"
msgstr "Erinnerung an fällige Rechnungen"
-#: ../src/business/business-gnome/dialog-invoice.c:2514
+#: ../src/business/business-gnome/dialog-invoice.c:2509
msgid "The following bills are due"
msgstr "Die folgenden Rechnungen sind fällig"
-#: ../src/business/business-gnome/dialog-invoice.c:2515
+#: ../src/business/business-gnome/dialog-invoice.c:2510
msgid "The following bill is due"
msgstr "Die folgende Rechnung ist fällig"
@@ -1093,13 +1167,13 @@
msgstr "Nur aktive?"
#: ../src/business/business-gnome/dialog-job.c:530
-#: ../src/business/business-gnome/glade/job.glade.h:8
+#: ../src/business/business-gnome/glade/job.glade.h:7
msgid "Job Number"
msgstr "Auftragsnummer"
#: ../src/business/business-gnome/dialog-job.c:532
#: ../src/business/business-gnome/dialog-job.c:542
-#: ../src/business/business-gnome/glade/job.glade.h:7
+#: ../src/business/business-gnome/glade/job.glade.h:6
msgid "Job Name"
msgstr "Auftragsname"
@@ -1145,7 +1219,7 @@
msgstr "Bemerkungen Bestellung"
#: ../src/business/business-gnome/dialog-order.c:810
-#: ../src/business/business-gnome/glade/order.glade.h:6
+#: ../src/business/business-gnome/glade/order.glade.h:5
msgid "Date Closed"
msgstr "Schlussdatum"
@@ -1158,12 +1232,12 @@
msgstr "Mandantname"
#: ../src/business/business-gnome/dialog-order.c:818
-#: ../src/business/business-gnome/glade/order.glade.h:13
+#: ../src/business/business-gnome/glade/order.glade.h:12
msgid "Order ID"
msgstr "Bestellungsnummer"
#: ../src/business/business-gnome/dialog-order.c:829
-#: ../src/gnome/glade/lots.glade.h:10
+#: ../src/gnome/lot-viewer.c:615
msgid "Closed"
msgstr "Geschlossen"
@@ -1171,31 +1245,31 @@
msgid "Find Order"
msgstr "Bestellung suchen"
-#: ../src/business/business-gnome/dialog-payment.c:226
+#: ../src/business/business-gnome/dialog-payment.c:228
msgid ""
"You must enter the amount of the payment. The payment amount must be "
"greater than zero."
msgstr ""
"Sie müssen den Zahlungsbetrag angeben. Der Betrag muss größer als Null sein."
-#: ../src/business/business-gnome/dialog-payment.c:235
+#: ../src/business/business-gnome/dialog-payment.c:237
msgid "You must select a company for payment processing."
msgstr "Sie müssen eine Firma für die Zahlungsverarbeitung auswählen."
-#: ../src/business/business-gnome/dialog-payment.c:243
+#: ../src/business/business-gnome/dialog-payment.c:245
msgid "You must select a transfer account from the account tree."
msgstr "Sie müssen ein Herkunftskonto aus der Kontenhierarchie wählen."
-#: ../src/business/business-gnome/dialog-payment.c:251
+#: ../src/business/business-gnome/dialog-payment.c:253
msgid "You must enter an account name for posting."
msgstr "Sie müssen einen Kontonamen zum Buchen eingeben."
-#: ../src/business/business-gnome/dialog-payment.c:260
+#: ../src/business/business-gnome/dialog-payment.c:262
#, c-format
msgid "Your selected post account, %s, does not exist"
msgstr "Das gewählte Buchungskonto %s existiert nicht"
-#: ../src/business/business-gnome/dialog-payment.c:460
+#: ../src/business/business-gnome/dialog-payment.c:463
#, c-format
msgid ""
"You have no valid \"Post To\" accounts. Please create an account of type \"%"
@@ -1224,7 +1298,7 @@
msgstr "Zulieferer bearbeiten"
#: ../src/business/business-gnome/dialog-vendor.c:296
-#: ../src/business/business-gnome/glade/vendor.glade.h:10
+#: ../src/business/business-gnome/glade/vendor.glade.h:9
msgid "New Vendor"
msgstr "Neuer Zulieferer"
@@ -1266,33 +1340,32 @@
msgstr "<b>Zahlungsbedingungen</b>"
#: ../src/business/business-gnome/glade/billterms.glade.h:4
-msgid "Absolute Day-of-the-month"
-msgstr "Absoluter Tag des Monats"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:5
msgid "Cancel your changes"
msgstr "Änderungen verwerfen"
-#: ../src/business/business-gnome/glade/billterms.glade.h:6
-msgid "Choose the type of Billing Term"
-msgstr "Wählen Sie die Art der Zahlungsbedingungen"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:7
+#: ../src/business/business-gnome/glade/billterms.glade.h:5
msgid "Close this window"
msgstr "Dieses Fenster schließen"
-#: ../src/business/business-gnome/glade/billterms.glade.h:8
+#: ../src/business/business-gnome/glade/billterms.glade.h:6
msgid "Commit this Billing Term"
msgstr "Zahlungsbedingungen abspeichern"
-#: ../src/business/business-gnome/glade/billterms.glade.h:9
+#: ../src/business/business-gnome/glade/billterms.glade.h:7
msgid "Create a new Billing Term"
msgstr "Neue Zahlungsbedingungen erstellen"
-#: ../src/business/business-gnome/glade/billterms.glade.h:10
+#: ../src/business/business-gnome/glade/billterms.glade.h:8
msgid "Cutoff Day: "
msgstr "Stichtag Monatswechsel: "
+#: ../src/business/business-gnome/glade/billterms.glade.h:10
+#, fuzzy
+msgid ""
+"Days\n"
+"Proximo"
+msgstr "Im nächsten Monat"
+
#: ../src/business/business-gnome/glade/billterms.glade.h:12
msgid "De_scription:"
msgstr "_Beschreibung:"
@@ -1326,25 +1399,25 @@
msgid "Edit the current Billing Term"
msgstr "Ausgewählte Zahlungsbedingungen bearbeiten"
-#: ../src/business/business-gnome/glade/billterms.glade.h:21
-msgid "Number of days from now"
-msgstr "Anzahl Tage von jetzt an gerechnet"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:23
+#: ../src/business/business-gnome/glade/billterms.glade.h:22
msgid "Table"
msgstr "Tabelle"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/glade/billterms.glade.h:24
-#: ../src/business/business-gnome/glade/invoice.glade.h:24
-#: ../intl-scm/guile-strings.c:3382 ../intl-scm/guile-strings.c:3692
-#: ../intl-scm/guile-strings.c:3922
+#: ../src/business/business-gnome/glade/billterms.glade.h:23
+#: ../src/business/business-gnome/glade/invoice.glade.h:23
+#: ../intl-scm/guile-strings.c:6108 ../intl-scm/guile-strings.c:6418
+#: ../intl-scm/guile-strings.c:6632 ../intl-scm/guile-strings.c:6942
+#: ../intl-scm/guile-strings.c:7174 ../intl-scm/guile-strings.c:7414
msgid "Terms"
msgstr "Bedingungen"
-#: ../src/business/business-gnome/glade/billterms.glade.h:25
+#: ../src/business/business-gnome/glade/billterms.glade.h:24
msgid ""
"The cutoff day for applying bills to the next month. After the cutoff, "
"bills are applied to the following month. Negative values count backwards "
@@ -1354,29 +1427,29 @@
"nach dem Stichtag werden im folgenden Monat berechnet. Negative Werte zählen "
"vom Monatsende rückwärts."
-#: ../src/business/business-gnome/glade/billterms.glade.h:26
+#: ../src/business/business-gnome/glade/billterms.glade.h:25
msgid "The day of the month bills are due"
msgstr "Tag des Monats, an dem Rechnungen fällig werden"
-#: ../src/business/business-gnome/glade/billterms.glade.h:27
+#: ../src/business/business-gnome/glade/billterms.glade.h:26
msgid "The description of the Billing Term, printed on invoices"
msgstr ""
"Beschreibung der Zahlungsbedingungen, wie sie auf eine Rechnung gedruckt "
"werden"
-#: ../src/business/business-gnome/glade/billterms.glade.h:28
+#: ../src/business/business-gnome/glade/billterms.glade.h:27
msgid "The discount percentage applied if paid early."
msgstr "Prozent Skonto bei früher Zahlung"
-#: ../src/business/business-gnome/glade/billterms.glade.h:29
+#: ../src/business/business-gnome/glade/billterms.glade.h:28
msgid "The internal name of the Billing Term."
msgstr "Interner Name für die Zahlungsbedingungen."
-#: ../src/business/business-gnome/glade/billterms.glade.h:30
+#: ../src/business/business-gnome/glade/billterms.glade.h:29
msgid "The last day of the month for the early payment discount."
msgstr "Letzter Tag im Monat für Frühzahlungs-Skonto."
-#: ../src/business/business-gnome/glade/billterms.glade.h:31
+#: ../src/business/business-gnome/glade/billterms.glade.h:30
msgid ""
"The number of days after the post date during which a discount will be "
"applied for early payment."
@@ -1384,28 +1457,24 @@
"Die Anzahl der Tage nach dem Rechnungsdatum, in denen ein Skonto für "
"frühzeitige Zahlung gewährt wird."
-#: ../src/business/business-gnome/glade/billterms.glade.h:32
+#: ../src/business/business-gnome/glade/billterms.glade.h:31
msgid "The number of days to pay the bill after the post date."
msgstr ""
"Die Anzahl der Tage nach Ausstellung, in denen die Rechnung gezahlt werden "
"soll."
-#: ../src/business/business-gnome/glade/billterms.glade.h:33
+#: ../src/business/business-gnome/glade/billterms.glade.h:32
msgid "The percentage discount applied for early payment."
msgstr "Prozent Skonto bei früher Zahlung."
-#: ../src/business/business-gnome/glade/billterms.glade.h:34
-msgid "Type Menu"
-msgstr "Typ-Menü"
-
-#: ../src/business/business-gnome/glade/billterms.glade.h:35
-#: ../src/report/report-gnome/report.glade.h:21
+#: ../src/business/business-gnome/glade/billterms.glade.h:33
+#: ../src/report/report-gnome/report.glade.h:18
msgid "_Name:"
msgstr "_Name:"
-#: ../src/business/business-gnome/glade/billterms.glade.h:36
+#: ../src/business/business-gnome/glade/billterms.glade.h:34
#: ../src/gnome/glade/price.glade.h:25
-#: ../src/gnome-utils/glade/commodity.glade.h:23
+#: ../src/gnome-utils/glade/commodity.glade.h:22
msgid "_Type:"
msgstr "_Typ:"
@@ -1436,15 +1505,15 @@
"geöffnet."
#: ../src/business/business-gnome/glade/businessprefs.glade.h:6
-#: ../src/gnome-utils/glade/preferences.glade.h:76
+#: ../src/gnome-utils/glade/preferences.glade.h:83
msgid "Number of _rows:"
msgstr "Anzahl der _Zeilen:"
#: ../src/business/business-gnome/glade/businessprefs.glade.h:7
-#: ../src/gnome/glade/sched-xact.glade.h:142
-#: ../src/import-export/generic-import.glade.h:46
+#: ../src/gnome/glade/sched-xact.glade.h:168
+#: ../src/import-export/generic-import.glade.h:40
#: ../src/import-export/hbci/glade/hbciprefs.glade.h:3
-#: ../src/import-export/qif-import/qif.glade.h:64
+#: ../src/import-export/qif-import/qif.glade.h:57
msgid "Preferences"
msgstr "Einstellungen"
@@ -1511,175 +1580,184 @@
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-gnome/glade/choose-owner.glade.h:2
-#: ../src/business/business-gnome/glade/date-close.glade.h:2
+#: ../src/business/business-gnome/glade/date-close.glade.h:1
#: ../src/business/business-ledger/gncEntryLedgerModel.c:75
#: ../src/gnome/dialog-find-transactions.c:128
-#: ../src/gnome/dialog-tax-info.c:727 ../src/gnome/glade/lots.glade.h:13
+#: ../src/gnome/dialog-tax-info.c:719 ../src/gnome/glade/lots.glade.h:10
#: ../src/gnome/reconcile-list.c:219
#: ../src/gnome-utils/gnc-tree-model-budget.c:102
-#: ../src/gnome-utils/gnc-tree-view-account.c:535
-#: ../src/import-export/generic-import.glade.h:19
-#: ../src/import-export/qif-import/qif.glade.h:19
+#: ../src/gnome-utils/gnc-tree-view-account.c:531
+#: ../src/import-export/generic-import.glade.h:16
+#: ../src/import-export/import-main-matcher.c:421
+#: ../src/import-export/import-match-picker.c:335
+#: ../src/import-export/import-match-picker.c:375
+#: ../src/import-export/qif-import/druid-qif-import.c:2164
+#: ../src/import-export/qif-import/druid-qif-import.c:2196
#: ../src/register/ledger-core/split-register-model.c:139
-#: ../intl-scm/guile-strings.c:1280 ../intl-scm/guile-strings.c:1482
-#: ../intl-scm/guile-strings.c:1946 ../intl-scm/guile-strings.c:2186
-#: ../intl-scm/guile-strings.c:2246 ../intl-scm/guile-strings.c:2364
-#: ../intl-scm/guile-strings.c:2440 ../intl-scm/guile-strings.c:2558
-#: ../intl-scm/guile-strings.c:2598 ../intl-scm/guile-strings.c:3190
-#: ../intl-scm/guile-strings.c:3218 ../intl-scm/guile-strings.c:3406
-#: ../intl-scm/guile-strings.c:3508 ../intl-scm/guile-strings.c:3536
-#: ../intl-scm/guile-strings.c:3766 ../intl-scm/guile-strings.c:3794
+#: ../intl-scm/guile-strings.c:1990 ../intl-scm/guile-strings.c:2192
+#: ../intl-scm/guile-strings.c:2614 ../intl-scm/guile-strings.c:2816
+#: ../intl-scm/guile-strings.c:3280 ../intl-scm/guile-strings.c:3520
+#: ../intl-scm/guile-strings.c:3580 ../intl-scm/guile-strings.c:3698
+#: ../intl-scm/guile-strings.c:3774 ../intl-scm/guile-strings.c:3892
+#: ../intl-scm/guile-strings.c:3932 ../intl-scm/guile-strings.c:4430
+#: ../intl-scm/guile-strings.c:4670 ../intl-scm/guile-strings.c:4730
+#: ../intl-scm/guile-strings.c:4848 ../intl-scm/guile-strings.c:4924
+#: ../intl-scm/guile-strings.c:5042 ../intl-scm/guile-strings.c:5082
+#: ../intl-scm/guile-strings.c:5916 ../intl-scm/guile-strings.c:5944
+#: ../intl-scm/guile-strings.c:6132 ../intl-scm/guile-strings.c:6234
+#: ../intl-scm/guile-strings.c:6262 ../intl-scm/guile-strings.c:6440
+#: ../intl-scm/guile-strings.c:6468 ../intl-scm/guile-strings.c:6656
+#: ../intl-scm/guile-strings.c:6758 ../intl-scm/guile-strings.c:6786
+#: ../intl-scm/guile-strings.c:7018 ../intl-scm/guile-strings.c:7046
+#: ../intl-scm/guile-strings.c:7258 ../intl-scm/guile-strings.c:7286
msgid "Description"
msgstr "Beschreibung"
#: ../src/business/business-gnome/glade/customer.glade.h:1
-#: ../src/business/business-gnome/glade/date-close.glade.h:1
-#: ../src/business/business-gnome/glade/employee.glade.h:1
+#: ../src/business/business-gnome/glade/employee.glade.h:3
#: ../src/business/business-gnome/glade/invoice.glade.h:2
#: ../src/business/business-gnome/glade/job.glade.h:1
#: ../src/business/business-gnome/glade/order.glade.h:2
-#: ../src/business/business-gnome/glade/payment.glade.h:1
#: ../src/business/business-gnome/glade/vendor.glade.h:1
-#: ../src/gnome/glade/acctperiod.glade.h:1 ../src/gnome/glade/lots.glade.h:1
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:3
-#: ../src/gnome-utils/glade/transfer.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Active"
+msgstr "Aktiv"
#: ../src/business/business-gnome/glade/customer.glade.h:2
#: ../src/business/business-gnome/glade/employee.glade.h:4
-#: ../src/business/business-gnome/glade/invoice.glade.h:3
-#: ../src/business/business-gnome/glade/job.glade.h:2
-#: ../src/business/business-gnome/glade/order.glade.h:3
#: ../src/business/business-gnome/glade/vendor.glade.h:2
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/business/business-gnome/glade/customer.glade.h:3
-#: ../src/business/business-gnome/glade/employee.glade.h:5
-#: ../src/business/business-gnome/glade/vendor.glade.h:3
msgid "Address: "
msgstr "Adresse: "
-#: ../src/business/business-gnome/glade/customer.glade.h:4
+#: ../src/business/business-gnome/glade/customer.glade.h:3
msgid "Billing Address"
msgstr "Rechnungsadresse"
-#: ../src/business/business-gnome/glade/customer.glade.h:5
-#: ../src/business/business-gnome/glade/invoice.glade.h:6
-#: ../src/business/business-gnome/glade/order.glade.h:4
+#: ../src/business/business-gnome/glade/customer.glade.h:4
+#: ../src/business/business-gnome/glade/invoice.glade.h:5
+#: ../src/business/business-gnome/glade/order.glade.h:3
msgid "Billing Information"
msgstr "Rechnungs-Informationen"
-#: ../src/business/business-gnome/glade/customer.glade.h:6
-#: ../src/business/business-gnome/glade/vendor.glade.h:4
+#: ../src/business/business-gnome/glade/customer.glade.h:5
+#: ../src/business/business-gnome/glade/vendor.glade.h:3
msgid "Company Name: "
msgstr "Firmenname: "
-#: ../src/business/business-gnome/glade/customer.glade.h:7
+#: ../src/business/business-gnome/glade/customer.glade.h:6
msgid "Credit Limit: "
msgstr "Kreditrahmen: "
-#: ../src/business/business-gnome/glade/customer.glade.h:8
-#: ../src/business/business-gnome/glade/employee.glade.h:8
-#: ../src/business/business-gnome/glade/vendor.glade.h:5
+#: ../src/business/business-gnome/glade/customer.glade.h:7
+#: ../src/business/business-gnome/glade/employee.glade.h:7
+#: ../src/business/business-gnome/glade/vendor.glade.h:4
msgid "Currency: "
msgstr "Währung: "
#. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/glade/customer.glade.h:9
-#: ../src/business/business-gnome/glade/invoice.glade.h:7
-#: ../src/business/business-gnome/search-owner.c:251
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/glade/customer.glade.h:8
+#: ../src/business/business-gnome/glade/invoice.glade.h:6
+#: ../src/business/business-gnome/search-owner.c:236
#: ../src/register/ledger-core/split-register-model.c:135
-#: ../intl-scm/guile-strings.c:3472
+#: ../intl-scm/guile-strings.c:6198 ../intl-scm/guile-strings.c:6722
msgid "Customer"
msgstr "Kunde"
-#: ../src/business/business-gnome/glade/customer.glade.h:10
+#: ../src/business/business-gnome/glade/customer.glade.h:9
msgid "Customer Number: "
msgstr "Kundennummer: "
-#: ../src/business/business-gnome/glade/customer.glade.h:11
+#: ../src/business/business-gnome/glade/customer.glade.h:10
msgid "Discount: "
msgstr "Skonto: "
-#: ../src/business/business-gnome/glade/customer.glade.h:12
-#: ../src/business/business-gnome/glade/employee.glade.h:11
-#: ../src/business/business-gnome/glade/vendor.glade.h:6
+#: ../src/business/business-gnome/glade/customer.glade.h:11
+#: ../src/business/business-gnome/glade/employee.glade.h:10
+#: ../src/business/business-gnome/glade/vendor.glade.h:5
msgid "Email: "
msgstr "E-Mail: "
+#: ../src/business/business-gnome/glade/customer.glade.h:12
+#: ../src/business/business-gnome/glade/employee.glade.h:13
+#: ../src/business/business-gnome/glade/vendor.glade.h:6
+msgid "Fax: "
+msgstr "Fax: "
+
#: ../src/business/business-gnome/glade/customer.glade.h:13
#: ../src/business/business-gnome/glade/employee.glade.h:14
#: ../src/business/business-gnome/glade/vendor.glade.h:7
-msgid "Fax: "
-msgstr "Fax: "
+msgid "Identification"
+msgstr "Identifizierung"
#: ../src/business/business-gnome/glade/customer.glade.h:14
-#: ../src/business/business-gnome/glade/employee.glade.h:15
+#: ../src/business/business-gnome/glade/employee.glade.h:17
#: ../src/business/business-gnome/glade/vendor.glade.h:8
-msgid "Identification"
-msgstr "Identifizierung"
-
-#: ../src/business/business-gnome/glade/customer.glade.h:15
-#: ../src/business/business-gnome/glade/employee.glade.h:18
-#: ../src/business/business-gnome/glade/vendor.glade.h:9
msgid "Name: "
msgstr "Name: "
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../src/business/business-gnome/glade/customer.glade.h:17
-#: ../src/business/business-gnome/glade/invoice.glade.h:21
-#: ../src/business/business-gnome/glade/order.glade.h:10
-#: ../src/business/business-gnome/glade/vendor.glade.h:11
+#: ../src/business/business-gnome/glade/customer.glade.h:16
+#: ../src/business/business-gnome/glade/invoice.glade.h:20
+#: ../src/business/business-gnome/glade/order.glade.h:9
+#: ../src/business/business-gnome/glade/vendor.glade.h:10
#: ../src/gnome/dialog-find-transactions.c:120
-#: ../src/gnome-utils/gnc-tree-view-account.c:637
+#: ../src/gnome-utils/gnc-tree-view-account.c:633
#: ../src/register/ledger-core/split-register-model.c:310
-#: ../intl-scm/guile-strings.c:1952
+#: ../intl-scm/guile-strings.c:3286 ../intl-scm/guile-strings.c:4436
msgid "Notes"
msgstr "Bemerkung"
-#: ../src/business/business-gnome/glade/customer.glade.h:18
-#: ../src/business/business-gnome/glade/vendor.glade.h:12
+#: ../src/business/business-gnome/glade/customer.glade.h:17
+#: ../src/business/business-gnome/glade/vendor.glade.h:11
msgid "Override the global Tax Table?"
msgstr "Globale Steuertabelle ignorieren?"
-#: ../src/business/business-gnome/glade/customer.glade.h:19
-#: ../src/business/business-gnome/glade/employee.glade.h:21
-#: ../src/business/business-gnome/glade/vendor.glade.h:15
+#: ../src/business/business-gnome/glade/customer.glade.h:18
+#: ../src/business/business-gnome/glade/employee.glade.h:20
+#: ../src/business/business-gnome/glade/vendor.glade.h:14
msgid "Phone: "
msgstr "Telefon: "
-#: ../src/business/business-gnome/glade/customer.glade.h:20
+#: ../src/business/business-gnome/glade/customer.glade.h:19
msgid "Shipping Address"
msgstr "Lieferadresse"
-#: ../src/business/business-gnome/glade/customer.glade.h:21
+#: ../src/business/business-gnome/glade/customer.glade.h:20
msgid "Shipping Information"
msgstr "Lieferadresse"
-#: ../src/business/business-gnome/glade/customer.glade.h:22
+#: ../src/business/business-gnome/glade/customer.glade.h:21
msgid "Tax Included: "
msgstr "Inkl. Steuern: "
-#: ../src/business/business-gnome/glade/customer.glade.h:23
+#: ../src/business/business-gnome/glade/customer.glade.h:22
msgid "Tax Table: "
msgstr "Steuertabelle: "
-#: ../src/business/business-gnome/glade/customer.glade.h:24
-#: ../src/business/business-gnome/glade/vendor.glade.h:18
+#: ../src/business/business-gnome/glade/customer.glade.h:23
+#: ../src/business/business-gnome/glade/vendor.glade.h:17
msgid "Terms: "
msgstr "Bedingungen: "
-#: ../src/business/business-gnome/glade/customer.glade.h:25
+#: ../src/business/business-gnome/glade/customer.glade.h:24
msgid ""
"The customer ID number. If left blank a reasonable number will be chosen "
"for you"
@@ -1687,80 +1765,81 @@
"Die Kundennummer. Falls keine angegeben wird, wird automatisch ein "
"sinnvoller Wert gewählt."
-#: ../src/business/business-gnome/glade/customer.glade.h:26
+#: ../src/business/business-gnome/glade/customer.glade.h:25
msgid "What Tax Table should be applied to this customer?"
msgstr "Welche Steuertabelle soll bei diesem Kunden angewendet werden?"
-#: ../src/business/business-gnome/glade/date-close.glade.h:3
+#: ../src/business/business-gnome/glade/date-close.glade.h:2
msgid "Question"
msgstr "Frage"
-#: ../src/business/business-gnome/glade/date-close.glade.h:4
+#: ../src/business/business-gnome/glade/date-close.glade.h:3
msgid "acct"
msgstr "Konto"
-#: ../src/business/business-gnome/glade/date-close.glade.h:5
+#: ../src/business/business-gnome/glade/date-close.glade.h:4
msgid "duedate"
msgstr "Fällig"
-#: ../src/business/business-gnome/glade/date-close.glade.h:6
+#: ../src/business/business-gnome/glade/date-close.glade.h:5
msgid "postd"
msgstr "Gebucht"
-#: ../src/business/business-gnome/glade/date-close.glade.h:7
+#: ../src/business/business-gnome/glade/date-close.glade.h:6
msgid "question"
msgstr "Frage"
-#: ../src/business/business-gnome/glade/employee.glade.h:2
+#: ../src/business/business-gnome/glade/employee.glade.h:1
msgid "Access Control"
msgstr "Zugriffskontrolle"
-#: ../src/business/business-gnome/glade/employee.glade.h:3
+#: ../src/business/business-gnome/glade/employee.glade.h:2
msgid "Access Control List"
msgstr "Zugriffskontroll-Liste"
-#: ../src/business/business-gnome/glade/employee.glade.h:6
+#: ../src/business/business-gnome/glade/employee.glade.h:5
msgid "Billing"
msgstr "Rechnung ausstellen"
-#: ../src/business/business-gnome/glade/employee.glade.h:7
-#: ../src/gnome-utils/dialog-transfer.c:1734
+#: ../src/business/business-gnome/glade/employee.glade.h:6
+#: ../src/gnome-utils/dialog-transfer.c:1736
msgid "Credit Account"
msgstr "Habenkonto"
-#: ../src/business/business-gnome/glade/employee.glade.h:9
+#: ../src/business/business-gnome/glade/employee.glade.h:8
msgid "Default Hours per Day: "
msgstr "Voreinstellung Stunden pro Tag: "
-#: ../src/business/business-gnome/glade/employee.glade.h:10
+#: ../src/business/business-gnome/glade/employee.glade.h:9
msgid "Default Rate: "
msgstr "Voreinstellung Stundenlohn: "
#. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/glade/employee.glade.h:12
-#: ../src/business/business-gnome/search-owner.c:254
-#: ../intl-scm/guile-strings.c:3476
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/glade/employee.glade.h:11
+#: ../src/business/business-gnome/search-owner.c:238
+#: ../intl-scm/guile-strings.c:6202 ../intl-scm/guile-strings.c:6726
msgid "Employee"
msgstr "Mitarbeiter"
-#: ../src/business/business-gnome/glade/employee.glade.h:13
+#: ../src/business/business-gnome/glade/employee.glade.h:12
msgid "Employee Number: "
msgstr "Mitarbeiternummer: "
-#: ../src/business/business-gnome/glade/employee.glade.h:16
+#: ../src/business/business-gnome/glade/employee.glade.h:15
msgid "Interface"
msgstr "Interface"
-#: ../src/business/business-gnome/glade/employee.glade.h:17
+#: ../src/business/business-gnome/glade/employee.glade.h:16
msgid "Language: "
msgstr "Sprache: "
-#: ../src/business/business-gnome/glade/employee.glade.h:20
-#: ../src/business/business-gnome/glade/vendor.glade.h:13
+#: ../src/business/business-gnome/glade/employee.glade.h:19
+#: ../src/business/business-gnome/glade/vendor.glade.h:12
msgid "Payment Address"
msgstr "Zahlungsadresse"
-#: ../src/business/business-gnome/glade/employee.glade.h:22
+#: ../src/business/business-gnome/glade/employee.glade.h:21
msgid ""
"The employee ID number. If left blank a reasonable number will be chosen "
"for you"
@@ -1768,7 +1847,7 @@
"Die Mitarbeiternummer. Falls keine angegeben wird, wird automatisch ein "
"sinnvoller Wert gewählt."
-#: ../src/business/business-gnome/glade/employee.glade.h:23
+#: ../src/business/business-gnome/glade/employee.glade.h:22
msgid "Username: "
msgstr "Benutzername: "
@@ -1777,52 +1856,52 @@
msgid "(owner)"
msgstr "(Mandant)"
-#: ../src/business/business-gnome/glade/invoice.glade.h:4
+#: ../src/business/business-gnome/glade/invoice.glade.h:3
msgid "Additional to Card:"
msgstr "Zusätzlich auf Karte:"
-#: ../src/business/business-gnome/glade/invoice.glade.h:8
+#: ../src/business/business-gnome/glade/invoice.glade.h:7
msgid "Customer: "
msgstr "Kunde: "
-#: ../src/business/business-gnome/glade/invoice.glade.h:11
+#: ../src/business/business-gnome/glade/invoice.glade.h:10
msgid "Default Chargeback Project"
msgstr "Standard-Auftrag zur Rückzahlung"
-#: ../src/business/business-gnome/glade/invoice.glade.h:12
+#: ../src/business/business-gnome/glade/invoice.glade.h:11
msgid "Extra Payments"
msgstr "Zusätzliche Zahlungen"
-#: ../src/business/business-gnome/glade/invoice.glade.h:14
+#: ../src/business/business-gnome/glade/invoice.glade.h:13
msgid "Invoice Entries"
msgstr "Rechnungseinträge"
-#: ../src/business/business-gnome/glade/invoice.glade.h:16
+#: ../src/business/business-gnome/glade/invoice.glade.h:15
msgid "Invoice Information"
msgstr "Rechnungs-Informationen"
-#: ../src/business/business-gnome/glade/invoice.glade.h:17
-#: ../src/business/business-gnome/search-owner.c:255
+#: ../src/business/business-gnome/glade/invoice.glade.h:16
+#: ../src/business/business-gnome/search-owner.c:239
msgid "Job"
msgstr "Auftrag"
-#: ../src/business/business-gnome/glade/invoice.glade.h:18
+#: ../src/business/business-gnome/glade/invoice.glade.h:17
msgid "Job: "
msgstr "Auftrag: "
-#: ../src/business/business-gnome/glade/invoice.glade.h:20
+#: ../src/business/business-gnome/glade/invoice.glade.h:19
msgid "No, keep them as they are"
msgstr "Nein, unverändert beibehalten"
-#: ../src/business/business-gnome/glade/invoice.glade.h:22
+#: ../src/business/business-gnome/glade/invoice.glade.h:21
msgid "Posted Account"
msgstr "Gebuchtes Konto"
-#: ../src/business/business-gnome/glade/invoice.glade.h:23
+#: ../src/business/business-gnome/glade/invoice.glade.h:22
msgid "Reset Tax Tables to present Values?"
msgstr "Steuertabellen zu eingegebenen Werten aktualisieren?"
-#: ../src/business/business-gnome/glade/invoice.glade.h:25
+#: ../src/business/business-gnome/glade/invoice.glade.h:24
msgid ""
"The invoice ID number. If left blank a reasonable number will be chosen for "
"you."
@@ -1830,7 +1909,7 @@
"Die Rechnungsnummer. Falls keine angegeben wird, wird automatisch ein "
"sinnvoller Wert gewählt."
-#: ../src/business/business-gnome/glade/invoice.glade.h:26
+#: ../src/business/business-gnome/glade/invoice.glade.h:25
msgid ""
"Unposting this Invoice will delete the posted transaction.\n"
"Are you sure you want to unpost it?"
@@ -1838,67 +1917,71 @@
"Das Rückgängigmachen dieser Rechnung wird die gespeicherte Buchung\n"
"löschen. Wollen Sie sie wirklich rückgängig machen?"
-#: ../src/business/business-gnome/glade/invoice.glade.h:28
+#: ../src/business/business-gnome/glade/invoice.glade.h:27
msgid "Yes, reset the Tax Tables"
msgstr "Ja, Steuertabellen zurücksetzen"
-#: ../src/business/business-gnome/glade/job.glade.h:4
+#: ../src/business/business-gnome/glade/job.glade.h:3
msgid "Job Active"
msgstr "Auftrag aktiv"
-#: ../src/business/business-gnome/glade/job.glade.h:5
+#: ../src/business/business-gnome/glade/job.glade.h:4
msgid "Job Dialog"
msgstr "Auftrag-Dialog"
-#: ../src/business/business-gnome/glade/job.glade.h:6
+#: ../src/business/business-gnome/glade/job.glade.h:5
msgid "Job Information"
msgstr "Auftragsinformationen"
-#: ../src/business/business-gnome/glade/job.glade.h:9
+#: ../src/business/business-gnome/glade/job.glade.h:8
msgid "Owner Information"
msgstr "Mandanteninformationen"
-#: ../src/business/business-gnome/glade/job.glade.h:10
+#: ../src/business/business-gnome/glade/job.glade.h:9
msgid ""
"The job ID number. If left blank a reasonable number will be chosen for you"
msgstr ""
"Die Auftragsnummer. Falls keine angegeben wird, wird automatisch ein "
"sinnvoller Wert gewählt."
-#: ../src/business/business-gnome/glade/order.glade.h:5
+#: ../src/business/business-gnome/glade/order.glade.h:4
msgid "Close Order"
msgstr "Bestellung schließen"
-#: ../src/business/business-gnome/glade/order.glade.h:8
+#: ../src/business/business-gnome/glade/order.glade.h:7
msgid "Invoices"
msgstr "Rechnungen"
-#: ../src/business/business-gnome/glade/order.glade.h:9
+#: ../src/business/business-gnome/glade/order.glade.h:8
msgid "New Order"
msgstr "Neue Bestellung"
-#: ../src/business/business-gnome/glade/order.glade.h:11
+#: ../src/business/business-gnome/glade/order.glade.h:10
msgid "Order Entries"
msgstr "Bestellungsposten"
-#: ../src/business/business-gnome/glade/order.glade.h:12
+#: ../src/business/business-gnome/glade/order.glade.h:11
msgid "Order Entry"
msgstr "Bestellungsposten"
-#: ../src/business/business-gnome/glade/order.glade.h:14
+#: ../src/business/business-gnome/glade/order.glade.h:13
msgid "Order Information"
msgstr "Bestellungsinformationen"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/glade/order.glade.h:15
-#: ../intl-scm/guile-strings.c:3380 ../intl-scm/guile-strings.c:3402
-#: ../intl-scm/guile-strings.c:3920
+#: ../src/business/business-gnome/glade/order.glade.h:14
+#: ../intl-scm/guile-strings.c:6106 ../intl-scm/guile-strings.c:6128
+#: ../intl-scm/guile-strings.c:6630 ../intl-scm/guile-strings.c:6652
+#: ../intl-scm/guile-strings.c:7172 ../intl-scm/guile-strings.c:7412
msgid "Reference"
msgstr "Referenz"
-#: ../src/business/business-gnome/glade/order.glade.h:16
+#: ../src/business/business-gnome/glade/order.glade.h:15
msgid ""
"The order ID number. If left blank a reasonable number will be chosen for "
"you"
@@ -1906,9 +1989,17 @@
"Die Bestellungsnummer. Falls keine angegeben wird, wird automatisch ein "
"sinnvoller Wert gewählt."
+#. Add the columns
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/transaction.scm
@@ -1916,63 +2007,86 @@
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../src/business/business-gnome/glade/payment.glade.h:3
+#: ../src/business/business-gnome/glade/payment.glade.h:2
#: ../src/business/business-ledger/gncEntryLedgerModel.c:70
-#: ../src/gnome/druid-loan.c:1779 ../src/gnome/glade/lots.glade.h:11
+#: ../src/gnome/druid-loan.c:1783 ../src/gnome/glade/lots.glade.h:8
#: ../src/gnome/glade/register.glade.h:14 ../src/gnome/reconcile-list.c:226
#: ../src/gnome-utils/gnc-tree-view-price.c:447
-#: ../src/import-export/generic-import.glade.h:18
-#: ../src/import-export/qif-import/qif.glade.h:18
+#: ../src/import-export/generic-import.glade.h:15
+#: ../src/import-export/import-main-matcher.c:417
+#: ../src/import-export/import-match-picker.c:333
+#: ../src/import-export/import-match-picker.c:373
+#: ../src/import-export/qif-import/druid-qif-import.c:2158
+#: ../src/import-export/qif-import/druid-qif-import.c:2190
#: ../src/register/ledger-core/split-register-model.c:102
-#: ../intl-scm/guile-strings.c:1276 ../intl-scm/guile-strings.c:1476
-#: ../intl-scm/guile-strings.c:1718 ../intl-scm/guile-strings.c:1862
-#: ../intl-scm/guile-strings.c:1976 ../intl-scm/guile-strings.c:2174
-#: ../intl-scm/guile-strings.c:2240 ../intl-scm/guile-strings.c:2336
-#: ../intl-scm/guile-strings.c:2428 ../intl-scm/guile-strings.c:2554
-#: ../intl-scm/guile-strings.c:2586 ../intl-scm/guile-strings.c:2654
-#: ../intl-scm/guile-strings.c:3188 ../intl-scm/guile-strings.c:3212
-#: ../intl-scm/guile-strings.c:3398 ../intl-scm/guile-strings.c:3506
-#: ../intl-scm/guile-strings.c:3530 ../intl-scm/guile-strings.c:3764
-#: ../intl-scm/guile-strings.c:3788
+#: ../intl-scm/guile-strings.c:1986 ../intl-scm/guile-strings.c:2186
+#: ../intl-scm/guile-strings.c:2428 ../intl-scm/guile-strings.c:2610
+#: ../intl-scm/guile-strings.c:2810 ../intl-scm/guile-strings.c:3052
+#: ../intl-scm/guile-strings.c:3196 ../intl-scm/guile-strings.c:3310
+#: ../intl-scm/guile-strings.c:3508 ../intl-scm/guile-strings.c:3574
+#: ../intl-scm/guile-strings.c:3670 ../intl-scm/guile-strings.c:3762
+#: ../intl-scm/guile-strings.c:3888 ../intl-scm/guile-strings.c:3920
+#: ../intl-scm/guile-strings.c:3988 ../intl-scm/guile-strings.c:4346
+#: ../intl-scm/guile-strings.c:4460 ../intl-scm/guile-strings.c:4658
+#: ../intl-scm/guile-strings.c:4724 ../intl-scm/guile-strings.c:4820
+#: ../intl-scm/guile-strings.c:4912 ../intl-scm/guile-strings.c:5038
+#: ../intl-scm/guile-strings.c:5070 ../intl-scm/guile-strings.c:5138
+#: ../intl-scm/guile-strings.c:5914 ../intl-scm/guile-strings.c:5938
+#: ../intl-scm/guile-strings.c:6124 ../intl-scm/guile-strings.c:6232
+#: ../intl-scm/guile-strings.c:6256 ../intl-scm/guile-strings.c:6438
+#: ../intl-scm/guile-strings.c:6462 ../intl-scm/guile-strings.c:6648
+#: ../intl-scm/guile-strings.c:6756 ../intl-scm/guile-strings.c:6780
+#: ../intl-scm/guile-strings.c:7016 ../intl-scm/guile-strings.c:7040
+#: ../intl-scm/guile-strings.c:7256 ../intl-scm/guile-strings.c:7280
msgid "Date"
msgstr "Datum"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/business/business-gnome/glade/payment.glade.h:4
+#: ../src/business/business-gnome/glade/payment.glade.h:3
#: ../src/gnome/dialog-find-transactions.c:126
-#: ../src/import-export/generic-import.glade.h:40
+#: ../src/import-export/import-main-matcher.c:422
+#: ../src/import-export/import-match-picker.c:336
+#: ../src/import-export/import-match-picker.c:376
#: ../src/register/ledger-core/split-register-model.c:191
-#: ../intl-scm/guile-strings.c:1484 ../intl-scm/guile-strings.c:2218
-#: ../intl-scm/guile-strings.c:2248 ../intl-scm/guile-strings.c:2372
-#: ../intl-scm/guile-strings.c:2444
+#: ../intl-scm/guile-strings.c:2194 ../intl-scm/guile-strings.c:2818
+#: ../intl-scm/guile-strings.c:3552 ../intl-scm/guile-strings.c:3582
+#: ../intl-scm/guile-strings.c:3706 ../intl-scm/guile-strings.c:3778
+#: ../intl-scm/guile-strings.c:4702 ../intl-scm/guile-strings.c:4732
+#: ../intl-scm/guile-strings.c:4856 ../intl-scm/guile-strings.c:4928
msgid "Memo"
msgstr "Buchungstext"
-#: ../src/business/business-gnome/glade/payment.glade.h:6
-#: ../src/business/business-gnome/glade/vendor.glade.h:14
-#: ../src/gnome/window-reconcile.c:443
+#: ../src/business/business-gnome/glade/payment.glade.h:5
+#: ../src/business/business-gnome/glade/vendor.glade.h:13
+#: ../src/gnome/window-reconcile.c:442
msgid "Payment Information"
msgstr "Zahlungsinformation"
-#: ../src/business/business-gnome/glade/payment.glade.h:7
+#: ../src/business/business-gnome/glade/payment.glade.h:6
msgid "Post To"
msgstr "Buchen nach"
-#: ../src/business/business-gnome/glade/payment.glade.h:8
+#: ../src/business/business-gnome/glade/payment.glade.h:7
msgid "Transfer Account"
msgstr "Herkunftskonto"
-#: ../src/business/business-gnome/glade/vendor.glade.h:16
+#: ../src/business/business-gnome/glade/vendor.glade.h:15
msgid "Tax Included:"
msgstr "Inkl. Steuern:"
-#: ../src/business/business-gnome/glade/vendor.glade.h:17
+#: ../src/business/business-gnome/glade/vendor.glade.h:16
msgid "Tax Table:"
msgstr "Steuertabelle:"
-#: ../src/business/business-gnome/glade/vendor.glade.h:19
+#: ../src/business/business-gnome/glade/vendor.glade.h:18
msgid ""
"The vendor ID number. If left blank a reasonable number will be chosen for "
"you"
@@ -1981,27 +2095,36 @@
"sinnvoller Wert gewählt."
#. src/business/business-reports/owner-report.scm
-#: ../src/business/business-gnome/glade/vendor.glade.h:20
-#: ../src/business/business-gnome/search-owner.c:253
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/business/business-gnome/glade/vendor.glade.h:19
+#: ../src/business/business-gnome/search-owner.c:237
#: ../src/register/ledger-core/split-register-model.c:137
-#: ../intl-scm/guile-strings.c:3474
+#: ../intl-scm/guile-strings.c:6200 ../intl-scm/guile-strings.c:6724
msgid "Vendor"
msgstr "Zulieferer"
-#: ../src/business/business-gnome/glade/vendor.glade.h:21
+#: ../src/business/business-gnome/glade/vendor.glade.h:20
msgid "Vendor Number: "
msgstr "Zulieferer Nummer: "
-#: ../src/business/business-gnome/glade/vendor.glade.h:22
+#: ../src/business/business-gnome/glade/vendor.glade.h:21
msgid "What Tax Table should be applied to this vendor?"
msgstr "Welche Steuertabelle soll bei diesem Zulieferer angewendet werden?"
+#. src/business/business-utils/gnucash/business-utils.scm
+#. src/business/business-utils/business-utils.scm
+#: ../src/business/business-gnome/gncmod-business-gnome.c:133
+#: ../intl-scm/guile-strings.c:5868 ../intl-scm/guile-strings.c:5886
+msgid "Business"
+msgstr "Geschäft"
+
#. Toplevel
#. Extensions Menu
#. src/business/business-reports/business-reports.scm
+#. src/business/business-reports/gnucash/report/business-reports.scm
#: ../src/business/business-gnome/gnc-plugin-business.c:148
#: ../src/business/business-gnome/gnc-plugin-business.c:241
-#: ../intl-scm/guile-strings.c:3392
+#: ../intl-scm/guile-strings.c:6118 ../intl-scm/guile-strings.c:6642
msgid "_Business"
msgstr "_Geschäft"
@@ -2301,9 +2424,9 @@
msgstr "Kopieren"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:115
-#: ../src/gnome/gnc-plugin-page-register.c:179
-#: ../src/gnome-utils/gnc-main-window.c:248
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:941
+#: ../src/gnome/gnc-plugin-page-register.c:176
+#: ../src/gnome-utils/gnc-main-window.c:252
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:951
msgid "_Paste"
msgstr "E_infügen"
@@ -2344,7 +2467,7 @@
msgstr "Aktuellen Posten speichern"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:132
-#: ../src/gnome/glade/register.glade.h:79 ../src/gnome/window-reconcile.c:2000
+#: ../src/gnome/glade/register.glade.h:79 ../src/gnome/window-reconcile.c:2002
msgid "_Cancel"
msgstr "_Abbrechen"
@@ -2353,7 +2476,7 @@
msgstr "Aktuellen Posten abbrechen"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:135
-#: ../src/gnome/glade/register.glade.h:82 ../src/gnome/window-reconcile.c:2028
+#: ../src/gnome/glade/register.glade.h:82 ../src/gnome/window-reconcile.c:2030
msgid "_Delete"
msgstr "_Löschen"
@@ -2416,8 +2539,8 @@
msgstr "_Anzahl"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:163
-#: ../src/register/ledger-core/split-register.c:1693
-#: ../src/register/ledger-core/split-register.c:1695
+#: ../src/register/ledger-core/split-register.c:1715
+#: ../src/register/ledger-core/split-register.c:1717
msgid "_Price"
msgstr "_Preis"
@@ -2428,33 +2551,34 @@
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:193
#: ../src/gnome/glade/register.glade.h:25
-#: ../src/gnome/gnc-plugin-page-register.c:327
+#: ../src/gnome/gnc-plugin-page-register.c:324
msgid "Enter"
msgstr "Eingeben"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:194
#: ../src/gnome/glade/register.glade.h:6
-#: ../src/gnome/gnc-plugin-page-register.c:328
+#: ../src/gnome/gnc-plugin-page-register.c:325
msgid "Cancel"
msgstr "Abbrechen"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:195
#: ../src/gnome/glade/register.glade.h:16
#: ../src/gnome/gnc-plugin-page-account-tree.c:221
-#: ../src/gnome/gnc-plugin-page-budget.c:169
-#: ../src/gnome/gnc-plugin-page-register.c:329
+#: ../src/gnome/gnc-plugin-page-budget.c:165
+#: ../src/gnome/gnc-plugin-page-register.c:326
+#: ../src/gnome/gnc-plugin-page-sx-list.c:120
msgid "Delete"
msgstr "Löschen"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:196
#: ../src/gnome/glade/register.glade.h:20
-#: ../src/gnome/gnc-plugin-page-register.c:330
+#: ../src/gnome/gnc-plugin-page-register.c:327
msgid "Duplicate"
msgstr "Duplizieren"
#: ../src/business/business-gnome/gnc-plugin-page-invoice.c:197
#: ../src/gnome/glade/register.glade.h:3
-#: ../src/gnome/gnc-plugin-page-register.c:333
+#: ../src/gnome/gnc-plugin-page-register.c:330
msgid "Blank"
msgstr "Neu"
@@ -2542,7 +2666,7 @@
msgstr "Erinnerung an fällige Rechnungen für diese Anzahl von Tagen im Voraus"
#: ../src/business/business-gnome/schemas/apps_gnucash_dialog_business_common.schemas.in.h:12
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:42
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:44
msgid "The number of rows in an invoice"
msgstr "Standardanzahl von Zeilen, die in Rechnungen angezeigt werden sollen"
@@ -2581,32 +2705,31 @@
msgid "Window position and size"
msgstr "Fensterposition und Größe"
-#: ../src/business/business-gnome/search-owner.c:160
+#: ../src/business/business-gnome/search-owner.c:163
msgid "You have not selected an owner"
msgstr "Sie haben keinen Mandanten ausgewählt"
-#: ../src/business/business-gnome/search-owner.c:301
-#: ../src/gnome-search/search-boolean.c:201
-#: ../src/gnome-search/search-reconciled.c:209
+#: ../src/business/business-gnome/search-owner.c:256
+#: ../src/gnome-search/search-boolean.c:177
+#: ../src/gnome-search/search-reconciled.c:185
msgid "is"
msgstr "ist"
-#. Force one
-#: ../src/business/business-gnome/search-owner.c:303
-#: ../src/gnome-search/search-boolean.c:203
-#: ../src/gnome-search/search-reconciled.c:211
+#: ../src/business/business-gnome/search-owner.c:257
+#: ../src/gnome-search/search-boolean.c:178
+#: ../src/gnome-search/search-reconciled.c:186
msgid "is not"
msgstr "ist nicht"
#: ../src/business/business-ledger/gncEntryLedger.c:81
-#: ../src/gnome-utils/dialog-transfer.c:1377
-#: ../src/register/ledger-core/split-register.c:1474
+#: ../src/gnome-utils/dialog-transfer.c:1378
+#: ../src/register/ledger-core/split-register.c:1496
#, c-format
msgid "The account %s does not allow transactions."
msgstr "Das Konto %s kann keine Buchungen enthalten."
#: ../src/business/business-ledger/gncEntryLedger.c:82
-#: ../src/register/ledger-core/split-register.c:1475
+#: ../src/register/ledger-core/split-register.c:1497
#, c-format
msgid "The account %s does not exist. Would you like to create it?"
msgstr "Das Konto %s existiert nicht. Möchten Sie es erstellen?"
@@ -2624,12 +2747,12 @@
msgid "Material"
msgstr "Material"
-#: ../src/business/business-ledger/gncEntryLedger.c:802
+#: ../src/business/business-ledger/gncEntryLedger.c:805
#: ../src/business/business-ledger/gncEntryLedgerControl.c:485
msgid "Save the current entry?"
msgstr "Aktueller Eintrag speichern?"
-#: ../src/business/business-ledger/gncEntryLedger.c:804
+#: ../src/business/business-ledger/gncEntryLedger.c:807
msgid ""
"The current transaction has been changed. Would you like to record the "
"changes before duplicating this entry, or cancel the duplication?"
@@ -2638,10 +2761,10 @@
"bevor Sie die Kopie erstellen, oder soll der Kopiervorgang abgebrochen "
"werden?"
-#: ../src/business/business-ledger/gncEntryLedger.c:819
+#: ../src/business/business-ledger/gncEntryLedger.c:822
#: ../src/business/business-ledger/gncEntryLedgerControl.c:504
#: ../src/gnome/gnc-split-reg.c:727
-#: ../src/register/ledger-core/split-register.c:405
+#: ../src/register/ledger-core/split-register.c:423
msgid "_Record"
msgstr "_Speichern"
@@ -2759,10 +2882,15 @@
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:50
-#: ../src/gnome/glade/sched-xact.glade.h:3 ../intl-scm/guile-strings.c:3206
-#: ../intl-scm/guile-strings.c:3524 ../intl-scm/guile-strings.c:3782
+#: ../src/gnome/glade/sched-xact.glade.h:3 ../intl-scm/guile-strings.c:5932
+#: ../intl-scm/guile-strings.c:6250 ../intl-scm/guile-strings.c:6456
+#: ../intl-scm/guile-strings.c:6774 ../intl-scm/guile-strings.c:7034
+#: ../intl-scm/guile-strings.c:7274
#, no-c-format
msgid "%"
msgstr "%"
@@ -2783,17 +2911,18 @@
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:119
#: ../src/business/business-ledger/gncEntryLedgerModel.c:510
#: ../src/business/business-ledger/gncEntryLedgerModel.c:1036
-#: ../src/engine/Account.c:2132 ../intl-scm/guile-strings.c:850
+#: ../src/engine/Account.c:2135 ../intl-scm/guile-strings.c:1364
msgid "Cash"
msgstr "Bargeld"
#. src/app-utils/prefs.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
#: ../src/business/business-ledger/gncEntryLedgerLoad.c:122
#: ../src/business/business-ledger/gncEntryLedgerModel.c:512
#: ../src/business/business-ledger/gncEntryLedgerModel.c:1038
-#: ../intl-scm/guile-strings.c:76 ../intl-scm/guile-strings.c:92
-#: ../intl-scm/guile-strings.c:2658
+#: ../intl-scm/guile-strings.c:124 ../intl-scm/guile-strings.c:140
+#: ../intl-scm/guile-strings.c:3992 ../intl-scm/guile-strings.c:5142
msgid "Charge"
msgstr "Belastung"
@@ -2807,22 +2936,32 @@
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerModel.c:65
#: ../src/gnome/dialog-find-transactions.c:122
#: ../src/register/ledger-core/split-register-model.c:170
-#: ../intl-scm/guile-strings.c:3224 ../intl-scm/guile-strings.c:3542
-#: ../intl-scm/guile-strings.c:3800
+#: ../intl-scm/guile-strings.c:5950 ../intl-scm/guile-strings.c:6268
+#: ../intl-scm/guile-strings.c:6474 ../intl-scm/guile-strings.c:6792
+#: ../intl-scm/guile-strings.c:7052 ../intl-scm/guile-strings.c:7292
msgid "Action"
msgstr "Aktion"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerModel.c:80
-#: ../intl-scm/guile-strings.c:3198 ../intl-scm/guile-strings.c:3242
-#: ../intl-scm/guile-strings.c:3516 ../intl-scm/guile-strings.c:3560
-#: ../intl-scm/guile-strings.c:3774 ../intl-scm/guile-strings.c:3818
+#: ../intl-scm/guile-strings.c:5924 ../intl-scm/guile-strings.c:5968
+#: ../intl-scm/guile-strings.c:6242 ../intl-scm/guile-strings.c:6286
+#: ../intl-scm/guile-strings.c:6448 ../intl-scm/guile-strings.c:6492
+#: ../intl-scm/guile-strings.c:6766 ../intl-scm/guile-strings.c:6810
+#: ../intl-scm/guile-strings.c:7026 ../intl-scm/guile-strings.c:7070
+#: ../intl-scm/guile-strings.c:7266 ../intl-scm/guile-strings.c:7310
msgid "Discount"
msgstr "Skonto"
@@ -2836,20 +2975,30 @@
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerModel.c:95
-#: ../intl-scm/guile-strings.c:3196 ../intl-scm/guile-strings.c:3514
-#: ../intl-scm/guile-strings.c:3772
+#: ../intl-scm/guile-strings.c:5922 ../intl-scm/guile-strings.c:6240
+#: ../intl-scm/guile-strings.c:6446 ../intl-scm/guile-strings.c:6764
+#: ../intl-scm/guile-strings.c:7024 ../intl-scm/guile-strings.c:7264
msgid "Unit Price"
msgstr "Stückpreis"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerModel.c:100
-#: ../intl-scm/guile-strings.c:3194 ../intl-scm/guile-strings.c:3230
-#: ../intl-scm/guile-strings.c:3512 ../intl-scm/guile-strings.c:3548
-#: ../intl-scm/guile-strings.c:3770 ../intl-scm/guile-strings.c:3806
+#: ../intl-scm/guile-strings.c:5920 ../intl-scm/guile-strings.c:5956
+#: ../intl-scm/guile-strings.c:6238 ../intl-scm/guile-strings.c:6274
+#: ../intl-scm/guile-strings.c:6444 ../intl-scm/guile-strings.c:6480
+#: ../intl-scm/guile-strings.c:6762 ../intl-scm/guile-strings.c:6798
+#: ../intl-scm/guile-strings.c:7022 ../intl-scm/guile-strings.c:7058
+#: ../intl-scm/guile-strings.c:7262 ../intl-scm/guile-strings.c:7298
msgid "Quantity"
msgstr "Anzahl"
@@ -2872,21 +3021,32 @@
#. src/report/report-system/options-utilities.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerModel.c:125
-#: ../intl-scm/guile-strings.c:788 ../intl-scm/guile-strings.c:3348
-#: ../intl-scm/guile-strings.c:3614 ../intl-scm/guile-strings.c:3670
-#: ../intl-scm/guile-strings.c:3898
+#: ../intl-scm/guile-strings.c:1300 ../intl-scm/guile-strings.c:6074
+#: ../intl-scm/guile-strings.c:6340 ../intl-scm/guile-strings.c:6396
+#: ../intl-scm/guile-strings.c:6598 ../intl-scm/guile-strings.c:6864
+#: ../intl-scm/guile-strings.c:6920 ../intl-scm/guile-strings.c:7150
+#: ../intl-scm/guile-strings.c:7390
msgid "Subtotal"
msgstr "Zwischensumme"
#. src/tax/us/de_DE.scm
+#. src/tax/us/gnucash/tax/de_DE.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/business/business-ledger/gncEntryLedgerModel.c:130
-#: ../intl-scm/guile-strings.c:52 ../intl-scm/guile-strings.c:3350
-#: ../intl-scm/guile-strings.c:3672 ../intl-scm/guile-strings.c:3900
+#: ../intl-scm/guile-strings.c:96 ../intl-scm/guile-strings.c:100
+#: ../intl-scm/guile-strings.c:6076 ../intl-scm/guile-strings.c:6398
+#: ../intl-scm/guile-strings.c:6600 ../intl-scm/guile-strings.c:6922
+#: ../intl-scm/guile-strings.c:7152 ../intl-scm/guile-strings.c:7392
msgid "Tax"
msgstr "Steuern"
@@ -2998,11 +3158,11 @@
msgid "How did you pay for this item?"
msgstr "Wie wurde dieser Artikel bezahlt?"
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:102
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:112
msgid "You must provide a name for this Tax Table."
msgstr "Sie müssen einen Namen für diese Steuertabelle angeben."
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:108
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:118
#, c-format
msgid ""
"You must provide a unique name for this Tax Table. Your choice \"%s\" is "
@@ -3011,25 +3171,16 @@
"Sie müssen einen eindeutigen Namen für diese Steuertabelle angeben. Ihre "
"Wahl »%s« ist bereits in Benutzung."
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:134
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:144
msgid "You must choose a Tax Account."
msgstr "Sie müssen ein steuerrelevantes Konto wählen."
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:205
-msgid "Value $"
-msgstr "Wert"
-
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:207
-#, no-c-format
-msgid "Percent %"
-msgstr "Prozent (%)"
-
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:548
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:534
#, c-format
msgid "Tax table \"%s\" is in use. You cannot delete it."
msgstr "Steuertabelle »%s« ist in Benutzung. Sie können sie nicht löschen."
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:594
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:580
msgid ""
"You cannot remove the last entry from the tax table. Try deleting the tax "
"table if you want to do that."
@@ -3038,7 +3189,7 @@
"Stattdessen müssten Sie die ganze Steuertabelle löschen, falls Sie das "
"möchten."
-#: ../src/business/dialog-tax-table/dialog-tax-table.c:601
+#: ../src/business/dialog-tax-table/dialog-tax-table.c:587
msgid "Are you sure you want to delete this entry?"
msgstr "Sind Sie sicher, dass Sie diesen Eintrag löschen möchten?"
@@ -3058,18 +3209,16 @@
msgid "<b>Tax Tables</b>"
msgstr "<b>Steuertabellen</b>"
-#: ../src/business/dialog-tax-table/tax-tables.glade.h:6
-#, no-c-format
-msgid "Percent (%)"
-msgstr "Prozent (%)"
-
-#: ../src/business/dialog-tax-table/tax-tables.glade.h:7
+#: ../src/business/dialog-tax-table/tax-tables.glade.h:5
msgid "Tax Tables"
msgstr "Steuertabellen"
-#: ../src/business/dialog-tax-table/tax-tables.glade.h:8
-msgid "Value ($)"
-msgstr "Geldbetrag"
+#: ../src/business/dialog-tax-table/tax-tables.glade.h:7
+#, fuzzy, no-c-format
+msgid ""
+"Value $\n"
+"Percent %"
+msgstr "Prozent (%)"
#: ../src/business/dialog-tax-table/tax-tables.glade.h:9
msgid "_Account:"
@@ -3088,32 +3237,32 @@
msgstr "_Wert: "
#. src/report/report-system/report-utilities.scm
-#: ../src/engine/Account.c:2131 ../src/import-export/hbci/gnc-hbci-utils.c:593
-#: ../intl-scm/guile-strings.c:848
+#: ../src/engine/Account.c:2134 ../src/import-export/hbci/gnc-hbci-utils.c:594
+#: ../intl-scm/guile-strings.c:1362
msgid "Bank"
msgstr "Bank"
-#: ../src/engine/Account.c:2133
+#: ../src/engine/Account.c:2136
msgid "Asset"
msgstr "Aktiva"
-#: ../src/engine/Account.c:2134
+#: ../src/engine/Account.c:2137
msgid "Credit Card"
msgstr "Kreditkarte"
-#: ../src/engine/Account.c:2135
+#: ../src/engine/Account.c:2138
msgid "Liability"
msgstr "Passiva"
-#: ../src/engine/Account.c:2136
+#: ../src/engine/Account.c:2139
msgid "Stock"
msgstr "Aktienkonto"
-#: ../src/engine/Account.c:2137
+#: ../src/engine/Account.c:2140
msgid "Mutual Fund"
msgstr "Investmentfonds"
-#: ../src/engine/Account.c:2138 ../src/gnome-utils/dialog-commodity.c:731
+#: ../src/engine/Account.c:2141 ../src/gnome-utils/dialog-commodity.c:756
#: ../src/gnome-utils/gnc-tree-view-price.c:441
msgid "Currency"
msgstr "Währung"
@@ -3121,31 +3270,32 @@
#. src/app-utils/prefs.scm
#. src/report/report-system/report-utilities.scm
#. src/report/standard-reports/net-barchart.scm
-#: ../src/engine/Account.c:2139
-#: ../src/register/ledger-core/split-register.c:2045
-#: ../intl-scm/guile-strings.c:104 ../intl-scm/guile-strings.c:864
-#: ../intl-scm/guile-strings.c:1240
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../src/engine/Account.c:2142
+#: ../src/register/ledger-core/split-register.c:2067
+#: ../intl-scm/guile-strings.c:152 ../intl-scm/guile-strings.c:1378
+#: ../intl-scm/guile-strings.c:1952 ../intl-scm/guile-strings.c:2576
msgid "Income"
msgstr "Erträge"
-#: ../src/engine/Account.c:2142
+#: ../src/engine/Account.c:2145
msgid "A/Receivable"
msgstr "Forderungen"
-#: ../src/engine/Account.c:2143
+#: ../src/engine/Account.c:2146
msgid "A/Payable"
msgstr "Verbindlichkeit"
-#: ../src/engine/cap-gains.c:237
+#: ../src/engine/cap-gains.c:238
msgid "Orphaned Gains"
msgstr "Unverknüpfte Gewinne"
-#: ../src/engine/cap-gains.c:251 ../src/engine/cap-gains.c:974
-#: ../src/engine/cap-gains.c:979 ../src/engine/cap-gains.c:980
+#: ../src/engine/cap-gains.c:252 ../src/engine/cap-gains.c:975
+#: ../src/engine/cap-gains.c:980 ../src/engine/cap-gains.c:981
msgid "Realized Gain/Loss"
msgstr "Realisierter Gewinn/Verlust"
-#: ../src/engine/cap-gains.c:253
+#: ../src/engine/cap-gains.c:254
msgid ""
"Realized Gains or Losses from Commodity or Trading Accounts that haven't "
"been recorded elsewhere."
@@ -3153,7 +3303,7 @@
"Realisierter Gewinn/Verlust von Aktienkonten, die nicht woanders gespeichert "
"worden sind."
-#: ../src/engine/cap-gains.c:584
+#: ../src/engine/cap-gains.c:585
msgid "Lot"
msgstr "Posten"
@@ -3174,7 +3324,7 @@
msgid "Daily (x%u)"
msgstr "Täglich (%u Mal)"
-#: ../src/engine/FreqSpec.c:748 ../src/gnome/glade/sched-xact.glade.h:64
+#: ../src/engine/FreqSpec.c:748 ../src/gnome/glade/sched-xact.glade.h:65
#, c-format
msgid "Daily"
msgstr "Täglich"
@@ -3299,11 +3449,11 @@
msgid "Yearly: %s/%u"
msgstr "Jährlich: %2$u. %1$s"
-#: ../src/engine/gnc-budget.c:106 ../src/gnome/gnc-plugin-page-budget.c:850
+#: ../src/engine/gnc-budget.c:109 ../src/gnome/gnc-plugin-page-budget.c:846
msgid "Unnamed Budget"
msgstr "Unbenanntes Budget"
-#: ../src/engine/gnc-filepath-utils.c:332
+#: ../src/engine/gnc-filepath-utils.c:316
#, c-format
msgid ""
"An error occurred while creating the directory:\n"
@@ -3317,7 +3467,7 @@
"starten Sie GnuCash neu. \n"
"Nennen Sie bitte diesen Fehlertext: »%s« (errno %d)\n"
-#: ../src/engine/gnc-filepath-utils.c:344
+#: ../src/engine/gnc-filepath-utils.c:328
#, c-format
msgid ""
"The directory\n"
@@ -3332,8 +3482,8 @@
"Programm muss alle Zugriffrechte (Lesen/Schreiben/Ausführen) zu diesem\n"
"Verzeichnis besitzen, um korrekt zu funktionieren.\n"
-#: ../src/engine/gnc-filepath-utils.c:354
-#: ../src/engine/gnc-filepath-utils.c:375
+#: ../src/engine/gnc-filepath-utils.c:338
+#: ../src/engine/gnc-filepath-utils.c:359
#, c-format
msgid ""
"The path\n"
@@ -3346,7 +3496,7 @@
"existiert, ist aber kein Verzeichnis. Bitte löschen Sie diese Datei\n"
"oder wählen einen anderen Pfad. Starten Sie dann GnuCash neu.\n"
-#: ../src/engine/gnc-filepath-utils.c:363
+#: ../src/engine/gnc-filepath-utils.c:347
#, c-format
msgid ""
"An unknown error occurred when validating that the\n"
@@ -3362,7 +3512,7 @@
"starten Sie GnuCash neu. \n"
"Nennen Sie bitte diesen Fehlertext: »%s« (errno %d)"
-#: ../src/engine/gnc-filepath-utils.c:384
+#: ../src/engine/gnc-filepath-utils.c:368
#, c-format
msgid ""
"The permissions are wrong on the directory\n"
@@ -3378,36 +3528,40 @@
msgid "Orphan"
msgstr "Ausbuchungskonto"
-#: ../src/engine/Scrub.c:430 ../src/import-export/generic-import.glade.h:35
+#: ../src/engine/Scrub.c:430
msgid "Imbalance"
msgstr "Ausgleichskonto"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../src/engine/Split.c:1220 ../src/engine/Split.c:1237
-#: ../intl-scm/guile-strings.c:2548 ../intl-scm/guile-strings.c:2570
+#: ../src/engine/Split.c:1229 ../src/engine/Split.c:1246
+#: ../intl-scm/guile-strings.c:3882 ../intl-scm/guile-strings.c:3904
+#: ../intl-scm/guile-strings.c:5032 ../intl-scm/guile-strings.c:5054
msgid "-- Split Transaction --"
msgstr "-- Mehrteilige Buchung --"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/engine/Split.c:1253 ../src/gnome/druid-stock-split.c:448
+#: ../src/engine/Split.c:1262 ../src/gnome/druid-stock-split.c:455
#: ../src/gnome/glade/register.glade.h:67
-#: ../src/gnome/gnc-plugin-page-register.c:331
-#: ../src/register/ledger-core/split-register.c:2048
-#: ../intl-scm/guile-strings.c:2166
+#: ../src/gnome/gnc-plugin-page-register.c:328
+#: ../src/register/ledger-core/split-register.c:2070
+#: ../intl-scm/guile-strings.c:3500 ../intl-scm/guile-strings.c:4650
msgid "Split"
msgstr "Vollständig"
-#: ../src/engine/Transaction.c:1733
+#: ../src/engine/Transaction.c:1728
msgid "Voided transaction"
msgstr "Ungültige Buchung"
#. Dirtying taken care of by SetReadOnly
-#: ../src/engine/Transaction.c:1744
+#: ../src/engine/Transaction.c:1739
msgid "Transaction Voided"
msgstr "Buchung ungültig gemacht"
-#: ../src/gnome/dialog-chart-export.c:234
+#: ../src/gnome/dialog-chart-export.c:233
msgid "Export Chart of Accounts to QSF XML"
msgstr "Kontenhierarchie nach QSF XML exportieren"
@@ -3435,7 +3589,7 @@
msgid "Delete commodity?"
msgstr "Währung/Aktie löschen?"
-#: ../src/gnome/dialog-fincalc.c:315
+#: ../src/gnome/dialog-fincalc.c:308
msgid ""
"This program can only calculate one value at a time. You must enter values "
"for all but one quantity."
@@ -3443,7 +3597,7 @@
"Es kann nur einer der Werte berechnet werden. Sie müssen für alle Werte "
"außer einem jeweils eine Zahl eintragen."
-#: ../src/gnome/dialog-fincalc.c:317
+#: ../src/gnome/dialog-fincalc.c:310
msgid ""
"GnuCash cannot determine the value in one of the fields. You must enter a "
"valid expression."
@@ -3451,15 +3605,15 @@
"Die eingegebenen Werte können nicht ausgewertet werden. Sie müssen einen "
"korrekten Zahlenausdruck eingeben."
-#: ../src/gnome/dialog-fincalc.c:356
+#: ../src/gnome/dialog-fincalc.c:349
msgid "The interest rate cannot be zero."
msgstr "Der Zinssatz kann nicht Null sein."
-#: ../src/gnome/dialog-fincalc.c:375
+#: ../src/gnome/dialog-fincalc.c:368
msgid "The number of payments cannot be zero."
msgstr "Die Anzahl der Zahlungen kann nicht Null sein"
-#: ../src/gnome/dialog-fincalc.c:380
+#: ../src/gnome/dialog-fincalc.c:373
msgid "The number of payments cannot be negative."
msgstr "Die Anzahl der Zahlungen kann nicht negativ sein"
@@ -3470,33 +3624,47 @@
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/cash-flow.scm
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/report/standard-reports/budget.scm
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
#: ../src/gnome/dialog-find-transactions.c:103
-#: ../src/gnome/glade/stocks.glade.h:3 ../src/gnome-utils/dialog-account.c:647
-#: ../src/gnome-utils/gnc-icons.c:16
-#: ../src/import-export/generic-import.glade.h:11
-#: ../src/import-export/hbci/gnc-hbci-utils.c:592
-#: ../src/import-export/qif-import/qif.glade.h:2
+#: ../src/gnome/druid-stock-split.c:610 ../src/gnome-utils/gnc-icons.c:16
+#: ../src/import-export/hbci/gnc-hbci-utils.c:593
+#: ../src/import-export/import-main-matcher.c:418
+#: ../src/import-export/import-match-picker.c:332
+#: ../src/import-export/qif-import/dialog-account-picker.c:288
+#: ../src/import-export/qif-import/druid-qif-import.c:2130
#: ../src/register/ledger-core/split-register-model.c:177
-#: ../intl-scm/guile-strings.c:1282 ../intl-scm/guile-strings.c:1304
-#: ../intl-scm/guile-strings.c:1730 ../intl-scm/guile-strings.c:2028
-#: ../intl-scm/guile-strings.c:2250 ../intl-scm/guile-strings.c:2560
-#: ../intl-scm/guile-strings.c:2604 ../intl-scm/guile-strings.c:2670
-#: ../intl-scm/guile-strings.c:3394
+#: ../intl-scm/guile-strings.c:1992 ../intl-scm/guile-strings.c:2014
+#: ../intl-scm/guile-strings.c:2440 ../intl-scm/guile-strings.c:2616
+#: ../intl-scm/guile-strings.c:2638 ../intl-scm/guile-strings.c:3064
+#: ../intl-scm/guile-strings.c:3362 ../intl-scm/guile-strings.c:3584
+#: ../intl-scm/guile-strings.c:3894 ../intl-scm/guile-strings.c:3938
+#: ../intl-scm/guile-strings.c:4004 ../intl-scm/guile-strings.c:4512
+#: ../intl-scm/guile-strings.c:4734 ../intl-scm/guile-strings.c:5044
+#: ../intl-scm/guile-strings.c:5088 ../intl-scm/guile-strings.c:5154
+#: ../intl-scm/guile-strings.c:6120 ../intl-scm/guile-strings.c:6644
msgid "Account"
msgstr "Konto"
#: ../src/gnome/dialog-find-transactions.c:106
+#: ../src/import-export/import-match-picker.c:337
msgid "Balanced"
msgstr "Ausgeglichene Buchungen"
#: ../src/gnome/dialog-find-transactions.c:109
-#: ../src/gnome/gnc-plugin-page-register.c:334
-#: ../src/gnome/window-reconcile.c:1174
+#: ../src/gnome/gnc-plugin-page-register.c:331
+#: ../src/gnome/window-reconcile.c:1173
msgid "Reconcile"
msgstr "Abgleichen"
@@ -3506,50 +3674,63 @@
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#: ../src/gnome/dialog-find-transactions.c:113
-#: ../src/gnome/glade/stocks.glade.h:13
+#: ../src/gnome/druid-stock-split.c:622
#: ../src/register/ledger-core/split-register-model.c:240
-#: ../intl-scm/guile-strings.c:1284 ../intl-scm/guile-strings.c:1498
-#: ../intl-scm/guile-strings.c:2036 ../intl-scm/guile-strings.c:2198
-#: ../intl-scm/guile-strings.c:2254 ../intl-scm/guile-strings.c:2472
-#: ../intl-scm/guile-strings.c:2564 ../intl-scm/guile-strings.c:2610
+#: ../intl-scm/guile-strings.c:1994 ../intl-scm/guile-strings.c:2208
+#: ../intl-scm/guile-strings.c:2618 ../intl-scm/guile-strings.c:2832
+#: ../intl-scm/guile-strings.c:3370 ../intl-scm/guile-strings.c:3532
+#: ../intl-scm/guile-strings.c:3588 ../intl-scm/guile-strings.c:3806
+#: ../intl-scm/guile-strings.c:3898 ../intl-scm/guile-strings.c:3944
+#: ../intl-scm/guile-strings.c:4520 ../intl-scm/guile-strings.c:4682
+#: ../intl-scm/guile-strings.c:4738 ../intl-scm/guile-strings.c:4956
+#: ../intl-scm/guile-strings.c:5048 ../intl-scm/guile-strings.c:5094
msgid "Shares"
msgstr "Anteile"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
#: ../src/gnome/dialog-find-transactions.c:115
-#: ../src/gnome/glade/lots.glade.h:25
-#: ../src/gnome/glade/sched-xact.glade.h:190 ../intl-scm/guile-strings.c:1740
-#: ../intl-scm/guile-strings.c:2042
+#: ../src/gnome/glade/lots.glade.h:18
+#: ../src/gnome/glade/sched-xact.glade.h:215 ../intl-scm/guile-strings.c:2450
+#: ../intl-scm/guile-strings.c:3074 ../intl-scm/guile-strings.c:3376
+#: ../intl-scm/guile-strings.c:4526
msgid "Value"
msgstr "Wert"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
#: ../src/gnome/dialog-find-transactions.c:124
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:11
-#: ../intl-scm/guile-strings.c:2368
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:10
+#: ../intl-scm/guile-strings.c:3702 ../intl-scm/guile-strings.c:4852
msgid "Number"
msgstr "Nummer"
#: ../src/gnome/dialog-find-transactions.c:169
-#: ../src/gnome-search/dialog-search.c:1076
+#: ../src/gnome-search/dialog-search.c:1085
msgid "Find Transaction"
msgstr "Buchungen suchen"
#. Translators: %d is the number of prices. This
#. is a ngettext(3) message.
-#: ../src/gnome/dialog-price-edit-db.c:171
+#: ../src/gnome/dialog-price-edit-db.c:172
#, c-format
msgid "Are you sure you want to delete the %d selected price?"
msgid_plural "Are you sure you want to delete the %d selected prices?"
msgstr[0] "Sind Sie sicher, dass Sie den %d gewählten Preis löschen wollen?"
msgstr[1] "Sind Sie sicher, dass Sie die %d gewählten Preise löschen wollen?"
-#: ../src/gnome/dialog-price-edit-db.c:179
+#: ../src/gnome/dialog-price-edit-db.c:180
msgid "Delete prices?"
msgstr "Preise löschen?"
@@ -3562,7 +3743,7 @@
msgstr "Sie müssen eine Währung auswählen."
#: ../src/gnome/dialog-price-editor.c:190
-#: ../src/gnome-utils/dialog-transfer.c:1403
+#: ../src/gnome-utils/dialog-transfer.c:1404
msgid "You must enter a valid amount."
msgstr "Sie müssen einen gültigen Betrag eingeben."
@@ -3570,58 +3751,49 @@
msgid "Complete"
msgstr "Komplett"
-#. Toplevel
-#: ../src/gnome/dialog-scheduledxaction.c:242
-#: ../src/gnome/dialog-sxsincelast.c:401 ../src/gnome/glade/price.glade.h:22
+#: ../src/gnome/dialog-sx-editor.c:176 ../src/gnome/glade/price.glade.h:22
#: ../src/gnome/glade/register.glade.h:85
-#: ../src/gnome/glade/sched-xact.glade.h:203
-#: ../src/gnome-utils/gnc-main-window.c:212
-#: ../src/gnome/window-reconcile.c:2025
-#: ../src/report/report-gnome/report.glade.h:20
+#: ../src/gnome-utils/gnc-main-window.c:216
+#: ../src/gnome/window-reconcile.c:2027
+#: ../src/report/report-gnome/report.glade.h:17
msgid "_Edit"
msgstr "_Bearbeiten"
-#: ../src/gnome/dialog-scheduledxaction.c:243
-#: ../src/gnome/dialog-sxsincelast.c:402 ../src/gnome/window-reconcile.c:1985
+#: ../src/gnome/dialog-sx-editor.c:177 ../src/gnome/window-reconcile.c:1987
msgid "_Transaction"
msgstr "_Buchung"
-#: ../src/gnome/dialog-scheduledxaction.c:244
-#: ../src/gnome/dialog-sxsincelast.c:403 ../src/gnome/glade/lots.glade.h:27
-#: ../src/gnome/glade/register.glade.h:101
-#: ../src/gnome-utils/gnc-main-window.c:213
+#: ../src/gnome/dialog-sx-editor.c:178 ../src/gnome/glade/register.glade.h:101
+#: ../src/gnome-utils/gnc-main-window.c:217
msgid "_View"
msgstr "_Ansicht"
-#: ../src/gnome/dialog-scheduledxaction.c:245
-#: ../src/gnome/dialog-sxsincelast.c:404
-#: ../src/gnome/glade/register.glade.h:74
-#: ../src/gnome-utils/gnc-main-window.c:214
+#: ../src/gnome/dialog-sx-editor.c:179 ../src/gnome/glade/register.glade.h:74
+#: ../src/gnome-utils/gnc-main-window.c:218
msgid "_Actions"
msgstr "A_ktionen"
-#: ../src/gnome/dialog-scheduledxaction.c:328
+#: ../src/gnome/dialog-sx-editor.c:211
msgid "This SX has changed; are you sure you want to cancel?"
msgstr ""
"Diese terminierte Buchung wurde geändert. Sind Sie sicher, dass Sie\n"
"abbrechen wollen?"
-#: ../src/gnome/dialog-scheduledxaction.c:794
+#: ../src/gnome/dialog-sx-editor.c:631
#, c-format
msgid "Couldn't parse credit formula for split \"%s\"."
msgstr ""
"Die Berechnungsformel für die Minderungsbuchung konnte nicht verarbeitet "
"werden im Buchungsteil »%s«. "
-#: ../src/gnome/dialog-scheduledxaction.c:820
+#: ../src/gnome/dialog-sx-editor.c:657
#, c-format
msgid "Couldn't parse debit formula for split \"%s\"."
msgstr ""
"Die Berechnungsformel für die Mehrungsbuchung konnte nicht verarbeitet "
"werden im Buchungsteil »%s«. "
-#: ../src/gnome/dialog-scheduledxaction.c:858
-#: ../src/gnome/dialog-sx-from-trans.c:269
+#: ../src/gnome/dialog-sx-editor.c:694 ../src/gnome/dialog-sx-from-trans.c:258
msgid ""
"The Scheduled Transaction Editor cannot automatically balance this "
"transaction. Should it still be entered?"
@@ -3629,11 +3801,11 @@
"Der Terminierte-Buchungen-Editor kann diese Buchung nicht automatisch "
"ausgeglichen erstellen. Soll sie trotzdem erstellt werden?"
-#: ../src/gnome/dialog-scheduledxaction.c:877
+#: ../src/gnome/dialog-sx-editor.c:713
msgid "Please name the Scheduled Transaction."
msgstr "Bitte geben Sie der terminierten Buchung einen Namen."
-#: ../src/gnome/dialog-scheduledxaction.c:903
+#: ../src/gnome/dialog-sx-editor.c:739
#, c-format
msgid ""
"A Scheduled Transaction with the name \"%s\" already exists. Are you sure "
@@ -3642,12 +3814,12 @@
"Eine terminierte Buchung mit dem Namen »%s« existiert bereits. Sind Sie "
"sicher, dass die aktuelle den gleichen Namen erhalten soll?"
-#: ../src/gnome/dialog-scheduledxaction.c:932
+#: ../src/gnome/dialog-sx-editor.c:768
msgid "Scheduled Transactions with variables cannot be automatically created."
msgstr ""
"Terminierte Buchungen mit Variablen können nicht automatisch erstellt werden."
-#: ../src/gnome/dialog-scheduledxaction.c:941
+#: ../src/gnome/dialog-sx-editor.c:777
msgid ""
"Scheduled Transactions without a template transaction cannot be "
"automatically created."
@@ -3655,15 +3827,15 @@
"Terminierte Buchungen ohne Buchungsvorlage können nicht automatisch erstellt "
"werden."
-#: ../src/gnome/dialog-scheduledxaction.c:955
+#: ../src/gnome/dialog-sx-editor.c:791
msgid "Please provide a valid end selection."
msgstr "Bitte geben Sie ein gültiges Enddatum ein."
-#: ../src/gnome/dialog-scheduledxaction.c:971
+#: ../src/gnome/dialog-sx-editor.c:807
msgid "There must be some number of occurrences."
msgstr "Es muss eine Anzahl des Auftretens geben."
-#: ../src/gnome/dialog-scheduledxaction.c:979
+#: ../src/gnome/dialog-sx-editor.c:815
#, c-format
msgid ""
"The number of remaining occurrences (%d) is greater than the number of total "
@@ -3672,7 +3844,7 @@
"Die Zahl des verbleibenden Auftretens (%d) ist größer als die Zahl des "
"totalen Auftretens (%d)."
-#: ../src/gnome/dialog-scheduledxaction.c:1013
+#: ../src/gnome/dialog-sx-editor.c:849
msgid ""
"You have attempted to create a Scheduled Transaction which will never run. "
"Do you really want to do this?"
@@ -3680,40 +3852,23 @@
"Sie versuchen gerade, eine Terminierte Buchung zu erstellen, die nie "
"auftritt. Wollen Sie wirklich fortsetzen?"
-#: ../src/gnome/dialog-scheduledxaction.c:1677
+#: ../src/gnome/dialog-sx-editor.c:1318
msgid "(never)"
msgstr "(niemals)"
-#: ../src/gnome/dialog-scheduledxaction.c:1838
+#: ../src/gnome/dialog-sx-editor.c:1466
msgid ""
-"The following transactions are presently being edited; are you sure you want "
-"to delete them?"
-msgstr ""
-"Die folgenden Buchungssätze werden zur Zeit bearbeitet; wollen Sie diese "
-"wirklich löschen?"
-
-#: ../src/gnome/dialog-scheduledxaction.c:1841
-msgid "Delete the selected Scheduled Transactions?"
-msgstr "Ausgewählte terminierte Buchung löschen?"
-
-#: ../src/gnome/dialog-scheduledxaction.c:2089
-#: ../src/gnome/glade/sched-xact.glade.h:123
-msgid "Not scheduled"
-msgstr "Nicht vorgemerkt"
-
-#: ../src/gnome/dialog-scheduledxaction.c:2183
-msgid ""
"The current template transaction has been changed. Would you like to record "
"the changes?"
msgstr ""
"Die aktuelle Buchungsvorlage wurde verändert. Soll sie gespeichert werden?"
-#: ../src/gnome/dialog-scheduledxaction.c:2594
-#: ../src/gnome/glade/sched-xact.glade.h:157
+#: ../src/gnome/dialog-sx-editor.c:1695
+#: ../src/gnome/gnc-plugin-page-sx-list.c:194
msgid "Scheduled Transactions"
msgstr "Terminierte Buchungen"
-#: ../src/gnome/dialog-sx-from-trans.c:566
+#: ../src/gnome/dialog-sx-from-trans.c:550
msgid ""
"The Scheduled Transaction is unbalanced. You are strongly encouraged to "
"correct this situation."
@@ -3721,7 +3876,7 @@
"Diese Terminierte Buchung ist nicht ausgeglichen. Bitte korrigieren Sie "
"diese Buchung."
-#: ../src/gnome/dialog-sx-from-trans.c:811
+#: ../src/gnome/dialog-sx-from-trans.c:754
msgid ""
"Cannot create a Scheduled Transaction from a Transaction currently being "
"edited. Please Enter the Transaction before Scheduling."
@@ -3732,8 +3887,8 @@
#. Translators: %d is the number of transactions. This is a
#. ngettext(3) message.
-#: ../src/gnome/dialog-sxsincelast.c:424
-#: ../src/gnome/gnc-plugin-basic-commands.c:459
+#: ../src/gnome/dialog-sx-since-last-run.c:818
+#: ../src/gnome/gnc-plugin-basic-commands.c:473
#, c-format
msgid ""
"There are no Scheduled Transactions to be entered at this time. (%d "
@@ -3748,45 +3903,11 @@
"Es gibt keine terminierten Buchungen, die erstellt werden sollen. (%d "
"Buchungen automatisch erstellt)"
-#: ../src/gnome/dialog-sxsincelast.c:1438
-msgid ""
-"Canceling the Since-Last-Run dialog will revert all changes. Are you sure "
-"you want to lose all Scheduled Transaction changes?"
-msgstr ""
-"Wenn Sie den Seit-Letztem-Aufruf Dialog abbrechen, werden alle Änderungen "
-"rückgängig gemacht. Sind Sie sicher, dass Sie alle Änderungen in den "
-"Terminierten Buchungen verwerfen wollen?"
+#: ../src/gnome/dialog-sx-since-last-run.c:1016
+msgid "Created Transactions"
+msgstr "Buchungen erstellt"
-#: ../src/gnome/dialog-sxsincelast.c:1871
-msgid "Ready to create"
-msgstr "Bereit zum Erstellen"
-
-#. READY_TEXT
-#: ../src/gnome/dialog-sxsincelast.c:1872
-msgid "Needs values for variables"
-msgstr "Werte für Variablen benötigt"
-
-#: ../src/gnome/dialog-sxsincelast.c:1876
-msgid "Ignored"
-msgstr "Ignoriert"
-
-#: ../src/gnome/dialog-sxsincelast.c:1879
-msgid "Postponed"
-msgstr "Auf später verschoben"
-
-#: ../src/gnome/dialog-sxsincelast.c:1989
-msgid "Obsolete"
-msgstr "Veraltet"
-
-#: ../src/gnome/dialog-sxsincelast.c:4021
-msgid ""
-"The following errors were encountered while creating the Scheduled "
-"Transactions:\n"
-msgstr ""
-"Die folgenden Fehler sind aufgetreten, als die Terminierten Buchungen "
-"erstellt werden sollen:\n"
-
-#: ../src/gnome/dialog-tax-info.c:723
+#: ../src/gnome/dialog-tax-info.c:715
msgid "Form"
msgstr "Formular"
@@ -3839,7 +3960,7 @@
#. replaced by one single message? Either this closing went
#. successfully ("success", "congratulations") or something else
#. should be displayed anyway.
-#: ../src/gnome/druid-acct-period.c:492
+#: ../src/gnome/druid-acct-period.c:493
#, c-format
msgid ""
"%s\n"
@@ -3849,154 +3970,147 @@
"Sie sind mit dem Schließen der Bücher fertig."
#. Change the text so that its more mainingful for this druid
-#: ../src/gnome/druid-acct-period.c:547
+#: ../src/gnome/druid-acct-period.c:548
msgid "Period:"
msgstr "Periode:"
-#: ../src/gnome/druid-acct-period.c:548
+#: ../src/gnome/druid-acct-period.c:549
msgid "Closing Date:"
msgstr "Abschlußdatum:"
-#: ../src/gnome/druid-hierarchy.c:389
+#: ../src/gnome/druid-hierarchy.c:399
msgid "Selected"
msgstr "Ausgewähltes"
-#: ../src/gnome/druid-hierarchy.c:401
-#: ../src/gnome-utils/gnc-tree-view-account.c:1879
+#: ../src/gnome/druid-hierarchy.c:411
+#: ../src/gnome-utils/gnc-tree-view-account.c:1875
msgid "Account Types"
msgstr "Kontoarten"
-#: ../src/gnome/druid-hierarchy.c:477
+#. Translators: '%s' is the name of the selected account hierarchy template.
+#: ../src/gnome/druid-hierarchy.c:489
#, c-format
-msgid "<b>Accounts in '%s'</b>"
-msgstr "<b>Konten in »%s«</b>"
+msgid "Accounts in '%s'"
+msgstr "Konten in »%s«"
-#: ../src/gnome/druid-hierarchy.c:494
-msgid "<b>Accounts in Category</b>"
-msgstr "<b>Konten in Kategorie</b>"
+#: ../src/gnome/druid-hierarchy.c:508
+msgid "Accounts in Category"
+msgstr "Konten in Kategorie"
-#: ../src/gnome/druid-hierarchy.c:703
+#: ../src/gnome/druid-hierarchy.c:719
msgid "zero"
msgstr "Null"
-#: ../src/gnome/druid-hierarchy.c:714
+#: ../src/gnome/druid-hierarchy.c:730
msgid "existing account"
msgstr "Existierendes Konto"
-#: ../src/gnome/druid-hierarchy.c:888
-#: ../src/gnome-utils/gnc-tree-view-account.c:647
+#: ../src/gnome/druid-hierarchy.c:904
+#: ../src/gnome-utils/gnc-tree-view-account.c:643
msgid "Placeholder"
msgstr "Platzhalter"
-#: ../src/gnome/druid-hierarchy.c:919
+#: ../src/gnome/druid-hierarchy.c:935
msgid "Use Existing"
msgstr "Existierendes verwenden"
-#: ../src/gnome/druid-loan.c:552
-msgid "Fixed"
-msgstr "Festverzinslich"
+#. { name, default txn memo, throughEscrowP, specSrcAcctP }
+#: ../src/gnome/druid-loan.c:161
+msgid "Taxes"
+msgstr "Steuern"
-#: ../src/gnome/druid-loan.c:552
-msgid "A Fixed-Rate loan"
-msgstr "Ein festverzinsliches Darlehen"
+#: ../src/gnome/druid-loan.c:161
+msgid "Tax Payment"
+msgstr "Steuern"
-#: ../src/gnome/druid-loan.c:553
-msgid "3/1 Year"
-msgstr "3/1 ARM"
+#: ../src/gnome/druid-loan.c:162
+msgid "Insurance"
+msgstr "Versicherung"
-#. Translators: ARM = Adjustable Rate Mortgage; that is a
-#. loan where the rate is constant for the period before
-#. the '/', e.g. 5 years, and then may change. See also
-#. http://www.fanniemae.com/tools/glossary.jhtml
-#: ../src/gnome/druid-loan.c:558
-msgid "A 3/1 Year ARM"
-msgstr "3/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
+#: ../src/gnome/druid-loan.c:162
+msgid "Insurance Payment"
+msgstr "Versicherung"
-#: ../src/gnome/druid-loan.c:559
-msgid "5/1 Year"
-msgstr "5/1 ARM"
+#. Translators: PMI stands for Private Mortgage Insurance.
+#: ../src/gnome/druid-loan.c:164
+msgid "PMI"
+msgstr "Hypothekenversicherung"
-#: ../src/gnome/druid-loan.c:559
-msgid "A 5/1 Year ARM"
-msgstr "5/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
+#: ../src/gnome/druid-loan.c:164
+msgid "PMI Payment"
+msgstr "Hypothekenversicherung"
-#: ../src/gnome/druid-loan.c:560
-msgid "7/1 Year"
-msgstr "7/1 ARM"
+#: ../src/gnome/druid-loan.c:165
+msgid "Other Expense"
+msgstr "Anderes"
-#: ../src/gnome/druid-loan.c:560
-msgid "A 7/1 Year ARM"
-msgstr "7/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
+#: ../src/gnome/druid-loan.c:165
+msgid "Miscellaneous Payment"
+msgstr "Anderes"
-#: ../src/gnome/druid-loan.c:561
-msgid "10/1 Year"
-msgstr "10/1 ARM"
-
-#: ../src/gnome/druid-loan.c:561
-msgid "A 10/1 Year ARM"
-msgstr "10/1 jährige Adjustable Rate Mortgage (zinsvariable Hypothek)"
-
#. Add payment checkbox.
#. Translators: %s is "Taxes",
#. * "Insurance", or similar.
-#: ../src/gnome/druid-loan.c:644
+#: ../src/gnome/druid-loan.c:632
#, c-format
msgid "... pay \"%s\"?"
msgstr "... »%s« zahlen?"
-#: ../src/gnome/druid-loan.c:656
+#: ../src/gnome/druid-loan.c:644
msgid "via Escrow account?"
msgstr "über Treuhandkonto?"
-#: ../src/gnome/druid-loan.c:820
-#: ../src/register/ledger-core/split-register.c:2002
+#: ../src/gnome/druid-loan.c:808
+#: ../src/register/ledger-core/split-register.c:2024
msgid "Loan"
msgstr "Darlehen"
-#: ../src/gnome/druid-loan.c:1048
+#: ../src/gnome/druid-loan.c:1038
msgid "Are you sure you want to cancel the Mortgage/Loan Setup Druid?"
msgstr "Wollen Sie den Darlehen-Assistent wirklich abbrechen?"
-#: ../src/gnome/druid-loan.c:1165
+#: ../src/gnome/druid-loan.c:1157
msgid "Please select a valid loan account."
msgstr "Sie müssen ein gültiges Darlehen-Konto auswählen."
-#: ../src/gnome/druid-loan.c:1251
+#: ../src/gnome/druid-loan.c:1243
msgid "Please select a valid Escrow Account."
msgstr "Sie müssen ein gültiges Treuhand-Konto auswählen."
-#: ../src/gnome/druid-loan.c:1317 ../src/gnome/druid-loan.c:1536
+#: ../src/gnome/druid-loan.c:1309 ../src/gnome/druid-loan.c:1528
msgid "Please select a valid \"from\" account."
msgstr "Sie müssen ein gültiges Herkunftskonto angeben."
-#: ../src/gnome/druid-loan.c:1324 ../src/gnome/druid-loan.c:1545
+#: ../src/gnome/druid-loan.c:1316 ../src/gnome/druid-loan.c:1537
msgid "Please select a valid \"to\" account."
msgstr "Sie müssen ein gültiges Zielkonto angeben."
-#: ../src/gnome/druid-loan.c:1331
+#: ../src/gnome/druid-loan.c:1323
msgid "Please select a valid \"interest\" account."
msgstr "Sie müssen ein gültiges Zinskonto angeben."
#. Translators: %s is "Taxes", or "Insurance", or similar
-#: ../src/gnome/druid-loan.c:1443
+#: ../src/gnome/druid-loan.c:1435
#, c-format
msgid "Payment: \"%s\""
msgstr "Zahlung: »%s«"
-#: ../src/gnome/druid-loan.c:1781 ../src/gnome/druid-loan.c:2378
+#: ../src/gnome/druid-loan.c:1795 ../src/gnome/druid-loan.c:2391
msgid "Principal"
msgstr "Endbetrag Kapital"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/gnome/druid-loan.c:1782 ../src/gnome/druid-loan.c:2399
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/gnome/druid-loan.c:1801 ../src/gnome/druid-loan.c:2412
#: ../src/import-export/qif/qif-defaults.c:130
-#: ../src/register/ledger-core/split-register.c:2010
-#: ../intl-scm/guile-strings.c:3072 ../intl-scm/guile-strings.c:3094
+#: ../src/register/ledger-core/split-register.c:2032
+#: ../intl-scm/guile-strings.c:5740 ../intl-scm/guile-strings.c:5762
+#: ../intl-scm/guile-strings.c:5784
msgid "Interest"
msgstr "Zinsen"
-#: ../src/gnome/druid-loan.c:2279
+#: ../src/gnome/druid-loan.c:2292
msgid "Escrow "
msgstr "Treuhand "
@@ -4014,7 +4128,8 @@
"gespeichert werden."
#: ../src/gnome/druid-merge.c:223
-msgid "Error: the Commit operation failed."
+#, fuzzy, c-format
+msgid "Error: the Commit operation failed, error code %d."
msgstr "Fehler: Das Speichern der Änderung ist fehlgeschlagen."
#. Translators: %i is the number of conflicts. This is a
@@ -4054,216 +4169,221 @@
msgid "Original data : %s\n"
msgstr "Originaldaten : %s\n"
-#: ../src/gnome/druid-stock-split.c:268
-#: ../src/gnome-utils/dialog-transfer.c:541 ../src/gnome-utils/gnc-html.c:113
+#: ../src/gnome/druid-stock-split.c:275
+#: ../src/gnome-utils/dialog-transfer.c:542 ../src/gnome-utils/gnc-html.c:114
msgid "Error"
msgstr "Fehler"
-#: ../src/gnome/druid-stock-split.c:293
+#: ../src/gnome/druid-stock-split.c:300
msgid "You must enter a valid distribution amount."
msgstr "Sie müssen einen gültigen Betrag eingeben."
-#: ../src/gnome/druid-stock-split.c:302
+#: ../src/gnome/druid-stock-split.c:309
msgid "You must enter a distribution amount."
msgstr "Sie müssen einen Betrag angeben."
-#: ../src/gnome/druid-stock-split.c:310
+#: ../src/gnome/druid-stock-split.c:317
msgid "You must either enter a valid price or leave it blank."
msgstr ""
"Sie müssen entweder einen gültigen Preis angeben oder das Feld frei lassen."
-#: ../src/gnome/druid-stock-split.c:319
+#: ../src/gnome/druid-stock-split.c:326
msgid "The price must be positive."
msgstr "Der Preis muss eine positive Zahl sein."
-#: ../src/gnome/druid-stock-split.c:357
+#: ../src/gnome/druid-stock-split.c:364
msgid "You must either enter a valid cash amount or leave it blank."
msgstr ""
"Sie müssen entweder einen gültigen Betrag eingeben oder das Eingabefeld leer "
"lassen."
-#: ../src/gnome/druid-stock-split.c:366
+#: ../src/gnome/druid-stock-split.c:373
msgid "The cash distribution must be positive."
msgstr "Der Ausgleichsbetrag muss positiv sein."
-#: ../src/gnome/druid-stock-split.c:378
+#: ../src/gnome/druid-stock-split.c:385
msgid "You must select an income account for the cash distribution."
msgstr "Sie müssen ein Ertragskonto für den Ausgleichsbetrag angeben."
-#: ../src/gnome/druid-stock-split.c:387
+#: ../src/gnome/druid-stock-split.c:394
msgid "You must select an asset account for the cash distribution."
msgstr "Sie müssen ein Aktiva-Konto für den Ausgleichsbetrag angeben."
-#: ../src/gnome/druid-stock-split.c:479
+#: ../src/gnome/druid-stock-split.c:486
msgid "Error adding price."
msgstr "Fehler beim Hinzufügen des Preises."
-#: ../src/gnome/druid-stock-split.c:754
+#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/advanced-portfolio.scm
+#: ../src/gnome/druid-stock-split.c:616
+#: ../src/gnome-utils/gnc-tree-view-commodity.c:399
+#: ../intl-scm/guile-strings.c:2442 ../intl-scm/guile-strings.c:3066
+#: ../intl-scm/guile-strings.c:3366 ../intl-scm/guile-strings.c:4516
+msgid "Symbol"
+msgstr "Symbol"
+
+#: ../src/gnome/druid-stock-split.c:789
msgid "You don't have any stock accounts with balances!"
msgstr "Sie haben keine Aktienkonten mit mehr als Null Aktien."
#: ../src/gnome/glade/account.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../src/gnome/glade/account.glade.h:2
-msgid "1/10"
-msgstr "1/10"
-
-#: ../src/gnome/glade/account.glade.h:3
-msgid "1/100"
-msgstr "1/100"
-
-#: ../src/gnome/glade/account.glade.h:4
-msgid "1/1000"
-msgstr "1/1000"
-
-#: ../src/gnome/glade/account.glade.h:5
-msgid "1/10000"
-msgstr "1/10000"
-
-#: ../src/gnome/glade/account.glade.h:6
-msgid "1/100000"
-msgstr "1/100000"
-
-#: ../src/gnome/glade/account.glade.h:7
-msgid "1/1000000"
-msgstr "1/1000000"
-
-#: ../src/gnome/glade/account.glade.h:8
msgid "<b>Acco_unt Type</b>"
msgstr "<b>Konto_art</b>"
-#: ../src/gnome/glade/account.glade.h:9
+#: ../src/gnome/glade/account.glade.h:2
msgid "<b>Balance Information</b>"
msgstr "<b>Saldo-Informationen</b>"
-#: ../src/gnome/glade/account.glade.h:10
+#: ../src/gnome/glade/account.glade.h:3
msgid "<b>Categories</b>"
msgstr "<b>Kategorien</b>"
-#: ../src/gnome/glade/account.glade.h:11
+#: ../src/gnome/glade/account.glade.h:4
msgid "<b>Category Description</b>"
msgstr "<b>Kategorie-Beschreibung</b>"
-#: ../src/gnome/glade/account.glade.h:12
+#: ../src/gnome/glade/account.glade.h:5
msgid "<b>Contained Accounts</b>"
msgstr "<b>Enthaltene Konten</b>"
-#: ../src/gnome/glade/account.glade.h:13
+#: ../src/gnome/glade/account.glade.h:6
msgid "<b>Description</b>"
msgstr "<b>Beschreibung</b>"
-#: ../src/gnome/glade/account.glade.h:14
+#: ../src/gnome/glade/account.glade.h:7
msgid "<b>Identification</b>"
msgstr "<b>Identifizierung</b>"
-#: ../src/gnome/glade/account.glade.h:15
+#: ../src/gnome/glade/account.glade.h:8
msgid "<b>Initial Balance Transfer</b>"
msgstr "<b>Buchung Anfangssaldo</b>"
-#: ../src/gnome/glade/account.glade.h:16
+#: ../src/gnome/glade/account.glade.h:9
msgid "<b>New Account Currency</b>"
msgstr "<b>Standardwährung für neue Konten</b>"
-#: ../src/gnome/glade/account.glade.h:17
+#: ../src/gnome/glade/account.glade.h:10
msgid "<b>Sub-account Transactions</b>"
-msgstr "<b>Buchungen in Unterkonten"
+msgstr "<b>Buchungen in Unterkonten</b>"
-#: ../src/gnome/glade/account.glade.h:18
+#: ../src/gnome/glade/account.glade.h:11
msgid "<b>Sub-accounts</b>"
msgstr "<b>Unterkonten</b>"
-#: ../src/gnome/glade/account.glade.h:19
-#: ../src/gnome/glade/sched-xact.glade.h:40
+#: ../src/gnome/glade/account.glade.h:12
+#: ../src/gnome/glade/sched-xact.glade.h:43
msgid "<b>Transactions</b>"
msgstr "<b>Buchungen</b>"
-#: ../src/gnome/glade/account.glade.h:20
+#: ../src/gnome/glade/account.glade.h:13
msgid "<b>_Parent Account</b>"
msgstr "<b>_Hauptkonto</b>"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../src/gnome/glade/account.glade.h:21 ../intl-scm/guile-strings.c:1904
+#: ../src/gnome/glade/account.glade.h:14 ../intl-scm/guile-strings.c:3238
+#: ../intl-scm/guile-strings.c:4388
msgid "Account Type"
msgstr "Kontoart"
-#: ../src/gnome/glade/account.glade.h:22
+#: ../src/gnome/glade/account.glade.h:15
msgid "Account _name:"
msgstr "Konto_bezeichnung:"
-#: ../src/gnome/glade/account.glade.h:23
+#: ../src/gnome/glade/account.glade.h:16
msgid "C_lear All"
msgstr "_Keine auswählen"
-#: ../src/gnome/glade/account.glade.h:24
+#: ../src/gnome/glade/account.glade.h:17
msgid "Choose Currency"
msgstr "Währung wählen"
-#: ../src/gnome/glade/account.glade.h:25
+#: ../src/gnome/glade/account.glade.h:18
msgid "Choose accounts to create"
msgstr "Zu erstellende Konten wählen"
-#: ../src/gnome/glade/account.glade.h:26
+#: ../src/gnome/glade/account.glade.h:19
msgid "Delete Account"
msgstr "Konto löschen"
-#: ../src/gnome/glade/account.glade.h:27
+#: ../src/gnome/glade/account.glade.h:20
msgid "Delete all _subaccounts"
msgstr "Alle _Unterkonten löschen"
-#: ../src/gnome/glade/account.glade.h:28
+#: ../src/gnome/glade/account.glade.h:21
msgid "Delete all _transactions"
msgstr "Alle _Buchungen löschen"
-#: ../src/gnome/glade/account.glade.h:29
+#: ../src/gnome/glade/account.glade.h:22
msgid "Examples:"
msgstr "Beispiele:"
-#: ../src/gnome/glade/account.glade.h:30
+#: ../src/gnome/glade/account.glade.h:23
msgid "Filter By..."
msgstr "Filtern nach..."
-#: ../src/gnome/glade/account.glade.h:31
+#: ../src/gnome/glade/account.glade.h:24
msgid "Finish Account Setup"
msgstr "Konteneinrichten fertigstellen"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
#. src/report/report-system/report.scm
#. src/report/utility-reports/view-column.scm
+#. src/report/utility-reports/gnucash/report/view-column.scm
#. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/equity-statement.scm
#. src/report/standard-reports/register.scm
-#: ../src/gnome/glade/account.glade.h:32
-#: ../src/gnome-utils/glade/preferences.glade.h:63
-#: ../intl-scm/guile-strings.c:194 ../intl-scm/guile-strings.c:200
-#: ../intl-scm/guile-strings.c:206 ../intl-scm/guile-strings.c:212
-#: ../intl-scm/guile-strings.c:320 ../intl-scm/guile-strings.c:324
-#: ../intl-scm/guile-strings.c:328 ../intl-scm/guile-strings.c:332
-#: ../intl-scm/guile-strings.c:406 ../intl-scm/guile-strings.c:412
-#: ../intl-scm/guile-strings.c:418 ../intl-scm/guile-strings.c:424
-#: ../intl-scm/guile-strings.c:532 ../intl-scm/guile-strings.c:536
-#: ../intl-scm/guile-strings.c:540 ../intl-scm/guile-strings.c:544
-#: ../intl-scm/guile-strings.c:618 ../intl-scm/guile-strings.c:624
-#: ../intl-scm/guile-strings.c:630 ../intl-scm/guile-strings.c:820
-#: ../intl-scm/guile-strings.c:928 ../intl-scm/guile-strings.c:934
-#: ../intl-scm/guile-strings.c:1420 ../intl-scm/guile-strings.c:1422
-#: ../intl-scm/guile-strings.c:2110 ../intl-scm/guile-strings.c:2112
-#: ../intl-scm/guile-strings.c:2576
+#: ../src/gnome/glade/account.glade.h:25
+#: ../src/gnome-utils/glade/preferences.glade.h:70
+#: ../intl-scm/guile-strings.c:242 ../intl-scm/guile-strings.c:248
+#: ../intl-scm/guile-strings.c:254 ../intl-scm/guile-strings.c:260
+#: ../intl-scm/guile-strings.c:368 ../intl-scm/guile-strings.c:372
+#: ../intl-scm/guile-strings.c:376 ../intl-scm/guile-strings.c:380
+#: ../intl-scm/guile-strings.c:454 ../intl-scm/guile-strings.c:460
+#: ../intl-scm/guile-strings.c:466 ../intl-scm/guile-strings.c:472
+#: ../intl-scm/guile-strings.c:580 ../intl-scm/guile-strings.c:584
+#: ../intl-scm/guile-strings.c:588 ../intl-scm/guile-strings.c:592
+#: ../intl-scm/guile-strings.c:666 ../intl-scm/guile-strings.c:672
+#: ../intl-scm/guile-strings.c:678 ../intl-scm/guile-strings.c:684
+#: ../intl-scm/guile-strings.c:792 ../intl-scm/guile-strings.c:796
+#: ../intl-scm/guile-strings.c:800 ../intl-scm/guile-strings.c:804
+#: ../intl-scm/guile-strings.c:878 ../intl-scm/guile-strings.c:884
+#: ../intl-scm/guile-strings.c:890 ../intl-scm/guile-strings.c:896
+#: ../intl-scm/guile-strings.c:1004 ../intl-scm/guile-strings.c:1008
+#: ../intl-scm/guile-strings.c:1012 ../intl-scm/guile-strings.c:1016
+#: ../intl-scm/guile-strings.c:1090 ../intl-scm/guile-strings.c:1096
+#: ../intl-scm/guile-strings.c:1102 ../intl-scm/guile-strings.c:1130
+#: ../intl-scm/guile-strings.c:1136 ../intl-scm/guile-strings.c:1142
+#: ../intl-scm/guile-strings.c:1332 ../intl-scm/guile-strings.c:1450
+#: ../intl-scm/guile-strings.c:1456 ../intl-scm/guile-strings.c:1472
+#: ../intl-scm/guile-strings.c:1478 ../intl-scm/guile-strings.c:2130
+#: ../intl-scm/guile-strings.c:2132 ../intl-scm/guile-strings.c:2754
+#: ../intl-scm/guile-strings.c:2756 ../intl-scm/guile-strings.c:3444
+#: ../intl-scm/guile-strings.c:3446 ../intl-scm/guile-strings.c:3910
+#: ../intl-scm/guile-strings.c:4594 ../intl-scm/guile-strings.c:4596
+#: ../intl-scm/guile-strings.c:5060
msgid "General"
msgstr "Allgemein"
-#: ../src/gnome/glade/account.glade.h:33
+#: ../src/gnome/glade/account.glade.h:26
msgid "H_idden"
msgstr "_Versteckt"
-#: ../src/gnome/glade/account.glade.h:34
+#: ../src/gnome/glade/account.glade.h:27
msgid "Hide accounts which have a zero total value."
msgstr "Konten nicht anzeigen, die Kontostand Null haben."
-#: ../src/gnome/glade/account.glade.h:35
+#: ../src/gnome/glade/account.glade.h:28
msgid ""
"If you would like an account to have an opening balance, click on the "
"account and enter the starting balance in the box on the right. All accounts "
@@ -4274,7 +4394,7 @@
"rechten Kasten ein. Jede Kontoart außer Eigenkapital und Platzhalter kann "
"einen Anfangsbestand haben."
-#: ../src/gnome/glade/account.glade.h:36
+#: ../src/gnome/glade/account.glade.h:29
msgid ""
"If you would like an account to have an opening balance, click on the row "
"containing the account, click again in the opening balances column, and then "
@@ -4292,32 +4412,32 @@
"Wenn Sie ein Konto als Platzhalter verwenden wollen, klicken Sie auf das "
"entsprechende Häkchen in der Kontozeile.\n"
-#: ../src/gnome/glade/account.glade.h:40
+#: ../src/gnome/glade/account.glade.h:33
msgid "Interval:"
msgstr "Intervall:"
-#: ../src/gnome/glade/account.glade.h:41
+#: ../src/gnome/glade/account.glade.h:34
msgid "M_ove to:"
msgstr "_Verschieben nach:"
-#: ../src/gnome/glade/account.glade.h:42
-#: ../src/gnome-utils/dialog-account.c:1400
+#: ../src/gnome/glade/account.glade.h:35
+#: ../src/gnome-utils/dialog-account.c:1351
msgid "New Account"
msgstr "_Neues Konto"
-#: ../src/gnome/glade/account.glade.h:43
+#: ../src/gnome/glade/account.glade.h:36
msgid "New Account (not implemented)"
msgstr "Neues Konto (unfertig)"
-#: ../src/gnome/glade/account.glade.h:44
+#: ../src/gnome/glade/account.glade.h:37
msgid "New Account Hierarchy Setup"
msgstr "Neuen Kontenrahmen erstellen"
-#: ../src/gnome/glade/account.glade.h:45
+#: ../src/gnome/glade/account.glade.h:38
msgid "No_tes:"
msgstr "Be_merkung:"
-#: ../src/gnome/glade/account.glade.h:46
+#: ../src/gnome/glade/account.glade.h:39
msgid ""
"One or more sub-accounts contain read-only transactions which may not be "
"deleted."
@@ -4325,7 +4445,7 @@
"Ein Unterkonto (oder mehrere) dieses Kontos enthalten schreibgeschützte "
"Buchungen. Sie können diese nicht löschen. "
-#: ../src/gnome/glade/account.glade.h:47
+#: ../src/gnome/glade/account.glade.h:40
msgid ""
"One or more sub-accounts contain transactions. What would you like to do "
"with these transactions?"
@@ -4334,26 +4454,29 @@
"Sie mit diesen Buchungen machen?"
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../src/gnome/glade/account.glade.h:49
-#: ../src/gnome/glade/sched-xact.glade.h:134 ../intl-scm/guile-strings.c:1706
-#: ../intl-scm/guile-strings.c:2882
+#: ../src/gnome/glade/account.glade.h:42
+#: ../src/gnome/glade/sched-xact.glade.h:160 ../intl-scm/guile-strings.c:2416
+#: ../intl-scm/guile-strings.c:3040 ../intl-scm/guile-strings.c:4220
+#: ../intl-scm/guile-strings.c:5370
msgid "Other"
msgstr "Weitere"
-#: ../src/gnome/glade/account.glade.h:50
+#: ../src/gnome/glade/account.glade.h:43
msgid "Placeholde_r"
msgstr "_Platzhalter"
-#: ../src/gnome/glade/account.glade.h:51
+#: ../src/gnome/glade/account.glade.h:44
msgid "Please choose the currency to use for new accounts."
msgstr "Wählen Sie eine Währung für neue Konten."
-#: ../src/gnome/glade/account.glade.h:52
+#: ../src/gnome/glade/account.glade.h:45
msgid "Prefix:"
msgstr "Prefix:"
-#: ../src/gnome/glade/account.glade.h:53
+#: ../src/gnome/glade/account.glade.h:46
msgid ""
"Press `Apply' to create your new accounts.\n"
"\n"
@@ -4368,17 +4491,17 @@
"Drücken Sie »Abbrechen«, um den Assistenten zu schließen, ohne neue Konten "
"zu erstellen."
-#: ../src/gnome/glade/account.glade.h:58
+#: ../src/gnome/glade/account.glade.h:51
msgid "Renumber sub-accounts"
msgstr "Unterkonten neu nummerieren"
-#: ../src/gnome/glade/account.glade.h:59
-#: ../src/import-export/generic-import.glade.h:51
-#: ../src/import-export/qif-import/qif.glade.h:73
+#: ../src/gnome/glade/account.glade.h:52
+#: ../src/import-export/generic-import.glade.h:44
+#: ../src/import-export/qif-import/qif.glade.h:63
msgid "Select Account"
msgstr "Konto auswählen"
-#: ../src/gnome/glade/account.glade.h:60
+#: ../src/gnome/glade/account.glade.h:53
msgid ""
"Select categories that correspond to the ways that you will use GnuCash. "
"Each category you select will cause several accounts to be created. Select "
@@ -4389,36 +4512,36 @@
"gewählte Kategorie wird einige Konten erzeugen. Sie können jederzeit auch "
"später Konten anlegen. "
-#: ../src/gnome/glade/account.glade.h:61
-#: ../src/import-export/qif-import/qif.glade.h:75
+#: ../src/gnome/glade/account.glade.h:54
+#: ../src/import-export/qif-import/qif.glade.h:65
msgid "Select or add a GnuCash account"
msgstr "Auswählen oder Hinzufügen eines GnuCash Kontos"
-#: ../src/gnome/glade/account.glade.h:62
+#: ../src/gnome/glade/account.glade.h:55
msgid "Setup new accounts"
msgstr "Neue Konten einrichten"
-#: ../src/gnome/glade/account.glade.h:63
+#: ../src/gnome/glade/account.glade.h:56
msgid "Show _hidden accounts"
msgstr "_Versteckte Konten anzeigen"
-#: ../src/gnome/glade/account.glade.h:64
+#: ../src/gnome/glade/account.glade.h:57
msgid "Show _zero total accounts"
msgstr "Konten mit Saldo _Null anzeigen"
-#: ../src/gnome/glade/account.glade.h:65
+#: ../src/gnome/glade/account.glade.h:58
msgid "Smallest _fraction:"
msgstr "Kleinste _Stückelung:"
-#: ../src/gnome/glade/account.glade.h:66
+#: ../src/gnome/glade/account.glade.h:59
msgid "Smallest fraction of this commodity that can be referenced."
msgstr "Kleinste Stückelung, in der diese Währung/Aktie gehandelt werden kann."
-#: ../src/gnome/glade/account.glade.h:67
+#: ../src/gnome/glade/account.glade.h:60
msgid "Ta_x related"
msgstr "Steuer_relevant"
-#: ../src/gnome/glade/account.glade.h:68
+#: ../src/gnome/glade/account.glade.h:61
msgid ""
"This account (and any sub-accounts) will be hidden in the account tree and "
"will not appear in the popup account list in the register. To reset this "
@@ -4437,25 +4560,25 @@
"versteckten Konten wieder angezeigt und Sie können diese bearbeiten, um "
"diese Option wieder zu deaktivieren."
-#: ../src/gnome/glade/account.glade.h:69
+#: ../src/gnome/glade/account.glade.h:62
msgid "This account contains read-only transactions which may not be deleted."
msgstr ""
"Dieses Konto enthält schreibgeschützte Buchungen. Sie können diese nicht "
"löschen."
-#: ../src/gnome/glade/account.glade.h:70
+#: ../src/gnome/glade/account.glade.h:63
msgid ""
"This account contains sub-accounts. What would you like to do with these "
"sub-accounts?"
msgstr "Dieses Konto enthält Unterkonten. Was möchten Sie mit diesen machen?"
-#: ../src/gnome/glade/account.glade.h:71
+#: ../src/gnome/glade/account.glade.h:64
msgid ""
"This account contains transactions. What would you like to do with these "
"transactions?"
msgstr "Dieses Konto enthält Buchungen. Was möchten Sie mit diesen machen?"
-#: ../src/gnome/glade/account.glade.h:72
+#: ../src/gnome/glade/account.glade.h:65
msgid ""
"This account is present solely as a placeholder in the hierarchy. "
"Transactions may not be posted to this account, only to sub-accounts of this "
@@ -4464,7 +4587,7 @@
"Dieses Konto dient als Platzhalter in der Kontenhierarchie. Buchungen können "
"nicht auf dieses Konto gebucht werden, sondern nur auf Unterkonten davon."
-#: ../src/gnome/glade/account.glade.h:73
+#: ../src/gnome/glade/account.glade.h:66
msgid ""
"This druid will help you create a set of GnuCash accounts for your assets "
"(such as investments, checking or savings accounts), liabilities (such as "
@@ -4478,9 +4601,17 @@
"\n"
"Drücken Sie »Abbrechen«, wenn Sie keine neuen Konten erstellen möchten."
-#: ../src/gnome/glade/account.glade.h:76
-msgid "Use Commodity Value"
-msgstr "Währungseinstellung benutzen"
+#: ../src/gnome/glade/account.glade.h:69
+msgid ""
+"Use Commodity Value\n"
+"1\n"
+"1/10\n"
+"1/100\n"
+"1/1000\n"
+"1/10000\n"
+"1/100000\n"
+"1/1000000"
+msgstr ""
#: ../src/gnome/glade/account.glade.h:77
msgid "_Account code:"
@@ -4492,7 +4623,7 @@
#: ../src/gnome/glade/account.glade.h:79 ../src/gnome/glade/price.glade.h:21
#: ../src/gnome/glade/print.glade.h:22 ../src/gnome/glade/register.glade.h:81
-#: ../src/gnome/glade/stocks.glade.h:20
+#: ../src/gnome/glade/stocks.glade.h:17
#: ../src/gnome-utils/glade/exchange-dialog.glade.h:5
msgid "_Date:"
msgstr "_Datum:"
@@ -4510,49 +4641,53 @@
msgstr "_Verschieben nach:"
#: ../src/gnome/glade/account.glade.h:83
-#: ../src/gnome-utils/dialog-commodity.c:260
+msgid "_Renumber"
+msgstr "Neu _nummerieren"
+
+#: ../src/gnome/glade/account.glade.h:84
+#: ../src/gnome-utils/dialog-commodity.c:270
msgid "_Security/currency:"
msgstr "_Aktie/Währung:"
-#: ../src/gnome/glade/account.glade.h:84
+#: ../src/gnome/glade/account.glade.h:85
#: ../src/gnome-utils/glade/dialog-reset-warnings.glade.h:6
msgid "_Select All"
msgstr "_Alle auswählen"
-#: ../src/gnome/glade/account.glade.h:85
+#: ../src/gnome/glade/account.glade.h:86
msgid "_Select transfer account"
msgstr "_Herkunftskonto auswählen"
-#: ../src/gnome/glade/account.glade.h:86
+#: ../src/gnome/glade/account.glade.h:87
msgid "_Use equity 'Opening Balances' account"
msgstr "Benutze _Ausgleichskonto für Anfangsbestand"
-#: ../src/gnome/glade/acctperiod.glade.h:2
+#: ../src/gnome/glade/acctperiod.glade.h:1
msgid "Book Closing Dates"
msgstr "Datum Buchabschluß"
-#: ../src/gnome/glade/acctperiod.glade.h:3
+#: ../src/gnome/glade/acctperiod.glade.h:2
msgid "Close Book"
msgstr "Buch abschließen"
-#: ../src/gnome/glade/acctperiod.glade.h:4
+#: ../src/gnome/glade/acctperiod.glade.h:3
msgid "Enter a title for this book."
msgstr "Geben Sie einen beschreibenden Namen für dieses Buch ein."
-#: ../src/gnome/glade/acctperiod.glade.h:5
+#: ../src/gnome/glade/acctperiod.glade.h:4
msgid "Enter notes that describe this book."
msgstr "Geben Sie Bemerkungen ein, die dieses Buch beschreiben."
-#: ../src/gnome/glade/acctperiod.glade.h:6
+#: ../src/gnome/glade/acctperiod.glade.h:5
msgid "Finish Closing Books"
msgstr "Buchabschluß abgeschlossen"
-#: ../src/gnome/glade/acctperiod.glade.h:7
+#: ../src/gnome/glade/acctperiod.glade.h:6
#: ../src/gnome/glade/budget.glade.h:13
msgid "Notes:"
msgstr "Bemerkung:"
-#: ../src/gnome/glade/acctperiod.glade.h:8
+#: ../src/gnome/glade/acctperiod.glade.h:7
msgid ""
"Select an accounting period and the closing date for the period. Books will "
"be closed on midnight of the selected date."
@@ -4560,11 +4695,11 @@
"Wählen Sie einen Buchungszeitraum und ein Abschlußdatum für diesen Zeitraum. "
"Der Buchabschluß wird für Mitternacht jenes Datums gespeichert."
-#: ../src/gnome/glade/acctperiod.glade.h:9
+#: ../src/gnome/glade/acctperiod.glade.h:8
msgid "Setup Accounting Periods"
msgstr "Buchführungsperioden einrichten"
-#: ../src/gnome/glade/acctperiod.glade.h:10
+#: ../src/gnome/glade/acctperiod.glade.h:9
msgid ""
"This druid will help you setup and use accouting periods. \n"
" \n"
@@ -4578,11 +4713,11 @@
"wahrscheinlich nur krass falsch. Es könnte sogar Ihre Daten absolut kaputt "
"machen. Bitte sorgen Sie für ein konkret rechtzeitiges Backup."
-#: ../src/gnome/glade/acctperiod.glade.h:13
+#: ../src/gnome/glade/acctperiod.glade.h:12
msgid "Title:"
msgstr "Titel:"
-#: ../src/gnome/glade/acctperiod.glade.h:14
+#: ../src/gnome/glade/acctperiod.glade.h:13
msgid "xxx"
msgstr "xxx"
@@ -4599,8 +4734,8 @@
msgstr "Budgetname:"
#: ../src/gnome/glade/budget.glade.h:4
-#: ../src/gnome/gnc-plugin-page-budget.c:143
-#: ../src/gnome/gnc-plugin-page-budget.c:829
+#: ../src/gnome/gnc-plugin-page-budget.c:139
+#: ../src/gnome/gnc-plugin-page-budget.c:825
msgid "Budget Options"
msgstr "Budget Optionen"
@@ -4625,7 +4760,7 @@
msgstr "Budget abschätzen"
#: ../src/gnome/glade/budget.glade.h:10
-#: ../src/gnome/glade/sched-xact.glade.h:79
+#: ../src/gnome/glade/sched-xact.glade.h:85
msgid "Every "
msgstr "Alle "
@@ -4663,9 +4798,9 @@
msgstr "Gewähltes Budget öffnen"
#: ../src/gnome/glade/budget.glade.h:17 ../src/gnome/glade/print.glade.h:10
-#: ../src/gnome/glade/sched-xact.glade.h:133
-#: ../src/gnome/gnc-plugin-page-budget.c:170
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:976
+#: ../src/gnome/glade/sched-xact.glade.h:159
+#: ../src/gnome/gnc-plugin-page-budget.c:166
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:986
msgid "Options"
msgstr "Optionen"
@@ -4674,7 +4809,7 @@
msgstr "Signifikante Dezimalstellen:"
#: ../src/gnome/glade/budget.glade.h:19
-#: ../src/gnome/glade/sched-xact.glade.h:169
+#: ../src/gnome/glade/sched-xact.glade.h:194
msgid "Start Date:"
msgstr "Anfangsdatum:"
@@ -4772,6 +4907,8 @@
#: ../src/gnome/glade/commodities.glade.h:3
#: ../src/gnome/gnc-plugin-page-account-tree.c:219
+#: ../src/gnome/gnc-plugin-page-sx-list.c:118
+#: ../src/import-export/import-main-matcher.c:427
msgid "Edit"
msgstr "Bearbeiten"
@@ -4812,233 +4949,241 @@
msgstr "Jährlich"
#: ../src/gnome/glade/fincalc.glade.h:7
+msgid ""
+"Annual\n"
+"Semi-annual\n"
+"Tri-annual\n"
+"Quarterly\n"
+"Bi-monthly\n"
+"Monthly\n"
+"Semi-monthly\n"
+"Bi-weekly\n"
+"Weekly\n"
+"Daily (360)\n"
+"Daily (365)"
+msgstr ""
+
+#: ../src/gnome/glade/fincalc.glade.h:18
msgid "Beginning"
msgstr "Anfangend an"
-#: ../src/gnome/glade/fincalc.glade.h:8
+#: ../src/gnome/glade/fincalc.glade.h:19
msgid "Bi-monthly"
msgstr "Zweimonatlich"
-#: ../src/gnome/glade/fincalc.glade.h:9
+#: ../src/gnome/glade/fincalc.glade.h:20
msgid "Bi-weekly"
msgstr "Zweiwöchentlich"
-#: ../src/gnome/glade/fincalc.glade.h:10
+#: ../src/gnome/glade/fincalc.glade.h:21
msgid "Calculate"
msgstr "Berechnen"
-#: ../src/gnome/glade/fincalc.glade.h:11
+#: ../src/gnome/glade/fincalc.glade.h:22
msgid "Clear the entry"
msgstr "Löschen des Eintrages"
-#: ../src/gnome/glade/fincalc.glade.h:12
+#: ../src/gnome/glade/fincalc.glade.h:23
msgid "Co_mpounding:"
msgstr "Ver_zinsung:"
-#: ../src/gnome/glade/fincalc.glade.h:13
+#: ../src/gnome/glade/fincalc.glade.h:24
msgid "Continuous"
msgstr "Kontinuierlich"
-#: ../src/gnome/glade/fincalc.glade.h:14
+#: ../src/gnome/glade/fincalc.glade.h:25
msgid "Daily (360)"
msgstr "Täglich (360)"
-#: ../src/gnome/glade/fincalc.glade.h:15
+#: ../src/gnome/glade/fincalc.glade.h:26
msgid "Daily (365)"
msgstr "Täglich (365)"
-#: ../src/gnome/glade/fincalc.glade.h:16
+#: ../src/gnome/glade/fincalc.glade.h:27
msgid "Discrete"
msgstr "Schrittweise"
-#: ../src/gnome/glade/fincalc.glade.h:17
+#: ../src/gnome/glade/fincalc.glade.h:28
msgid "End"
msgstr "Ende"
-#: ../src/gnome/glade/fincalc.glade.h:18
+#: ../src/gnome/glade/fincalc.glade.h:29
msgid "Financial Calculator"
msgstr "Finanzrechner"
-#: ../src/gnome/glade/fincalc.glade.h:19
-#: ../src/gnome/glade/sched-xact.glade.h:88
+#: ../src/gnome/glade/fincalc.glade.h:30
+#: ../src/gnome/glade/sched-xact.glade.h:95
msgid "Frequency:"
msgstr "Häufigkeit:"
-#: ../src/gnome/glade/fincalc.glade.h:20
+#: ../src/gnome/glade/fincalc.glade.h:31
msgid "Future value"
msgstr "Zukünftiger Wert"
-#: ../src/gnome/glade/fincalc.glade.h:21
+#: ../src/gnome/glade/fincalc.glade.h:32
msgid "Interest rate"
msgstr "Zinssatz"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/fincalc.glade.h:22
-#: ../src/gnome/glade/sched-xact.glade.h:114 ../intl-scm/guile-strings.c:2388
-#: ../intl-scm/guile-strings.c:2390
+#: ../src/gnome/glade/fincalc.glade.h:33
+#: ../src/gnome/glade/sched-xact.glade.h:132 ../intl-scm/guile-strings.c:3722
+#: ../intl-scm/guile-strings.c:3724 ../intl-scm/guile-strings.c:4872
+#: ../intl-scm/guile-strings.c:4874
msgid "Monthly"
msgstr "Monatlich"
-#: ../src/gnome/glade/fincalc.glade.h:23
+#: ../src/gnome/glade/fincalc.glade.h:34
msgid "Payment Total:"
msgstr "Zahlungsbetrag:"
-#: ../src/gnome/glade/fincalc.glade.h:24
+#: ../src/gnome/glade/fincalc.glade.h:35
msgid "Payment periods"
msgstr "Zahlungsintervalle"
-#: ../src/gnome/glade/fincalc.glade.h:25
+#: ../src/gnome/glade/fincalc.glade.h:36
msgid "Periodic payment"
msgstr "Periodische Zahlung"
-#: ../src/gnome/glade/fincalc.glade.h:26
+#: ../src/gnome/glade/fincalc.glade.h:37
msgid "Present value"
msgstr "Aktueller Wert"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/fincalc.glade.h:27
-#: ../src/gnome/glade/sched-xact.glade.h:146 ../intl-scm/guile-strings.c:2392
-#: ../intl-scm/guile-strings.c:2394
+#: ../src/gnome/glade/fincalc.glade.h:38
+#: ../src/gnome/glade/sched-xact.glade.h:172 ../intl-scm/guile-strings.c:3726
+#: ../intl-scm/guile-strings.c:3728 ../intl-scm/guile-strings.c:4876
+#: ../intl-scm/guile-strings.c:4878
msgid "Quarterly"
msgstr "Vierteljährlich"
-#: ../src/gnome/glade/fincalc.glade.h:28
+#: ../src/gnome/glade/fincalc.glade.h:39
msgid "Recalculate the (single) blank entry in the above fields."
msgstr "Den einen leeren Eintrag in den Feldern ausrechnen."
-#: ../src/gnome/glade/fincalc.glade.h:29
+#: ../src/gnome/glade/fincalc.glade.h:40
#: ../src/gnome/glade/register.glade.h:41
-#: ../src/gnome/gnc-plugin-page-register.c:332
+#: ../src/gnome/gnc-plugin-page-register.c:329
msgid "Schedule"
msgstr "Terminiert"
-#: ../src/gnome/glade/fincalc.glade.h:30
+#: ../src/gnome/glade/fincalc.glade.h:41
msgid "Semi-annual"
msgstr "Halbjährlich"
-#: ../src/gnome/glade/fincalc.glade.h:31
+#: ../src/gnome/glade/fincalc.glade.h:42
msgid "Semi-monthly"
msgstr "Halbmonatlich"
-#: ../src/gnome/glade/fincalc.glade.h:32
+#: ../src/gnome/glade/fincalc.glade.h:43
msgid "Tri-annual"
msgstr "Dreimal pro Jahr"
-#: ../src/gnome/glade/fincalc.glade.h:33
-#: ../src/gnome/glade/sched-xact.glade.h:186
+#: ../src/gnome/glade/fincalc.glade.h:44
+#: ../src/gnome/glade/sched-xact.glade.h:211
msgid "Type:"
msgstr "Typ:"
-#: ../src/gnome/glade/fincalc.glade.h:34
-#: ../src/gnome/glade/sched-xact.glade.h:195
+#: ../src/gnome/glade/fincalc.glade.h:45
+#: ../src/gnome/glade/sched-xact.glade.h:220
msgid "Weekly"
msgstr "Wöchentlich"
-#: ../src/gnome/glade/fincalc.glade.h:35
+#: ../src/gnome/glade/fincalc.glade.h:46
msgid "When paid:"
msgstr "Zahlungsdatum:"
-#: ../src/gnome/glade/fincalc.glade.h:36
+#: ../src/gnome/glade/fincalc.glade.h:47
msgid "_Effective Date:"
msgstr "_Tatsächliches Datum:"
-#: ../src/gnome/glade/fincalc.glade.h:37
+#: ../src/gnome/glade/fincalc.glade.h:48
msgid "_Initial Payment:"
msgstr "_Anfängliche Zahlung:"
-#: ../src/gnome/glade/fincalc.glade.h:38
+#: ../src/gnome/glade/fincalc.glade.h:49
msgid "_Payments:"
msgstr "Z_ahlungen:"
-#: ../src/gnome/glade/fincalc.glade.h:39
+#: ../src/gnome/glade/fincalc.glade.h:50
msgid "total"
msgstr "Betrag"
-#: ../src/gnome/glade/lots.glade.h:2
+#: ../src/gnome/glade/lots.glade.h:1
msgid "<b>_Lots in This Account</b>"
msgstr "<b>_Posten in diesem Konto</b>"
-#: ../src/gnome/glade/lots.glade.h:3
+#: ../src/gnome/glade/lots.glade.h:2
msgid "<b>_Mini-Viewer</b>"
msgstr "<b>_Mini-Anzeige</b>"
-#: ../src/gnome/glade/lots.glade.h:4
+#: ../src/gnome/glade/lots.glade.h:3
msgid "<b>_Notes</b>"
msgstr "<b>Be_schreibung</b>"
-#: ../src/gnome/glade/lots.glade.h:5
+#: ../src/gnome/glade/lots.glade.h:4
msgid "<b>_Title</b>"
msgstr "<b>_Name</b>"
-#: ../src/gnome/glade/lots.glade.h:6
-msgid "A list of all of the lots in this account."
-msgstr "Eine Liste der Posten in diesem Konto."
-
-#: ../src/gnome/glade/lots.glade.h:7
+#: ../src/gnome/glade/lots.glade.h:5
msgid "A summary of all of the transactions in the selected lot"
msgstr "Eine Zusammenfassung aller Buchungen in dem gewählten Posten"
#. src/report/report-system/html-utilities.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/owner-report.scm
-#: ../src/gnome/glade/lots.glade.h:9
-#: ../src/gnome-utils/gnc-tree-view-account.c:558
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/gnome/glade/lots.glade.h:7 ../src/gnome/lot-viewer.c:625
+#: ../src/gnome-utils/gnc-tree-view-account.c:554
#: ../src/register/ledger-core/split-register-model.c:163
#: ../src/register/ledger-core/split-register-model.c:303
-#: ../intl-scm/guile-strings.c:890 ../intl-scm/guile-strings.c:1950
-#: ../intl-scm/guile-strings.c:2264 ../intl-scm/guile-strings.c:2568
-#: ../intl-scm/guile-strings.c:3422
+#: ../intl-scm/guile-strings.c:1404 ../intl-scm/guile-strings.c:3284
+#: ../intl-scm/guile-strings.c:3598 ../intl-scm/guile-strings.c:3902
+#: ../intl-scm/guile-strings.c:4434 ../intl-scm/guile-strings.c:4748
+#: ../intl-scm/guile-strings.c:5052 ../intl-scm/guile-strings.c:6148
+#: ../intl-scm/guile-strings.c:6672
msgid "Balance"
msgstr "Saldo"
-#: ../src/gnome/glade/lots.glade.h:12
+#: ../src/gnome/glade/lots.glade.h:9
msgid "Delete the highlighted lot"
msgstr "Ausgewählter Posten löschen"
-#: ../src/gnome/glade/lots.glade.h:14
+#: ../src/gnome/glade/lots.glade.h:11
msgid "Enter a name for the highlighted lot."
msgstr "Bitte geben Sie einen Namen für den Posten ein"
-#: ../src/gnome/glade/lots.glade.h:15
+#: ../src/gnome/glade/lots.glade.h:12
msgid "Enter any notes you want to make about this lot."
msgstr ""
"Geben Sie hier alle Notizen ein, die Sie zu diesem Posten speichern wollen."
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../src/gnome/glade/lots.glade.h:16 ../intl-scm/guile-strings.c:2726
+#: ../src/gnome/glade/lots.glade.h:13 ../intl-scm/guile-strings.c:4064
+#: ../intl-scm/guile-strings.c:5214
msgid "Gain/Loss"
msgstr "Wertzuwachs/Verlust"
-#: ../src/gnome/glade/lots.glade.h:17
-msgid "Gains"
-msgstr "Wertzuwachs"
-
-#: ../src/gnome/glade/lots.glade.h:18
+#: ../src/gnome/glade/lots.glade.h:14
msgid "Lot Viewer"
msgstr "Posten anzeigen"
-#: ../src/gnome/glade/lots.glade.h:20
-msgid "Open a register showing the transactions in this lot"
-msgstr "Ein Kontofenster öffnen, das alle Buchungen in diesem Posten anzeigt"
-
-#: ../src/gnome/glade/lots.glade.h:22
+#: ../src/gnome/glade/lots.glade.h:16
msgid "Scrub _Account"
msgstr "K_onto überprüfen"
-#: ../src/gnome/glade/lots.glade.h:23
+#: ../src/gnome/glade/lots.glade.h:17
msgid "Scrub the highlighted lot"
msgstr "Den gewählten Posten überprüfen und reparieren"
-#. src/report/standard-reports/general-journal.scm
-#. src/report/standard-reports/register.scm
-#: ../src/gnome/glade/lots.glade.h:24 ../intl-scm/guile-strings.c:1272
-#: ../intl-scm/guile-strings.c:2578
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/gnome/glade/lots.glade.h:26
+#: ../src/gnome/glade/lots.glade.h:19
msgid "_Scrub"
msgstr "Über_prüfen"
@@ -5224,7 +5369,7 @@
"Unbekannt"
#: ../src/gnome/glade/price.glade.h:7
-#: ../src/gnome-utils/dialog-commodity.c:269
+#: ../src/gnome-utils/dialog-commodity.c:279
msgid "Cu_rrency:"
msgstr "_Währung:"
@@ -5297,7 +5442,7 @@
msgstr "_Preis:"
#: ../src/gnome/glade/price.glade.h:24
-#: ../src/gnome-utils/dialog-commodity.c:264
+#: ../src/gnome-utils/dialog-commodity.c:274
msgid "_Security:"
msgstr "_Aktie:"
@@ -5369,7 +5514,7 @@
msgid "_Date format:"
msgstr "_Datumsformat:"
-#: ../src/gnome/glade/print.glade.h:23 ../src/gnome/glade/stocks.glade.h:21
+#: ../src/gnome/glade/print.glade.h:23 ../src/gnome/glade/stocks.glade.h:18
msgid "_Memo:"
msgstr "Buchungs_text:"
@@ -5405,7 +5550,7 @@
msgid "<b>Reconcile Information</b>"
msgstr "<b>Informationen zum Kontenabgleich</b>"
-#: ../src/gnome/glade/reconcile.glade.h:2 ../src/gnome/window-reconcile.c:721
+#: ../src/gnome/glade/reconcile.glade.h:2 ../src/gnome/window-reconcile.c:720
msgid "Enter _Interest Payment..."
msgstr "Zahlung Haben_zins eingeben..."
@@ -5414,7 +5559,7 @@
msgstr "_Unterkonten mit einbeziehen"
#. starting balance title/value
-#: ../src/gnome/glade/reconcile.glade.h:4 ../src/gnome/window-reconcile.c:1663
+#: ../src/gnome/glade/reconcile.glade.h:4 ../src/gnome/window-reconcile.c:1664
msgid "Starting Balance:"
msgstr "Anfangssaldo:"
@@ -5443,7 +5588,7 @@
msgstr "Bes_tätigt"
#: ../src/gnome/glade/register.glade.h:7
-#: ../src/gnome/gnc-plugin-page-register.c:210
+#: ../src/gnome/gnc-plugin-page-register.c:207
msgid "Cancel the current transaction"
msgstr "Aktuelle Buchung abbrechen"
@@ -5460,7 +5605,7 @@
msgstr "Ausgewählte Buchung kopieren"
#: ../src/gnome/glade/register.glade.h:11
-#: ../src/gnome/gnc-plugin-page-register.c:250
+#: ../src/gnome/gnc-plugin-page-register.c:247
msgid ""
"Create a Scheduled Transaction with the current transaction as a template"
msgstr "Terminierte Buchung erstellen mit aktuellem Buchungssatz als Vorlage"
@@ -5474,7 +5619,7 @@
msgstr "Ausgewählten Buchungssatz ausschneiden"
#: ../src/gnome/glade/register.glade.h:17
-#: ../src/gnome/gnc-plugin-page-register.c:201
+#: ../src/gnome/gnc-plugin-page-register.c:198
msgid "Delete the current transaction"
msgstr "Aktuellen Buchungssatz löschen"
@@ -5483,7 +5628,7 @@
msgstr "Buchung duplizieren..."
#: ../src/gnome/glade/register.glade.h:21
-#: ../src/import-export/generic-import.glade.h:20
+#: ../src/import-export/generic-import.glade.h:17
msgid "Duplicate Transaction"
msgstr "Doppelte Buchung"
@@ -5512,7 +5657,7 @@
msgstr "Gegen"
#: ../src/gnome/glade/register.glade.h:29
-#: ../src/gnome/gnc-plugin-page-register.c:247
+#: ../src/gnome/gnc-plugin-page-register.c:244
msgid "Jump to the corresponding transaction in the other account"
msgstr "Zur passenden Gegenbuchung im Gegenkonto gehen"
@@ -5521,12 +5666,12 @@
msgstr "Beibehalten der normalen Kontoreihenfolge"
#: ../src/gnome/glade/register.glade.h:31
-#: ../src/gnome/gnc-plugin-page-register.c:198
+#: ../src/gnome/gnc-plugin-page-register.c:195
msgid "Make a copy of the current transaction"
msgstr "Eine Kopie des aktuellen Buchungssatze erstellen"
#: ../src/gnome/glade/register.glade.h:32
-#: ../src/gnome/gnc-plugin-page-register.c:241
+#: ../src/gnome/gnc-plugin-page-register.c:238
msgid "Move to the blank transaction at the bottom of the register"
msgstr "Zur freien Buchungszeile am Ende dieses Kontobuchs gehen"
@@ -5539,7 +5684,7 @@
msgstr "Buchung einfügen"
#: ../src/gnome/glade/register.glade.h:35
-#: ../src/gnome/gnc-plugin-page-register.c:195
+#: ../src/gnome/gnc-plugin-page-register.c:192
msgid "Paste the transaction from the clipboard"
msgstr "Den Buchungssatz von der Zwischenablage einfügen"
@@ -5548,7 +5693,7 @@
msgstr "Begründung für Buchung ungültig machen:"
#: ../src/gnome/glade/register.glade.h:37
-#: ../src/gnome/gnc-plugin-page-register.c:207
+#: ../src/gnome/gnc-plugin-page-register.c:204
msgid "Record the current transaction"
msgstr "Änderungen des aktuellen Buchungssatzes übernehmen"
@@ -5557,7 +5702,7 @@
msgstr "Buchungsteile entfernen"
#: ../src/gnome/glade/register.glade.h:39
-#: ../src/gnome/gnc-plugin-page-register.c:275
+#: ../src/gnome/gnc-plugin-page-register.c:272
#: ../src/gnome-utils/gnc-icons.c:22
msgid "S_plit Transaction"
msgstr "Mehrteilige Buchung"
@@ -5583,22 +5728,22 @@
msgstr "_Alle anzeigen"
#: ../src/gnome/glade/register.glade.h:46
-#: ../src/gnome/gnc-plugin-page-register.c:276
+#: ../src/gnome/gnc-plugin-page-register.c:273
msgid "Show all splits in the current transaction"
msgstr "Alle Buchungen im aktuellen Buchungssatz anzeigen"
#: ../src/gnome/glade/register.glade.h:47
-#: ../src/gnome/gnc-plugin-page-register.c:291
+#: ../src/gnome/gnc-plugin-page-register.c:288
msgid "Show expanded transactions with all splits"
msgstr "Alle Buchungssätze vollständig mit allen Teilen anzeigen"
#: ../src/gnome/glade/register.glade.h:48
-#: ../src/gnome/gnc-plugin-page-register.c:285
+#: ../src/gnome/gnc-plugin-page-register.c:282
msgid "Show transactions on one or two lines"
msgstr "Alle Buchungssätze einzeilig anzeigen"
#: ../src/gnome/glade/register.glade.h:49
-#: ../src/gnome/gnc-plugin-page-register.c:288
+#: ../src/gnome/gnc-plugin-page-register.c:285
msgid ""
"Show transactions on one or two lines and expand the current transaction"
msgstr ""
@@ -5606,8 +5751,8 @@
"Buchungssatz vollständig anzeigen."
#: ../src/gnome/glade/register.glade.h:50
-#: ../src/gnome/gnc-plugin-page-register.c:272
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:36
+#: ../src/gnome/gnc-plugin-page-register.c:269
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:38
msgid "Show two lines of information for each transaction"
msgstr ""
"Alle Buchungssätze mit Bemerkung anzeigen, also zwei Zeilen pro Buchung "
@@ -5637,23 +5782,31 @@
msgid "Sort by action field"
msgstr "Sortiere nach Aktion"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:58 ../intl-scm/guile-strings.c:2362
+#: ../src/gnome/glade/register.glade.h:58 ../intl-scm/guile-strings.c:3696
+#: ../intl-scm/guile-strings.c:4846
msgid "Sort by amount"
msgstr "Sortieren nach Summe"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:59 ../intl-scm/guile-strings.c:2338
+#: ../src/gnome/glade/register.glade.h:59 ../intl-scm/guile-strings.c:3672
+#: ../intl-scm/guile-strings.c:4822
msgid "Sort by date"
msgstr "Nach Datum sortieren"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:60 ../intl-scm/guile-strings.c:2366
+#: ../src/gnome/glade/register.glade.h:60 ../intl-scm/guile-strings.c:3700
+#: ../intl-scm/guile-strings.c:4850
msgid "Sort by description"
msgstr "Sortieren nach Beschreibung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/register.glade.h:61 ../intl-scm/guile-strings.c:2374
+#: ../src/gnome/glade/register.glade.h:61 ../intl-scm/guile-strings.c:3708
+#: ../intl-scm/guile-strings.c:4858
msgid "Sort by memo"
msgstr "Sortiere nach Buchungstext"
@@ -5709,18 +5862,18 @@
#. Translators: This is a menu item in the View menu
#: ../src/gnome/glade/register.glade.h:76
-#: ../src/gnome/gnc-plugin-page-register.c:287
+#: ../src/gnome/gnc-plugin-page-register.c:284
msgid "_Auto-Split Ledger"
msgstr "_Aktive vollständig"
#. Translators: This is a menu item in the View menu
#: ../src/gnome/glade/register.glade.h:77
-#: ../src/gnome/gnc-plugin-page-register.c:284
+#: ../src/gnome/gnc-plugin-page-register.c:281
msgid "_Basic Ledger"
msgstr "_Einzeilig"
#: ../src/gnome/glade/register.glade.h:83
-#: ../src/gnome/gnc-plugin-page-register.c:271
+#: ../src/gnome/gnc-plugin-page-register.c:268
msgid "_Double Line"
msgstr "_Bemerkung anzeigen"
@@ -5733,7 +5886,7 @@
msgstr "_Fixiert"
#: ../src/gnome/glade/register.glade.h:88
-#: ../src/gnome/gnc-plugin-page-register.c:246
+#: ../src/gnome/gnc-plugin-page-register.c:243
#: ../src/gnome-utils/gnc-icons.c:23
msgid "_Jump"
msgstr "Gegenbuchung"
@@ -5795,644 +5948,552 @@
msgstr "... Treuhandkonto für Zahlungen verwenden?"
#: ../src/gnome/glade/sched-xact.glade.h:5
-msgid "10th"
-msgstr "10."
+msgid ""
+"1st\n"
+"2nd\n"
+"3rd\n"
+"4th\n"
+"5th\n"
+"6th\n"
+"7th\n"
+"8th\n"
+"9th\n"
+"10th\n"
+"11th\n"
+"12th\n"
+"13th\n"
+"14th\n"
+"15th\n"
+"16th\n"
+"17th\n"
+"18th\n"
+"19th\n"
+"20th\n"
+"21st\n"
+"22nd\n"
+"23rd\n"
+"24th\n"
+"25th\n"
+"26th\n"
+"27th\n"
+"28th\n"
+"[29th/last]\n"
+"[30th/last]\n"
+"[31st/last]"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:6
-msgid "11th"
-msgstr "11."
-
-#: ../src/gnome/glade/sched-xact.glade.h:7
-msgid "12th"
-msgstr "12."
-
-#: ../src/gnome/glade/sched-xact.glade.h:8
-msgid "13th"
-msgstr "13."
-
-#: ../src/gnome/glade/sched-xact.glade.h:9
-msgid "14th"
-msgstr "14."
-
-#: ../src/gnome/glade/sched-xact.glade.h:10
-msgid "15th"
-msgstr "15."
-
-#: ../src/gnome/glade/sched-xact.glade.h:11
-msgid "16th"
-msgstr "16."
-
-#: ../src/gnome/glade/sched-xact.glade.h:12
-msgid "17th"
-msgstr "17."
-
-#: ../src/gnome/glade/sched-xact.glade.h:13
-msgid "18th"
-msgstr "18."
-
-#: ../src/gnome/glade/sched-xact.glade.h:14
-msgid "19th"
-msgstr "19."
-
-#: ../src/gnome/glade/sched-xact.glade.h:15
-msgid "1st"
-msgstr "1."
-
-#: ../src/gnome/glade/sched-xact.glade.h:16
-msgid "20th"
-msgstr "20."
-
-#: ../src/gnome/glade/sched-xact.glade.h:17
-msgid "21st"
-msgstr "21."
-
-#: ../src/gnome/glade/sched-xact.glade.h:18
-msgid "22nd"
-msgstr "22."
-
-#: ../src/gnome/glade/sched-xact.glade.h:19
-msgid "23rd"
-msgstr "23."
-
-#: ../src/gnome/glade/sched-xact.glade.h:20
-msgid "24th"
-msgstr "24."
-
-#: ../src/gnome/glade/sched-xact.glade.h:21
-msgid "25th"
-msgstr "25."
-
-#: ../src/gnome/glade/sched-xact.glade.h:22
-msgid "26th"
-msgstr "26."
-
-#: ../src/gnome/glade/sched-xact.glade.h:23
-msgid "27th"
-msgstr "27."
-
-#: ../src/gnome/glade/sched-xact.glade.h:24
-msgid "28th"
-msgstr "28."
-
-#: ../src/gnome/glade/sched-xact.glade.h:25
-msgid "2nd"
-msgstr "2."
-
-#: ../src/gnome/glade/sched-xact.glade.h:26
-msgid "3rd"
-msgstr "3."
-
-#: ../src/gnome/glade/sched-xact.glade.h:27
-msgid "4th"
-msgstr "4."
-
-#: ../src/gnome/glade/sched-xact.glade.h:28
-msgid "5th"
-msgstr "5."
-
-#: ../src/gnome/glade/sched-xact.glade.h:29
-msgid "6th"
-msgstr "6."
-
-#: ../src/gnome/glade/sched-xact.glade.h:30
-msgid "7th"
-msgstr "7."
-
-#: ../src/gnome/glade/sched-xact.glade.h:31
-msgid "8th"
-msgstr "8."
-
-#: ../src/gnome/glade/sched-xact.glade.h:32
-msgid "9th"
-msgstr "9."
-
-#: ../src/gnome/glade/sched-xact.glade.h:33
+#: ../src/gnome/glade/sched-xact.glade.h:36
msgid "<b>Name</b>"
msgstr "<b>Name</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:34
+#: ../src/gnome/glade/sched-xact.glade.h:37
msgid "<b>Occurrences</b>"
msgstr "<b>Auftreten</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:35
+#: ../src/gnome/glade/sched-xact.glade.h:38
msgid "<b>Options</b>"
msgstr "<b>Optionen</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:36
+#: ../src/gnome/glade/sched-xact.glade.h:39
msgid "<b>Recurrence Frequency</b>"
msgstr "<b>Häufigkeit der Wiederholung</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:37
+#: ../src/gnome/glade/sched-xact.glade.h:40
msgid "<b>Since Last Run Dialog</b>"
msgstr "<b>Seit-letztem-Aufruf Fenster</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:38
+#: ../src/gnome/glade/sched-xact.glade.h:41
msgid "<b>Template Transaction</b>"
msgstr "<b>Buchungsvorlage</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:39
+#: ../src/gnome/glade/sched-xact.glade.h:42
msgid "<b>Transaction Editor Defaults</b>"
msgstr "<b>Voreinstellungen Buchungseditor</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:41
+#: ../src/gnome/glade/sched-xact.glade.h:44
msgid "<b>Upcoming</b>"
msgstr "<b>Bevorstehend</b>"
-#: ../src/gnome/glade/sched-xact.glade.h:42
+#: ../src/gnome/glade/sched-xact.glade.h:45
msgid "Account Deletion"
msgstr "Kontenlöschung"
-#: ../src/gnome/glade/sched-xact.glade.h:43
+#: ../src/gnome/glade/sched-xact.glade.h:46
msgid "Advanced..."
msgstr "Erweitert..."
-#: ../src/gnome/glade/sched-xact.glade.h:44
-#: ../src/gnome-utils/glade/transfer.glade.h:6
+#: ../src/gnome/glade/sched-xact.glade.h:47
+#: ../src/gnome-utils/glade/transfer.glade.h:5
msgid "Amount:"
msgstr "Betrag:"
-#: ../src/gnome/glade/sched-xact.glade.h:45
-msgid "Apr, Aug, Dec"
-msgstr "Apr, Aug, Dez"
-
-#: ../src/gnome/glade/sched-xact.glade.h:46
-msgid "Apr, Oct"
-msgstr "Apr, Okt"
-
-#: ../src/gnome/glade/sched-xact.glade.h:47
-msgid "April"
-msgstr "April"
-
#: ../src/gnome/glade/sched-xact.glade.h:48
-msgid "August"
-msgstr "August"
-
-#: ../src/gnome/glade/sched-xact.glade.h:49
msgid "Auto-Created Transactions Notification"
msgstr "Benachrichtigung über automatisch erstellte Buchungen"
-#: ../src/gnome/glade/sched-xact.glade.h:50
+#: ../src/gnome/glade/sched-xact.glade.h:49
msgid "Begin notifications this many days before the transaction is created."
msgstr ""
"Benachrichtigung bereits diese Anzahl Tage vor der Erstellung der Buchungen "
"anzeigen."
-#: ../src/gnome/glade/sched-xact.glade.h:51
+#: ../src/gnome/glade/sched-xact.glade.h:50
msgid "Bi-Weekly"
msgstr "Zweiwöchentlich"
-#: ../src/gnome/glade/sched-xact.glade.h:52
+#: ../src/gnome/glade/sched-xact.glade.h:51
msgid "Conditional on splits not having variables"
msgstr "Abhängig davon, dass Buchungen keine Variablen haben"
-#: ../src/gnome/glade/sched-xact.glade.h:53
+#: ../src/gnome/glade/sched-xact.glade.h:52
msgid "Crea_te in advance, days:"
msgstr "Anzahl Tage, um im _Voraus zu erstellen:"
-#: ../src/gnome/glade/sched-xact.glade.h:54
+#: ../src/gnome/glade/sched-xact.glade.h:53
msgid "Create"
msgstr "Erstellen"
-#: ../src/gnome/glade/sched-xact.glade.h:55
+#: ../src/gnome/glade/sched-xact.glade.h:54
msgid "Create as scheduled"
msgstr "Erstellen wie terminiert"
-#: ../src/gnome/glade/sched-xact.glade.h:56
+#: ../src/gnome/glade/sched-xact.glade.h:55
msgid "Create automatically"
msgstr "Automatisch erstellen"
-#: ../src/gnome/glade/sched-xact.glade.h:57
+#: ../src/gnome/glade/sched-xact.glade.h:56
msgid "Create in advance:"
msgstr "Im Voraus erstellen:"
-#: ../src/gnome/glade/sched-xact.glade.h:58
+#: ../src/gnome/glade/sched-xact.glade.h:57
msgid "Create the transaction this many days before its effective date."
msgstr ""
"Buchungen um diese Anzahl der Tage im Voraus vor dem eigentlichen "
"Buchungsdatum erstellen."
-#: ../src/gnome/glade/sched-xact.glade.h:59
+#: ../src/gnome/glade/sched-xact.glade.h:58
msgid "Created Transaction Review"
msgstr "Buchungsübersicht erstellt"
-#: ../src/gnome/glade/sched-xact.glade.h:60
+#: ../src/gnome/glade/sched-xact.glade.h:59
msgid "Creating transactions..."
msgstr "Buchungen erstellen..."
-#: ../src/gnome/glade/sched-xact.glade.h:61
+#: ../src/gnome/glade/sched-xact.glade.h:60
msgid "Creation State"
msgstr "Erstellen Status"
-#: ../src/gnome/glade/sched-xact.glade.h:62
-msgid "Current Year"
-msgstr "Dieses Jahr"
+#: ../src/gnome/glade/sched-xact.glade.h:61
+msgid ""
+"Current Year\n"
+"Now + 1 Year\n"
+"Whole Loan\n"
+"Custom"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:63
-msgid "Custom"
-msgstr "Benutzerdefiniert"
+#: ../src/gnome/glade/sched-xact.glade.h:66
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Bi-Weekly\n"
+"Monthly\n"
+"Quarterly\n"
+"Yearly"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:65
+#: ../src/gnome/glade/sched-xact.glade.h:72
msgid "Daily [M-F]"
msgstr "Täglich [Mo-Fr]"
#. src/business/business-reports/owner-report.scm
-#: ../src/gnome/glade/sched-xact.glade.h:66 ../intl-scm/guile-strings.c:3488
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/gnome/glade/sched-xact.glade.h:73 ../intl-scm/guile-strings.c:6214
+#: ../intl-scm/guile-strings.c:6738
msgid "Date Range"
msgstr "Datumsbereich"
#. src/report/report-system/options-utilities.scm
-#: ../src/gnome/glade/sched-xact.glade.h:67 ../intl-scm/guile-strings.c:666
-#: ../intl-scm/guile-strings.c:668
+#: ../src/gnome/glade/sched-xact.glade.h:74 ../intl-scm/guile-strings.c:1178
+#: ../intl-scm/guile-strings.c:1180
msgid "Day"
msgstr "Tag"
-#: ../src/gnome/glade/sched-xact.glade.h:69
+#: ../src/gnome/glade/sched-xact.glade.h:76
msgid "Days Away"
msgstr "Tage in der Zukunft"
-#: ../src/gnome/glade/sched-xact.glade.h:70
-msgid "December"
-msgstr "Dezember"
-
-#: ../src/gnome/glade/sched-xact.glade.h:71
+#: ../src/gnome/glade/sched-xact.glade.h:77
msgid "Disposition?"
msgstr "Auswahl:"
-#: ../src/gnome/glade/sched-xact.glade.h:72
+#: ../src/gnome/glade/sched-xact.glade.h:78
msgid "Do you..."
msgstr "Möchten Sie..."
-#: ../src/gnome/glade/sched-xact.glade.h:73
+#: ../src/gnome/glade/sched-xact.glade.h:79
msgid "Edit Scheduled Transaction"
msgstr "Terminierte Buchungen bearbeiten"
-#: ../src/gnome/glade/sched-xact.glade.h:74
+#: ../src/gnome/glade/sched-xact.glade.h:80
msgid "End "
msgstr "Ende "
-#: ../src/gnome/glade/sched-xact.glade.h:75
+#: ../src/gnome/glade/sched-xact.glade.h:81
msgid "End Date:"
msgstr "Enddatum:"
-#: ../src/gnome/glade/sched-xact.glade.h:76
+#: ../src/gnome/glade/sched-xact.glade.h:82
msgid "Ended On"
msgstr "Beendet am"
-#: ../src/gnome/glade/sched-xact.glade.h:77
+#: ../src/gnome/glade/sched-xact.glade.h:83
msgid "Escrow Account:"
msgstr "Treuhandkonto:"
-#: ../src/gnome/glade/sched-xact.glade.h:78
+#: ../src/gnome/glade/sched-xact.glade.h:84
msgid "Every"
msgstr "Alle"
-#: ../src/gnome/glade/sched-xact.glade.h:80
-msgid "Feb, Aug"
-msgstr "Feb, Aug"
-
-#: ../src/gnome/glade/sched-xact.glade.h:81
-msgid "Feb, Jun, Oct"
-msgstr "Feb, Jun, Okt"
-
-#: ../src/gnome/glade/sched-xact.glade.h:82
-msgid "Feb, May, Aug, Nov"
-msgstr "Feb, Mai, Aug, Nov"
-
-#: ../src/gnome/glade/sched-xact.glade.h:83
-msgid "February"
-msgstr "Februar"
-
-#: ../src/gnome/glade/sched-xact.glade.h:84
+#: ../src/gnome/glade/sched-xact.glade.h:86
msgid "First on the:"
msgstr "Zuerst am:"
-#: ../src/gnome/glade/sched-xact.glade.h:85
+#: ../src/gnome/glade/sched-xact.glade.h:87
+msgid ""
+"Fixed Rate\n"
+"3/1 Year ARM\n"
+"5/1 Year ARM\n"
+"7/1 Year ARM\n"
+"10/1 Year ARM"
+msgstr ""
+
+#: ../src/gnome/glade/sched-xact.glade.h:92
msgid "For:"
msgstr "Für:"
-#: ../src/gnome/glade/sched-xact.glade.h:86
+#: ../src/gnome/glade/sched-xact.glade.h:93
msgid "Forever"
msgstr "Immer"
-#: ../src/gnome/glade/sched-xact.glade.h:87
-#: ../src/gnome-utils/gnc-dense-cal.c:281
+#: ../src/gnome/glade/sched-xact.glade.h:94
+#: ../src/gnome-utils/gnc-dense-cal.c:264
msgid "Frequency"
msgstr "Häufigkeit"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:89 ../intl-scm/guile-strings.c:2818
+#: ../src/gnome/glade/sched-xact.glade.h:96 ../intl-scm/guile-strings.c:4156
+#: ../intl-scm/guile-strings.c:5306
msgid "Friday"
msgstr "Freitag"
-#: ../src/gnome/glade/sched-xact.glade.h:90
+#: ../src/gnome/glade/sched-xact.glade.h:97
msgid "Ignore"
msgstr "Ignorieren"
-#: ../src/gnome/glade/sched-xact.glade.h:91
+#: ../src/gnome/glade/sched-xact.glade.h:98
msgid "Interest Rate Change Frequency"
msgstr "Änderungshäufigkeit des Zinssatzes"
-#: ../src/gnome/glade/sched-xact.glade.h:92
+#: ../src/gnome/glade/sched-xact.glade.h:99
msgid "Interest Rate:"
msgstr "Zinssatz:"
-#: ../src/gnome/glade/sched-xact.glade.h:93
+#: ../src/gnome/glade/sched-xact.glade.h:100
msgid "Interest To:"
msgstr "Zinsen nach:"
-#: ../src/gnome/glade/sched-xact.glade.h:94
-msgid "Jan, Apr, Jul, Oct"
-msgstr "Jan, Apr, Jul, Okt"
+#: ../src/gnome/glade/sched-xact.glade.h:101
+msgid ""
+"Jan, Apr, Jul, Oct\n"
+"Feb, May, Aug, Nov\n"
+"Mar, Jun, Sep, Dec"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:95
-msgid "Jan, Jul"
-msgstr "Jan, Jul"
+#: ../src/gnome/glade/sched-xact.glade.h:104
+msgid ""
+"Jan, Jul\n"
+"Feb, Aug\n"
+"Mar, Sep\n"
+"Apr, Oct\n"
+"May, Nov\n"
+"Jun, Dec"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:96
-msgid "Jan, May, Sep"
-msgstr "Jan, Mai, Sep"
+#: ../src/gnome/glade/sched-xact.glade.h:110
+msgid ""
+"Jan, May, Sep\n"
+"Feb, Jun, Oct\n"
+"Mar, Jul, Nov"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:97
-msgid "January"
-msgstr "Januar"
+#: ../src/gnome/glade/sched-xact.glade.h:113
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:98
-msgid "July"
-msgstr "Juli"
-
-#: ../src/gnome/glade/sched-xact.glade.h:99
-msgid "Jun, Dec"
-msgstr "Jun, Dez"
-
-#: ../src/gnome/glade/sched-xact.glade.h:100
-msgid "June"
-msgstr "Juni"
-
-#: ../src/gnome/glade/sched-xact.glade.h:101
+#: ../src/gnome/glade/sched-xact.glade.h:125
msgid "Last Occurred: "
msgstr "Zuletzt aufgetreten: "
-#: ../src/gnome/glade/sched-xact.glade.h:102
+#: ../src/gnome/glade/sched-xact.glade.h:126
msgid "Length:"
msgstr "Länge:"
-#: ../src/gnome/glade/sched-xact.glade.h:103
+#: ../src/gnome/glade/sched-xact.glade.h:127
msgid "Loan Account:"
msgstr "Darlehenskonto:"
-#: ../src/gnome/glade/sched-xact.glade.h:104
+#: ../src/gnome/glade/sched-xact.glade.h:128
msgid "Loan Information"
msgstr "Darlehen Informationen"
-#: ../src/gnome/glade/sched-xact.glade.h:105
+#: ../src/gnome/glade/sched-xact.glade.h:129
msgid "Make Scheduled Transaction"
msgstr "Terminierte Buchung erstellen"
-#: ../src/gnome/glade/sched-xact.glade.h:106
-msgid "Mar, Jul, Nov"
-msgstr "Mär, Jul, Nov"
-
-#: ../src/gnome/glade/sched-xact.glade.h:107
-msgid "Mar, Jun, Sep, Dec"
-msgstr "Mär, Jun, Sep, Dez"
-
-#: ../src/gnome/glade/sched-xact.glade.h:108
-msgid "Mar, Sep"
-msgstr "Mär, Sep"
-
-#: ../src/gnome/glade/sched-xact.glade.h:109
-msgid "March"
-msgstr "März"
-
-#: ../src/gnome/glade/sched-xact.glade.h:110
-msgid "May"
-msgstr "Mai"
-
-#: ../src/gnome/glade/sched-xact.glade.h:111
-msgid "May, Nov"
-msgstr "Mai, Nov"
-
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:112 ../intl-scm/guile-strings.c:2810
+#: ../src/gnome/glade/sched-xact.glade.h:130 ../intl-scm/guile-strings.c:4148
+#: ../intl-scm/guile-strings.c:5298
msgid "Monday"
msgstr "Montag"
#. src/report/report-system/options-utilities.scm
-#: ../src/gnome/glade/sched-xact.glade.h:113 ../intl-scm/guile-strings.c:678
-#: ../intl-scm/guile-strings.c:680
+#: ../src/gnome/glade/sched-xact.glade.h:131 ../intl-scm/guile-strings.c:1190
+#: ../intl-scm/guile-strings.c:1192
msgid "Month"
msgstr "Monat"
-#: ../src/gnome/glade/sched-xact.glade.h:115
+#: ../src/gnome/glade/sched-xact.glade.h:133
msgid "Months Remaining:"
msgstr "Restliche Monate:"
-#: ../src/gnome/glade/sched-xact.glade.h:116
+#: ../src/gnome/glade/sched-xact.glade.h:134
msgid "Mortgage/Loan Druid"
-msgstr "Hypothek/Darlehen Druide"
+msgstr "Hypothek/Darlehen Assistent"
-#: ../src/gnome/glade/sched-xact.glade.h:117
+#: ../src/gnome/glade/sched-xact.glade.h:135
msgid "Mortgage/Loan Repayment Setup"
msgstr "Einrichtung Hypothek/Darlehen-Tilgung"
-#: ../src/gnome/glade/sched-xact.glade.h:119
+#: ../src/gnome/glade/sched-xact.glade.h:137
msgid "Name:"
msgstr "Name:"
-#: ../src/gnome/glade/sched-xact.glade.h:120
+#: ../src/gnome/glade/sched-xact.glade.h:138
msgid "Never End"
msgstr "Endet nicht"
-#: ../src/gnome/glade/sched-xact.glade.h:121
-msgid "Next Occurrence"
-msgstr "Nächstes Auftreten"
+#: ../src/gnome/glade/sched-xact.glade.h:140
+msgid ""
+"None\n"
+"Once\n"
+"Daily\n"
+"Daily [M-F]\n"
+"Weekly\n"
+"Bi-Weekly\n"
+"Semi-Monthly\n"
+"Monthly\n"
+"Quarterly\n"
+"Tri-Yearly\n"
+"Semi-Yearly\n"
+"Yearly"
+msgstr ""
-#: ../src/gnome/glade/sched-xact.glade.h:124
+#: ../src/gnome/glade/sched-xact.glade.h:152
+msgid "Not scheduled"
+msgstr "Nicht vorgemerkt"
+
+#: ../src/gnome/glade/sched-xact.glade.h:153
msgid "Notify me when created"
msgstr "Bei Erstellung benachrichtigen"
-#: ../src/gnome/glade/sched-xact.glade.h:125
-msgid "November"
-msgstr "November"
-
-#: ../src/gnome/glade/sched-xact.glade.h:126
-msgid "Now + 1 Year"
-msgstr "Heute plus ein Jahr"
-
-#: ../src/gnome/glade/sched-xact.glade.h:127
+#: ../src/gnome/glade/sched-xact.glade.h:154
msgid "Number of Occurrences:"
msgstr "Anzahl des Auftretens:"
-#: ../src/gnome/glade/sched-xact.glade.h:128
+#: ../src/gnome/glade/sched-xact.glade.h:155
msgid "Obsolete Scheduled Transactions"
msgstr "Terminierte Buchung löschen"
-#: ../src/gnome/glade/sched-xact.glade.h:129
+#: ../src/gnome/glade/sched-xact.glade.h:156
msgid "Occuring in"
msgstr "In den Monaten"
-#: ../src/gnome/glade/sched-xact.glade.h:130
-msgid "October"
-msgstr "Oktober"
-
-#: ../src/gnome/glade/sched-xact.glade.h:131
+#: ../src/gnome/glade/sched-xact.glade.h:157
msgid "On the"
msgstr "Am"
-#: ../src/gnome/glade/sched-xact.glade.h:132
+#: ../src/gnome/glade/sched-xact.glade.h:158
msgid "Once"
msgstr "Einmal"
-#: ../src/gnome/glade/sched-xact.glade.h:135
+#: ../src/gnome/glade/sched-xact.glade.h:161
msgid "Part of Payment Transaction"
msgstr "Teil einer Zahlung"
-#: ../src/gnome/glade/sched-xact.glade.h:136
+#: ../src/gnome/glade/sched-xact.glade.h:162
msgid "Payment Frequency"
msgstr "Zahlungshäufigkeit"
-#: ../src/gnome/glade/sched-xact.glade.h:137
+#: ../src/gnome/glade/sched-xact.glade.h:163
msgid "Payment From (Escrow):"
msgstr "Zahlung von (Treuhandkonto):"
-#: ../src/gnome/glade/sched-xact.glade.h:138
+#: ../src/gnome/glade/sched-xact.glade.h:164
msgid "Payment From:"
msgstr "Zahlung von:"
-#: ../src/gnome/glade/sched-xact.glade.h:139
+#: ../src/gnome/glade/sched-xact.glade.h:165
msgid "Payment To (Escrow):"
msgstr "Zahlung an (Treuhandkonto):"
-#: ../src/gnome/glade/sched-xact.glade.h:140
+#: ../src/gnome/glade/sched-xact.glade.h:166
msgid "Payment To:"
msgstr "Zahlung an:"
-#: ../src/gnome/glade/sched-xact.glade.h:141
+#: ../src/gnome/glade/sched-xact.glade.h:167
msgid "Postpone"
msgstr "Zurückstellen"
-#: ../src/gnome/glade/sched-xact.glade.h:143
+#: ../src/gnome/glade/sched-xact.glade.h:169
msgid "Press Apply to create these transactions."
msgstr "Klicken Sie »Anwenden«, um diese Buchungen zu erstellen."
-#: ../src/gnome/glade/sched-xact.glade.h:144
+#: ../src/gnome/glade/sched-xact.glade.h:170
msgid "Press apply to commit these changes."
msgstr "Klicken Sie »Anwenden«, um die Änderungen zu speichern."
-#: ../src/gnome/glade/sched-xact.glade.h:145
+#: ../src/gnome/glade/sched-xact.glade.h:171
msgid "Principal To:"
msgstr "Endbetrag Kapital an:"
-#: ../src/gnome/glade/sched-xact.glade.h:147
+#: ../src/gnome/glade/sched-xact.glade.h:173
msgid "R_emind in advance, days:"
msgstr "Anzahl Tage, um im v_oraus zu erinnern:"
-#: ../src/gnome/glade/sched-xact.glade.h:148
+#: ../src/gnome/glade/sched-xact.glade.h:174
msgid "Range: "
msgstr "Bereich: "
-#: ../src/gnome/glade/sched-xact.glade.h:149
+#: ../src/gnome/glade/sched-xact.glade.h:175
msgid "Remind in advance:"
msgstr "Im Voraus erinnern:"
-#: ../src/gnome/glade/sched-xact.glade.h:150
+#: ../src/gnome/glade/sched-xact.glade.h:176
msgid "Repayment"
msgstr "Tilgung"
-#: ../src/gnome/glade/sched-xact.glade.h:151
+#: ../src/gnome/glade/sched-xact.glade.h:177
msgid "Repayment Frequency"
msgstr "Tilgungshäufigkeit"
-#: ../src/gnome/glade/sched-xact.glade.h:152
+#: ../src/gnome/glade/sched-xact.glade.h:178
msgid "Repayment Type"
msgstr "Rückzahlungsart"
-#: ../src/gnome/glade/sched-xact.glade.h:153
+#: ../src/gnome/glade/sched-xact.glade.h:179
msgid "Repeats:"
msgstr "Wiederholungen:"
-#: ../src/gnome/glade/sched-xact.glade.h:154
+#: ../src/gnome/glade/sched-xact.glade.h:180
msgid "Review"
msgstr "Kontrolle"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:155 ../intl-scm/guile-strings.c:2820
+#: ../src/gnome/glade/sched-xact.glade.h:181 ../intl-scm/guile-strings.c:4158
+#: ../intl-scm/guile-strings.c:5308
msgid "Saturday"
msgstr "Samstag"
-#: ../src/gnome/glade/sched-xact.glade.h:156
+#: ../src/gnome/glade/sched-xact.glade.h:182
msgid "Scheduled Transaction"
msgstr "Terminierte Buchung"
-#: ../src/gnome/glade/sched-xact.glade.h:158
-#: ../src/gnome-utils/dialog-options.c:883
-#: ../src/gnome-utils/dialog-options.c:1010
+#: ../src/gnome/glade/sched-xact.glade.h:183
+#: ../src/gnome-utils/dialog-options.c:870
+#: ../src/gnome-utils/dialog-options.c:988
msgid "Select All"
msgstr "Alle auswählen"
-#: ../src/gnome/glade/sched-xact.glade.h:159
+#: ../src/gnome/glade/sched-xact.glade.h:184
msgid "Select initial date, above."
msgstr "Wählen Sie oben ein Anfangsdatum."
-#: ../src/gnome/glade/sched-xact.glade.h:160
+#: ../src/gnome/glade/sched-xact.glade.h:185
msgid "Select occurrence date above."
msgstr "Wählen Sie oben ein Datum des Auftretens."
-#: ../src/gnome/glade/sched-xact.glade.h:161
+#: ../src/gnome/glade/sched-xact.glade.h:186
msgid "Semi-Monthly"
msgstr "Halbmonatlich"
-#: ../src/gnome/glade/sched-xact.glade.h:162
+#: ../src/gnome/glade/sched-xact.glade.h:187
msgid "Semi-Yearly"
msgstr "Halbjährlich"
-#: ../src/gnome/glade/sched-xact.glade.h:163
-msgid "September"
-msgstr "September"
-
-#: ../src/gnome/glade/sched-xact.glade.h:164
+#: ../src/gnome/glade/sched-xact.glade.h:188
msgid "Set the 'auto-create' flag on newly created scheduled transactions."
msgstr ""
"»Automatisch erstellen« für neue terminierte Buchungen als Voreinstellung "
"wählen."
-#: ../src/gnome/glade/sched-xact.glade.h:165
+#: ../src/gnome/glade/sched-xact.glade.h:189
msgid "Set the 'notify' flag on newly created scheduled transactions."
msgstr ""
"»Benachrichtigen« für neue terminierte Buchungen als Voreinstellung wählen."
-#: ../src/gnome/glade/sched-xact.glade.h:166
+#: ../src/gnome/glade/sched-xact.glade.h:190
msgid "Show the \"since last run\" window when a file is opened."
msgstr ""
"Das Fenster »Seit letztem Aufruf« anzeigen, wenn eine Datei geöffnet wird "
"oder beim Programmstart von GnuCash."
-#: ../src/gnome/glade/sched-xact.glade.h:167
+#: ../src/gnome/glade/sched-xact.glade.h:191
msgid "Since Last Run"
msgstr "Seit letztem Aufruf"
-#: ../src/gnome/glade/sched-xact.glade.h:168
+#: ../src/gnome/glade/sched-xact.glade.h:192
+msgid "Since Last Run..."
+msgstr "Seit letztem Aufruf..."
+
+#: ../src/gnome/glade/sched-xact.glade.h:193
msgid "Specify Source Account"
msgstr "Herkunftskonto auswählen"
-#: ../src/gnome/glade/sched-xact.glade.h:170
+#: ../src/gnome/glade/sched-xact.glade.h:195
msgid "Start Date: "
msgstr "Anfangsdatum: "
-#: ../src/gnome/glade/sched-xact.glade.h:171
+#: ../src/gnome/glade/sched-xact.glade.h:196
msgid "State"
msgstr "Status"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:172 ../intl-scm/guile-strings.c:2808
+#: ../src/gnome/glade/sched-xact.glade.h:197 ../intl-scm/guile-strings.c:4146
+#: ../intl-scm/guile-strings.c:5296
msgid "Sunday"
msgstr "Sonntag"
-#: ../src/gnome/glade/sched-xact.glade.h:173
+#: ../src/gnome/glade/sched-xact.glade.h:198
msgid "Template Transaction (Read-Only)"
msgstr "Buchungsvorlage (schreibgeschützt)"
-#: ../src/gnome/glade/sched-xact.glade.h:174
+#: ../src/gnome/glade/sched-xact.glade.h:199
msgid ""
"The following Scheduled Transactions reference the deleted account, and must "
"now be corrected. Press OK to edit them."
@@ -6440,7 +6501,7 @@
"Die folgenden terminierten Buchungen gehören zu dem gelöschten Konto und "
"müssen nun geändert werden. Klicken Sie Ok, um sie zu ändern."
-#: ../src/gnome/glade/sched-xact.glade.h:175
+#: ../src/gnome/glade/sched-xact.glade.h:200
msgid ""
"The following scheduled transactions have expired. Select those you wish to "
"delete."
@@ -6448,7 +6509,7 @@
"Die folgenden terminierten Buchungen sind abgelaufen. Bitte wählen Sie jene, "
"die Sie löschen möchten."
-#: ../src/gnome/glade/sched-xact.glade.h:176
+#: ../src/gnome/glade/sched-xact.glade.h:201
msgid ""
"The listed Scheduled Transactions are to-be created soon. Select any which "
"you would like to create now, and click \"Forward\" to create them."
@@ -6457,7 +6518,7 @@
"Wählen Sie jene, die jetzt erstellt werden sollen, und klicken Sie »Vor«, um "
"Sie jetzt erstellen zu lassen."
-#: ../src/gnome/glade/sched-xact.glade.h:177
+#: ../src/gnome/glade/sched-xact.glade.h:202
msgid ""
"This druid will walk you through any scheduled transactions that should be "
"created."
@@ -6465,7 +6526,7 @@
"Dieser Assistent führt Sie schrittweise durch die Erstellung neuer "
"terminierter Buchungen."
-#: ../src/gnome/glade/sched-xact.glade.h:178
+#: ../src/gnome/glade/sched-xact.glade.h:203
msgid ""
"This is a step-by-step method of creating a loan repayment setup within "
"GnuCash. In this Druid, you can input the parameters of your loan and its "
@@ -6483,136 +6544,133 @@
"Wenn Sie einen Irrtum machen oder später Änderungen machen möchten, können "
"Sie die erstellte Terminierte Buchung direkt ändern."
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:181 ../intl-scm/guile-strings.c:2816
+#: ../src/gnome/glade/sched-xact.glade.h:206 ../intl-scm/guile-strings.c:4154
+#: ../intl-scm/guile-strings.c:5304
msgid "Thursday"
msgstr "Donnerstag"
-#: ../src/gnome/glade/sched-xact.glade.h:182
+#: ../src/gnome/glade/sched-xact.glade.h:207
msgid "To-Create Transaction Preparation"
msgstr "Vorbereitung der zu erstellenden Buchungen"
-#: ../src/gnome/glade/sched-xact.glade.h:183
+#: ../src/gnome/glade/sched-xact.glade.h:208
msgid "Transaction Reminders"
msgstr "Buchungserinnerungen"
-#: ../src/gnome/glade/sched-xact.glade.h:184
+#: ../src/gnome/glade/sched-xact.glade.h:209
msgid "Tri-Yearly"
msgstr "Dreimal pro Jahr"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:185 ../intl-scm/guile-strings.c:2812
+#: ../src/gnome/glade/sched-xact.glade.h:210 ../intl-scm/guile-strings.c:4150
+#: ../intl-scm/guile-strings.c:5300
msgid "Tuesday"
msgstr "Dienstag"
-#: ../src/gnome/glade/sched-xact.glade.h:187
+#: ../src/gnome/glade/sched-xact.glade.h:212
msgid "Unselect All"
msgstr "Keine auswählen"
-#: ../src/gnome/glade/sched-xact.glade.h:188
+#: ../src/gnome/glade/sched-xact.glade.h:213
msgid "Until:"
msgstr "Bis:"
-#: ../src/gnome/glade/sched-xact.glade.h:189
+#: ../src/gnome/glade/sched-xact.glade.h:214
msgid "Use Escrow Account"
msgstr "Treuhandkonto benutzen"
-#: ../src/gnome/glade/sched-xact.glade.h:191
+#: ../src/gnome/glade/sched-xact.glade.h:216
msgid "Value:"
msgstr "Wert:"
-#: ../src/gnome/glade/sched-xact.glade.h:192
+#: ../src/gnome/glade/sched-xact.glade.h:217
msgid "Variable"
msgstr "Variable"
-#: ../src/gnome/glade/sched-xact.glade.h:193
+#: ../src/gnome/glade/sched-xact.glade.h:218
msgid "Variables"
msgstr "Variablen"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../src/gnome/glade/sched-xact.glade.h:194 ../intl-scm/guile-strings.c:2814
+#: ../src/gnome/glade/sched-xact.glade.h:219 ../intl-scm/guile-strings.c:4152
+#: ../intl-scm/guile-strings.c:5302
msgid "Wednesday"
msgstr "Mittwoch"
-#: ../src/gnome/glade/sched-xact.glade.h:196
+#: ../src/gnome/glade/sched-xact.glade.h:221
msgid "What to do, what to do?"
msgstr "Was ist zu tun?"
-#: ../src/gnome/glade/sched-xact.glade.h:197
-msgid "Whole Loan"
-msgstr "Vollständiges Darlehen"
-
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome/glade/sched-xact.glade.h:198 ../intl-scm/guile-strings.c:2396
-#: ../intl-scm/guile-strings.c:2398
+#: ../src/gnome/glade/sched-xact.glade.h:222 ../intl-scm/guile-strings.c:3730
+#: ../intl-scm/guile-strings.c:3732 ../intl-scm/guile-strings.c:4880
+#: ../intl-scm/guile-strings.c:4882
msgid "Yearly"
msgstr "Jährlich"
-#: ../src/gnome/glade/sched-xact.glade.h:199
-msgid "[29th/last]"
-msgstr "(29./Monatsende)"
-
-#: ../src/gnome/glade/sched-xact.glade.h:200
-msgid "[30th/last]"
-msgstr "(30./Monatsende)"
-
-#: ../src/gnome/glade/sched-xact.glade.h:201
-msgid "[31st/last]"
-msgstr "(31./Monatsende)"
-
-#: ../src/gnome/glade/sched-xact.glade.h:202
+#: ../src/gnome/glade/sched-xact.glade.h:223
msgid "_Auto-create new transactions"
msgstr "Neue Buchungen _automatisch erstellen"
-#: ../src/gnome/glade/sched-xact.glade.h:204
+#: ../src/gnome/glade/sched-xact.glade.h:224
msgid "_Notify before transactions are created "
msgstr "Be_nachrichtigen, bevor neue Buchungen erstellt werden"
-#: ../src/gnome/glade/sched-xact.glade.h:205
+#: ../src/gnome/glade/sched-xact.glade.h:225
+#, fuzzy
+msgid "_Review created transactions"
+msgstr "Bestätigte Buchungen automatisch abgleichen"
+
+#: ../src/gnome/glade/sched-xact.glade.h:226
msgid "_Run when data file opened"
msgstr "Seit-Letztem-Aufruf Fenster starten, wenn eine _Datei geöffnet wird"
-#: ../src/gnome/glade/sched-xact.glade.h:206
-#: ../src/gnome-utils/glade/preferences.glade.h:144
+#: ../src/gnome/glade/sched-xact.glade.h:227
+#: ../src/gnome-utils/glade/preferences.glade.h:156
msgid "days"
msgstr "Tage"
-#: ../src/gnome/glade/sched-xact.glade.h:207
+#: ../src/gnome/glade/sched-xact.glade.h:228
msgid "days."
msgstr "Tage."
-#: ../src/gnome/glade/sched-xact.glade.h:208
-msgid "months"
-msgstr "Monate"
+#: ../src/gnome/glade/sched-xact.glade.h:229
+msgid ""
+"months\n"
+"years"
+msgstr ""
+"Monate\n"
+"Jahre"
-#: ../src/gnome/glade/sched-xact.glade.h:209
+#: ../src/gnome/glade/sched-xact.glade.h:231
msgid "months."
msgstr "Monate."
-#: ../src/gnome/glade/sched-xact.glade.h:210
+#: ../src/gnome/glade/sched-xact.glade.h:232
msgid "occurrences"
msgstr "Auftreten"
-#: ../src/gnome/glade/sched-xact.glade.h:211
+#: ../src/gnome/glade/sched-xact.glade.h:233
msgid "remaining"
msgstr "verbleibende"
-#: ../src/gnome/glade/sched-xact.glade.h:212
+#: ../src/gnome/glade/sched-xact.glade.h:234
msgid "then on the:"
msgstr "dann am:"
-#: ../src/gnome/glade/sched-xact.glade.h:213
+#: ../src/gnome/glade/sched-xact.glade.h:235
msgid "weeks."
msgstr "Wochen."
-#: ../src/gnome/glade/sched-xact.glade.h:214
+#: ../src/gnome/glade/sched-xact.glade.h:236
msgid "year(s)."
msgstr "Jahre."
-#: ../src/gnome/glade/sched-xact.glade.h:215
-msgid "years"
-msgstr "Jahre"
-
#: ../src/gnome/glade/stocks.glade.h:1
msgid "<b>A_sset Account</b>"
msgstr "<b>_Aktiva Konto</b>"
@@ -6621,19 +6679,19 @@
msgid "<b>_Income Account</b>"
msgstr "<b>_Ertragskonto</b>"
-#: ../src/gnome/glade/stocks.glade.h:4
+#: ../src/gnome/glade/stocks.glade.h:3
msgid "Cash In Lieu"
msgstr "Ausgleichsbetrag"
-#: ../src/gnome/glade/stocks.glade.h:5
+#: ../src/gnome/glade/stocks.glade.h:4
msgid "Currenc_y:"
msgstr "_Währung:"
-#: ../src/gnome/glade/stocks.glade.h:6
+#: ../src/gnome/glade/stocks.glade.h:5
msgid "Desc_ription:"
msgstr "_Beschreibung:"
-#: ../src/gnome/glade/stocks.glade.h:7
+#: ../src/gnome/glade/stocks.glade.h:6
msgid ""
"Enter the date and the number of shares you gained or lost from the stock "
"split or merger. For stock mergers (negative splits) use a negative value "
@@ -6645,7 +6703,7 @@
"Sie eine negative Zahl ein. Sie können auch eine Beschreibung des "
"Buchungssatzes eingeben."
-#: ../src/gnome/glade/stocks.glade.h:8
+#: ../src/gnome/glade/stocks.glade.h:7
msgid ""
"If you are finished creating the stock split or merger, press `Apply'. You "
"may also press `Back' to review your choices, or `Cancel' to quit without "
@@ -6656,7 +6714,7 @@
"oder »Abbrechen«, um diesen Dialog zu beenden, ohne die Änderungen zu "
"speichern."
-#: ../src/gnome/glade/stocks.glade.h:9
+#: ../src/gnome/glade/stocks.glade.h:8
msgid ""
"If you received a cash disbursement as a result of the stock split, enter "
"the details of that payment here. Otherwise, just click `Forward'."
@@ -6665,7 +6723,7 @@
"erhalten haben, geben Sie diese Zahlung hier ein. Wenn Sie keinen "
"Ausgleichsbetrag erhalten haben, klicken Sie »Vor«."
-#: ../src/gnome/glade/stocks.glade.h:10
+#: ../src/gnome/glade/stocks.glade.h:9
msgid ""
"If you want to record a stock price for the split, enter it below. You may "
"safely leave it blank."
@@ -6673,47 +6731,39 @@
"Wenn Sie einen Aktienkurs für die Buchung eingeben wollen, geben Sie den "
"Kurs unten an. Sie können das Kurseingabefeld auch leer lassen."
-#: ../src/gnome/glade/stocks.glade.h:11
+#: ../src/gnome/glade/stocks.glade.h:10
msgid "New _Price:"
msgstr "Neuer _Preis:"
-#: ../src/gnome/glade/stocks.glade.h:12
+#: ../src/gnome/glade/stocks.glade.h:11
msgid ""
"Select the account for which you want to record a stock split or merger."
msgstr "Wählen Sie das Konto, für das Sie eine Aktienteilung eingeben möchten."
-#: ../src/gnome/glade/stocks.glade.h:14
+#: ../src/gnome/glade/stocks.glade.h:12
msgid "Stock Account"
msgstr "Aktiendepot"
-#: ../src/gnome/glade/stocks.glade.h:15
+#: ../src/gnome/glade/stocks.glade.h:13
msgid "Stock Split"
msgstr "Aktienteilung"
-#: ../src/gnome/glade/stocks.glade.h:16
+#: ../src/gnome/glade/stocks.glade.h:14
msgid "Stock Split Details"
msgstr "Aktienteilung Details"
-#. src/report/standard-reports/portfolio.scm
-#. src/report/standard-reports/advanced-portfolio.scm
-#: ../src/gnome/glade/stocks.glade.h:17
-#: ../src/gnome-utils/gnc-tree-view-commodity.c:399
-#: ../intl-scm/guile-strings.c:1732 ../intl-scm/guile-strings.c:2032
-msgid "Symbol"
-msgstr "Symbol"
-
-#: ../src/gnome/glade/stocks.glade.h:18
+#: ../src/gnome/glade/stocks.glade.h:15
msgid "This druid will help you record a stock split or stock merger."
msgstr ""
"Dieser Assistent hilft Ihnen, eine Aktienteilung oder einen "
"Aktienzusammenschluß einzugeben."
-#: ../src/gnome/glade/stocks.glade.h:19
+#: ../src/gnome/glade/stocks.glade.h:16
#: ../src/gnome-utils/glade/exchange-dialog.glade.h:4
msgid "_Amount:"
msgstr "_Betrag:"
-#: ../src/gnome/glade/stocks.glade.h:22
+#: ../src/gnome/glade/stocks.glade.h:19
msgid "_Shares:"
msgstr "_Anteile:"
@@ -6794,154 +6844,159 @@
msgstr "Neue Konto-Hierarchie Ansicht öffnen"
#. File menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:103
+#: ../src/gnome/gnc-plugin-basic-commands.c:96
msgid "New _File"
msgstr "Neue _Datei"
-#: ../src/gnome/gnc-plugin-basic-commands.c:104
+#: ../src/gnome/gnc-plugin-basic-commands.c:97
msgid "Create a new file"
msgstr "Eine neue Datei anlegen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:106
+#: ../src/gnome/gnc-plugin-basic-commands.c:99
msgid "_Open..."
msgstr "Ö_ffnen..."
-#: ../src/gnome/gnc-plugin-basic-commands.c:107
+#: ../src/gnome/gnc-plugin-basic-commands.c:100
msgid "Open an existing GnuCash file"
msgstr "Eine existierende GnuCash-Datei öffnen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:109
+#: ../src/gnome/gnc-plugin-basic-commands.c:102
msgid "_Save"
msgstr "_Speichern"
-#: ../src/gnome/gnc-plugin-basic-commands.c:110
+#: ../src/gnome/gnc-plugin-basic-commands.c:103
msgid "Save the current file"
msgstr "Aktuelle Datei speichern"
-#: ../src/gnome/gnc-plugin-basic-commands.c:112
+#: ../src/gnome/gnc-plugin-basic-commands.c:105
msgid "Save _As..."
msgstr "Speichern _unter..."
-#: ../src/gnome/gnc-plugin-basic-commands.c:117
+#: ../src/gnome/gnc-plugin-basic-commands.c:109
msgid "_QSF Import"
msgstr "_QSF-Import"
-#: ../src/gnome/gnc-plugin-basic-commands.c:118
+#: ../src/gnome/gnc-plugin-basic-commands.c:110
msgid "Import a QSF object file"
msgstr "QSF-Datei importieren"
-#: ../src/gnome/gnc-plugin-basic-commands.c:122
+#: ../src/gnome/gnc-plugin-basic-commands.c:113
msgid "Export _Accounts"
msgstr "_Konten exportieren"
-#: ../src/gnome/gnc-plugin-basic-commands.c:123
+#: ../src/gnome/gnc-plugin-basic-commands.c:114
msgid "Export the account hierarchy to a new GnuCash datafile"
msgstr "Die Konten-Hierarchie in eine neue GnuCash-Datei exportieren"
-#: ../src/gnome/gnc-plugin-basic-commands.c:127
+#: ../src/gnome/gnc-plugin-basic-commands.c:117
msgid "Export _Chart of Accounts to QSF"
msgstr "Kontenhierarchie nach _QSF XML exportieren"
-#: ../src/gnome/gnc-plugin-basic-commands.c:128
+#: ../src/gnome/gnc-plugin-basic-commands.c:118
msgid "Export the chart of accounts for a date with balances as QSF"
msgstr "Kontenhierarchie mit Salden eines bestimmten Tages als QSF exportieren"
#. Edit menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:134
+#: ../src/gnome/gnc-plugin-basic-commands.c:123
msgid "_Find..."
msgstr "_Suchen..."
-#: ../src/gnome/gnc-plugin-basic-commands.c:135
+#: ../src/gnome/gnc-plugin-basic-commands.c:124
msgid "Find transactions with a search"
msgstr "Finde Buchungssätze"
-#: ../src/gnome/gnc-plugin-basic-commands.c:137
+#: ../src/gnome/gnc-plugin-basic-commands.c:126
msgid "Ta_x Options"
msgstr "Steuer_relevante Optionen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:138
+#: ../src/gnome/gnc-plugin-basic-commands.c:127
msgid "Setup tax information for all income and expense accounts"
msgstr ""
"Steuerrelevante Informationen für Ertrags- und Aufwandskonten einrichten"
#. Actions menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:143
+#: ../src/gnome/gnc-plugin-basic-commands.c:132
msgid "_Scheduled Transactions"
msgstr "_Terminierte Buchungen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:144
+#: ../src/gnome/gnc-plugin-basic-commands.c:133
msgid "_Scheduled Transaction Editor"
msgstr "Terminierte Buchungen Editor"
-#: ../src/gnome/gnc-plugin-basic-commands.c:145
+#: ../src/gnome/gnc-plugin-basic-commands.c:134
msgid "The list of Scheduled Transactions"
msgstr "Die Liste der terminierten Buchungen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:147
-msgid "_Since Last Run..."
-msgstr "Seit letztem Aufruf..."
+#: ../src/gnome/gnc-plugin-basic-commands.c:136
+msgid "Since _Last Run..."
+msgstr "Seit _letztem Aufruf..."
-#: ../src/gnome/gnc-plugin-basic-commands.c:148
+#: ../src/gnome/gnc-plugin-basic-commands.c:137
msgid "Create Scheduled Transactions since the last time run"
msgstr ""
"Alle terminierten Buchungen seit dem letzten Aufruf von GnuCash erstellen."
-#: ../src/gnome/gnc-plugin-basic-commands.c:150
+#: ../src/gnome/gnc-plugin-basic-commands.c:139
msgid "_Mortgage & Loan Repayment..."
-msgstr "_Hypothek & Darlehen Druide..."
+msgstr "_Hypothek & Darlehen Assistent..."
-#: ../src/gnome/gnc-plugin-basic-commands.c:151
+#: ../src/gnome/gnc-plugin-basic-commands.c:140
msgid "Setup scheduled transactions for repayment of a loan"
msgstr "Terminierte Buchungen einrichten, die ein Darlehen tilgen sollen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:154
+#: ../src/gnome/gnc-plugin-basic-commands.c:142
msgid "Close _Books"
msgstr "_Buchabschluß"
-#: ../src/gnome/gnc-plugin-basic-commands.c:155
+#: ../src/gnome/gnc-plugin-basic-commands.c:143
msgid "Archive old data using accounting periods"
msgstr "Alte Daten abschließen und in vorigen Buchführungsperioden speichern."
#. Tools menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:161
+#: ../src/gnome/gnc-plugin-basic-commands.c:148
msgid "_Price Editor"
msgstr "_Preis-Editor"
-#: ../src/gnome/gnc-plugin-basic-commands.c:162
+#: ../src/gnome/gnc-plugin-basic-commands.c:149
msgid "View and edit the prices for stocks and mutual funds"
msgstr "Preise für Währungen/Wertpapiere anzeigen und bearbeiten"
-#: ../src/gnome/gnc-plugin-basic-commands.c:164
+#: ../src/gnome/gnc-plugin-basic-commands.c:151
msgid "_Security Editor"
msgstr "_Aktien-Editor"
-#: ../src/gnome/gnc-plugin-basic-commands.c:165
+#: ../src/gnome/gnc-plugin-basic-commands.c:152
msgid "View and edit the commodities for stocks and mutual funds"
msgstr ""
"Wertpapiere für Aktienkonten und Investmentfonds anzeigen und bearbeiten"
-#: ../src/gnome/gnc-plugin-basic-commands.c:167
+#: ../src/gnome/gnc-plugin-basic-commands.c:154
msgid "_Financial Calculator"
msgstr "_Finanzrechner"
-#: ../src/gnome/gnc-plugin-basic-commands.c:168
+#: ../src/gnome/gnc-plugin-basic-commands.c:155
msgid "Use the financial calculator"
msgstr "Den Finanzrechner benutzen"
#. Help menu
-#: ../src/gnome/gnc-plugin-basic-commands.c:173
+#: ../src/gnome/gnc-plugin-basic-commands.c:160
msgid "_Tips Of The Day"
msgstr "_Tipp des Tages"
-#: ../src/gnome/gnc-plugin-basic-commands.c:174
+#: ../src/gnome/gnc-plugin-basic-commands.c:161
msgid "View the Tips of the Day"
msgstr "Anzeigen des »Tipp des Tages?«"
-#: ../src/gnome/gnc-plugin-basic-commands.c:392
+#: ../src/gnome/gnc-plugin-basic-commands.c:372
+#, c-format
+msgid "Error: Loading failed, error code %d - %s."
+msgstr ""
+
+#: ../src/gnome/gnc-plugin-basic-commands.c:394
msgid "Select the QSF file to import into GnuCash"
msgstr "Zu ladende QIF-Datei auswählen"
-#: ../src/gnome/gnc-plugin-basic-commands.c:447
+#: ../src/gnome/gnc-plugin-basic-commands.c:449
msgid "There are no Scheduled Transactions to be entered at this time."
msgstr "Es gibt keine terminierten Buchungen, die gebucht werden sollten."
@@ -6979,33 +7034,33 @@
#. File menu
#: ../src/gnome/gnc-plugin-page-account-tree.c:153
-#: ../src/gnome/gnc-plugin-page-budget.c:131
+#: ../src/gnome/gnc-plugin-page-budget.c:127
msgid "Open _Account"
msgstr "_Konto öffnen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:154
-#: ../src/gnome/gnc-plugin-page-budget.c:132
+#: ../src/gnome/gnc-plugin-page-budget.c:128
msgid "Open the selected account"
msgstr "Gewähltes Konto öffnen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:156
-#: ../src/gnome/gnc-plugin-page-budget.c:135
+#: ../src/gnome/gnc-plugin-page-budget.c:131
msgid "Open _Subaccounts"
msgstr "_Unterkonten öffnen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:157
-#: ../src/gnome/gnc-plugin-page-budget.c:136
+#: ../src/gnome/gnc-plugin-page-budget.c:132
msgid "Open the selected account and all its subaccounts"
msgstr "Öffne das gewählte Konto und alle Unterkonten"
#. Edit menu
#: ../src/gnome/gnc-plugin-page-account-tree.c:161
-#: ../src/gnome-utils/gnc-icons.c:18 ../src/gnome/window-reconcile.c:2009
-msgid "_Edit Account"
+#: ../src/gnome/gnc-plugin-page-register.c:179
+msgid "Edit _Account"
msgstr "Konto _bearbeiten"
#: ../src/gnome/gnc-plugin-page-account-tree.c:162
-#: ../src/gnome/gnc-plugin-page-register.c:183
+#: ../src/gnome/gnc-plugin-page-register.c:180
msgid "Edit the selected account"
msgstr "Ausgewähltes Konto bearbeiten"
@@ -7027,43 +7082,43 @@
#. View menu
#: ../src/gnome/gnc-plugin-page-account-tree.c:172
-#: ../src/gnome/gnc-plugin-page-budget.c:152
-#: ../src/gnome/gnc-plugin-page-register.c:223
-#: ../src/gnome-utils/gnc-main-window.c:259
+#: ../src/gnome/gnc-plugin-page-budget.c:148
+#: ../src/gnome/gnc-plugin-page-register.c:220
+#: ../src/gnome-utils/gnc-main-window.c:263
msgid "_Filter By..."
msgstr "_Filtern nach..."
#. Actions menu
#: ../src/gnome/gnc-plugin-page-account-tree.c:176
-#: ../src/gnome/gnc-plugin-page-register.c:231
+#: ../src/gnome/gnc-plugin-page-register.c:228
msgid "_Reconcile..."
msgstr "Ab_gleichen..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:177
-#: ../src/gnome/gnc-plugin-page-register.c:232
+#: ../src/gnome/gnc-plugin-page-register.c:229
msgid "Reconcile the selected account"
msgstr "Gewähltes Konto abgleichen"
#. Actions menu
#: ../src/gnome/gnc-plugin-page-account-tree.c:179
-#: ../src/gnome/gnc-plugin-page-register.c:228
-#: ../src/gnome-utils/gnc-icons.c:21 ../src/gnome/window-reconcile.c:2012
+#: ../src/gnome/gnc-plugin-page-register.c:225
+#: ../src/gnome-utils/gnc-icons.c:21 ../src/gnome/window-reconcile.c:2014
msgid "_Transfer..."
msgstr "_Buchen..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:180
-#: ../src/gnome/gnc-plugin-page-register.c:229
-#: ../src/gnome/window-reconcile.c:2013
+#: ../src/gnome/gnc-plugin-page-register.c:226
+#: ../src/gnome/window-reconcile.c:2015
msgid "Transfer funds from one account to another"
msgstr "Beträge von einem Konto zu einem anderen umbuchen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:182
-#: ../src/gnome/gnc-plugin-page-register.c:234
+#: ../src/gnome/gnc-plugin-page-register.c:231
msgid "Stoc_k Split..."
msgstr "A_ktienteilung..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:183
-#: ../src/gnome/gnc-plugin-page-register.c:235
+#: ../src/gnome/gnc-plugin-page-register.c:232
msgid "Record a stock split or a stock merger"
msgstr "Buchen einer Aktienteilung oder eines Aktienzusammenschlusses"
@@ -7072,7 +7127,7 @@
msgstr "_Posten anzeigen..."
#: ../src/gnome/gnc-plugin-page-account-tree.c:186
-#: ../src/gnome/gnc-plugin-page-register.c:238
+#: ../src/gnome/gnc-plugin-page-register.c:235
msgid "Bring up the lot viewer/editor window"
msgstr "Den Editor für die Posten dieses Kontos öffnen"
@@ -7081,7 +7136,7 @@
msgstr "_Konto überprüfen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:189
-#: ../src/gnome/window-reconcile.c:2016
+#: ../src/gnome/window-reconcile.c:2018
msgid ""
"Check for and repair unbalanced transactions and orphan splits in this "
"account"
@@ -7089,7 +7144,7 @@
"Überprüfen und Reparieren von unvollständigen Buchungssätzen in diesem Konto"
#: ../src/gnome/gnc-plugin-page-account-tree.c:191
-msgid "Check & Repair Su_baccount"
+msgid "Check & Repair Su_baccounts"
msgstr "_Unterkonten überprüfen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:192
@@ -7112,13 +7167,14 @@
"Überprüfen und Reparieren von unvollständigen Buchungssätzen in allen Konten"
#: ../src/gnome/gnc-plugin-page-account-tree.c:218
-#: ../src/gnome/gnc-plugin-page-budget.c:168 ../src/gnome/lot-viewer.c:436
-#: ../src/gnome-utils/gnc-file.c:97 ../src/gnome-utils/gnc-file.c:839
+#: ../src/gnome/gnc-plugin-page-budget.c:164 ../src/gnome/lot-viewer.c:434
+#: ../src/gnome-utils/gnc-file.c:95 ../src/gnome-utils/gnc-file.c:841
#: ../src/gnome/window-reconcile.c:1564
msgid "Open"
msgstr "Öffnen"
#: ../src/gnome/gnc-plugin-page-account-tree.c:220
+#: ../src/gnome/gnc-plugin-page-sx-list.c:116
msgid "New"
msgstr "Neu"
@@ -7126,289 +7182,299 @@
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/category-barchart.scm
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
#: ../src/gnome/gnc-plugin-page-account-tree.c:309
-#: ../src/gnome-utils/glade/preferences.glade.h:31
-#: ../intl-scm/guile-strings.c:822 ../intl-scm/guile-strings.c:1214
-#: ../intl-scm/guile-strings.c:1676 ../intl-scm/guile-strings.c:1724
-#: ../intl-scm/guile-strings.c:2022 ../intl-scm/guile-strings.c:2702
-#: ../intl-scm/guile-strings.c:2750 ../intl-scm/guile-strings.c:2782
-#: ../intl-scm/guile-strings.c:2856
+#: ../src/gnome-utils/glade/preferences.glade.h:33
+#: ../intl-scm/guile-strings.c:1334 ../intl-scm/guile-strings.c:1926
+#: ../intl-scm/guile-strings.c:2386 ../intl-scm/guile-strings.c:2434
+#: ../intl-scm/guile-strings.c:2550 ../intl-scm/guile-strings.c:3010
+#: ../intl-scm/guile-strings.c:3058 ../intl-scm/guile-strings.c:3356
+#: ../intl-scm/guile-strings.c:4040 ../intl-scm/guile-strings.c:4088
+#: ../intl-scm/guile-strings.c:4120 ../intl-scm/guile-strings.c:4194
+#: ../intl-scm/guile-strings.c:4506 ../intl-scm/guile-strings.c:5190
+#: ../intl-scm/guile-strings.c:5238 ../intl-scm/guile-strings.c:5270
+#: ../intl-scm/guile-strings.c:5344
msgid "Accounts"
msgstr "Konten"
-#: ../src/gnome/gnc-plugin-page-account-tree.c:917
+#: ../src/gnome/gnc-plugin-page-account-tree.c:867
msgid "(no name)"
msgstr "(unbenannt)"
-#: ../src/gnome/gnc-plugin-page-account-tree.c:939
+#: ../src/gnome/gnc-plugin-page-account-tree.c:889
#, c-format
msgid "Deleting account %s"
msgstr "Konto %s löschen"
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1031
+#: ../src/gnome/gnc-plugin-page-account-tree.c:981
#, c-format
msgid "The account %s will be deleted."
msgstr "Das Konto %s wird gelöscht."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1041
+#: ../src/gnome/gnc-plugin-page-account-tree.c:991
#, c-format
msgid "All transactions in this account will be moved to the account %s."
msgstr "Alle Buchungen in diesem Konto werden in das Konto %s verschoben."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1045
+#: ../src/gnome/gnc-plugin-page-account-tree.c:995
msgid "All transactions in this account will be deleted."
msgstr "Alle Buchungen in diesem Konto werden gelöscht."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1052
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1002
#, c-format
msgid "All of its sub-accounts will be moved to the account %s."
msgstr "Alle Unterkonten werden zum Konto %s verschoben."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1056
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1006
msgid "All of its subaccounts will be deleted."
msgstr "Alle Unterkonten werden ebenfalls gelöscht."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1060
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1010
#, c-format
msgid "All sub-account transactions will be moved to the account %s."
msgstr "Alle Buchungen in Unterkonten werden in das Konto %s verschoben."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1064
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1014
msgid "All sub-account transactions will be deleted."
msgstr "Alle Buchungen in Unterkonten werden ebenfalls gelöscht."
-#: ../src/gnome/gnc-plugin-page-account-tree.c:1069
+#: ../src/gnome/gnc-plugin-page-account-tree.c:1019
msgid "Are you sure you want to do this?"
msgstr "Soll diese Aktion durchgeführt werden?"
#. Edit menu
-#: ../src/gnome/gnc-plugin-page-budget.c:140
+#: ../src/gnome/gnc-plugin-page-budget.c:136
msgid "_Delete Budget"
msgstr "Budget _löschen"
-#: ../src/gnome/gnc-plugin-page-budget.c:141
+#: ../src/gnome/gnc-plugin-page-budget.c:137
msgid "Delete this budget"
msgstr "Dieses Budget löschen"
-#: ../src/gnome/gnc-plugin-page-budget.c:144
+#: ../src/gnome/gnc-plugin-page-budget.c:140
msgid "Edit this budget's options"
msgstr "Budget-Optionen ändern"
-#: ../src/gnome/gnc-plugin-page-budget.c:146
+#: ../src/gnome/gnc-plugin-page-budget.c:142
msgid "Estimate Budget"
msgstr "Budget abschätzen"
-#: ../src/gnome/gnc-plugin-page-budget.c:148
+#: ../src/gnome/gnc-plugin-page-budget.c:144
msgid ""
"Estimate a budget value for the selected accounts from past transactions"
msgstr ""
"Die Budgetwerte für die gewählten Konten abschätzen, basierenden auf den "
"früheren Buchungen"
-#: ../src/gnome/gnc-plugin-page-budget.c:171
+#: ../src/gnome/gnc-plugin-page-budget.c:167
msgid "Estimate"
msgstr "Abschätzen"
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../src/gnome/gnc-plugin-page-budget.c:279 ../intl-scm/guile-strings.c:2678
-#: ../intl-scm/guile-strings.c:2680
+#: ../src/gnome/gnc-plugin-page-budget.c:275 ../intl-scm/guile-strings.c:4012
+#: ../intl-scm/guile-strings.c:4014 ../intl-scm/guile-strings.c:5162
+#: ../intl-scm/guile-strings.c:5164
msgid "Budget"
msgstr "Budget"
-#: ../src/gnome/gnc-plugin-page-budget.c:774
+#: ../src/gnome/gnc-plugin-page-budget.c:770
msgid "Set the budget options using this dialog."
msgstr "Mit diesem Dialog können Sie die Budgetoptionen bearbeiten."
-#: ../src/gnome/gnc-plugin-page-budget.c:853
+#: ../src/gnome/gnc-plugin-page-budget.c:849
#, c-format
msgid "Delete %s?"
msgstr "»%s« löschen?"
-#: ../src/gnome/gnc-plugin-page-budget.c:917
+#: ../src/gnome/gnc-plugin-page-budget.c:913
msgid "You must select at least one account to estimate."
msgstr "Sie müssen mindestens ein Konto auswählen, das geschätzt werden soll."
#. File menu
-#: ../src/gnome/gnc-plugin-page-register.c:168
+#: ../src/gnome/gnc-plugin-page-register.c:165
msgid "_Print Check..."
-msgstr "_Scheck drucken..."
+msgstr "Schec_k drucken..."
#. Edit menu
-#: ../src/gnome/gnc-plugin-page-register.c:173
-#: ../src/gnome-utils/gnc-main-window.c:242
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:935
+#: ../src/gnome/gnc-plugin-page-register.c:170
+#: ../src/gnome-utils/gnc-main-window.c:246
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:945
msgid "Cu_t"
msgstr "_Ausschneiden"
-#: ../src/gnome/gnc-plugin-page-register.c:174
-#: ../src/gnome-utils/gnc-main-window.c:243
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:936
+#: ../src/gnome/gnc-plugin-page-register.c:171
+#: ../src/gnome-utils/gnc-main-window.c:247
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:946
msgid "Cut the current selection and copy it to clipboard"
msgstr "Auswahl ausschneiden und in die Zwischenablage kopieren"
-#: ../src/gnome/gnc-plugin-page-register.c:176
-#: ../src/gnome-utils/gnc-main-window.c:245
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:938
+#: ../src/gnome/gnc-plugin-page-register.c:173
+#: ../src/gnome-utils/gnc-main-window.c:249
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:948
msgid "_Copy"
msgstr "_Kopieren"
-#: ../src/gnome/gnc-plugin-page-register.c:177
-#: ../src/gnome-utils/gnc-main-window.c:246
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:939
+#: ../src/gnome/gnc-plugin-page-register.c:174
+#: ../src/gnome-utils/gnc-main-window.c:250
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:949
msgid "Copy the current selection to clipboard"
msgstr "Auswahl in die Zwischenablage kopieren"
-#: ../src/gnome/gnc-plugin-page-register.c:180
-#: ../src/gnome-utils/gnc-main-window.c:249
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:942
+#: ../src/gnome/gnc-plugin-page-register.c:177
+#: ../src/gnome-utils/gnc-main-window.c:253
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:952
msgid "Paste the clipboard content at the cursor position"
msgstr "Zwischenablage an Cursor-Position einfügen"
-#: ../src/gnome/gnc-plugin-page-register.c:182
-#: ../src/gnome-utils/dialog-account.c:1387
-msgid "Edit Account"
-msgstr "Konto bearbeiten"
-
#. Transaction menu
-#: ../src/gnome/gnc-plugin-page-register.c:188
+#: ../src/gnome/gnc-plugin-page-register.c:185
msgid "Cu_t Transaction"
msgstr "Buchung auss_chneiden"
-#: ../src/gnome/gnc-plugin-page-register.c:189
+#: ../src/gnome/gnc-plugin-page-register.c:186
msgid "Cut the selected transaction into clipboard"
msgstr "Buchung ausschneiden und in die Zwischenablage kopieren"
-#: ../src/gnome/gnc-plugin-page-register.c:191
+#: ../src/gnome/gnc-plugin-page-register.c:188
msgid "_Copy Transaction"
msgstr "Buchung _kopieren"
-#: ../src/gnome/gnc-plugin-page-register.c:192
+#: ../src/gnome/gnc-plugin-page-register.c:189
msgid "Copy the selected transaction into clipboard"
msgstr "Buchung in die Zwischenablage kopieren"
-#: ../src/gnome/gnc-plugin-page-register.c:194
+#: ../src/gnome/gnc-plugin-page-register.c:191
msgid "_Paste Transaction"
msgstr "Buchung _einfügen"
-#: ../src/gnome/gnc-plugin-page-register.c:197
+#: ../src/gnome/gnc-plugin-page-register.c:194
msgid "Dup_licate Transaction"
msgstr "Buchung dupli_zieren"
-#: ../src/gnome/gnc-plugin-page-register.c:200
+#: ../src/gnome/gnc-plugin-page-register.c:197
#: ../src/gnome/gnc-split-reg.c:1164
msgid "_Delete Transaction"
msgstr "_Buchung löschen"
-#: ../src/gnome/gnc-plugin-page-register.c:203
+#: ../src/gnome/gnc-plugin-page-register.c:200
msgid "Remo_ve Transaction Splits"
msgstr "Buchungsteile entfernen"
-#: ../src/gnome/gnc-plugin-page-register.c:204
+#: ../src/gnome/gnc-plugin-page-register.c:201
msgid "Remove all splits in the current transaction"
msgstr "Alle Buchungsteile im aktuellen Buchungssatz entfernen"
-#: ../src/gnome/gnc-plugin-page-register.c:206
+#: ../src/gnome/gnc-plugin-page-register.c:203
msgid "_Enter Transaction"
msgstr "Buchung eingeben"
-#: ../src/gnome/gnc-plugin-page-register.c:209
+#: ../src/gnome/gnc-plugin-page-register.c:206
msgid "Ca_ncel Transaction"
msgstr "Buchung _abbrechen"
-#: ../src/gnome/gnc-plugin-page-register.c:212
+#: ../src/gnome/gnc-plugin-page-register.c:209
msgid "_Void Transaction"
msgstr "Buchung _ungültig machen"
-#: ../src/gnome/gnc-plugin-page-register.c:214
+#: ../src/gnome/gnc-plugin-page-register.c:211
msgid "_Unvoid Transaction"
msgstr "Ungültige Buchung wieder_herstellen"
-#: ../src/gnome/gnc-plugin-page-register.c:216
+#: ../src/gnome/gnc-plugin-page-register.c:213
msgid "Add _Reversing Transaction"
msgstr "Stornierungsbuchung _hinzufügen"
#. View menu
-#: ../src/gnome/gnc-plugin-page-register.c:221
-#: ../src/gnome-utils/gnc-main-window.c:257
+#: ../src/gnome/gnc-plugin-page-register.c:218
+#: ../src/gnome-utils/gnc-main-window.c:261
msgid "_Sort By..."
msgstr "_Sortieren nach..."
-#: ../src/gnome/gnc-plugin-page-register.c:237
+#: ../src/gnome/gnc-plugin-page-register.c:234
msgid "_Lot Viewer..."
msgstr "_Posten anzeigen..."
-#: ../src/gnome/gnc-plugin-page-register.c:240
+#: ../src/gnome/gnc-plugin-page-register.c:237
msgid "_Blank Transaction"
msgstr "_Leere Buchung"
-#: ../src/gnome/gnc-plugin-page-register.c:243
+#: ../src/gnome/gnc-plugin-page-register.c:240
msgid "Edit E_xchange Rate"
msgstr "Wechsel_kurs bearbeiten"
-#: ../src/gnome/gnc-plugin-page-register.c:244
-msgid "Exit the exchange rate for the current transaction"
+#: ../src/gnome/gnc-plugin-page-register.c:241
+msgid "Edit the exchange rate for the current transaction"
msgstr "Den Wechselkurs für die gewählte Buchung bearbeiten"
-#: ../src/gnome/gnc-plugin-page-register.c:249
+#: ../src/gnome/gnc-plugin-page-register.c:246
msgid "Sche_dule..."
msgstr "_Terminiert..."
-#: ../src/gnome/gnc-plugin-page-register.c:252
+#: ../src/gnome/gnc-plugin-page-register.c:249
msgid "_All transactions"
msgstr "Alle Buchungssätze"
-#: ../src/gnome/gnc-plugin-page-register.c:255
+#: ../src/gnome/gnc-plugin-page-register.c:252
msgid "_This transaction"
msgstr "_Dieser Buchungssatz"
#. Reports menu
-#: ../src/gnome/gnc-plugin-page-register.c:261
+#: ../src/gnome/gnc-plugin-page-register.c:258
msgid "Account Report"
msgstr "Kontenbericht"
+#: ../src/gnome/gnc-plugin-page-register.c:259
#: ../src/gnome/gnc-plugin-page-register.c:262
-#: ../src/gnome/gnc-plugin-page-register.c:265
msgid "Open a register report window for this transaction"
msgstr "Kontobuch als Bericht für diesen Buchungssatz öffnen"
-#: ../src/gnome/gnc-plugin-page-register.c:264
+#: ../src/gnome/gnc-plugin-page-register.c:261
msgid "Account Transaction Report"
msgstr "Buchungsbericht"
#. Translators: This is a menu item in the View menu
-#: ../src/gnome/gnc-plugin-page-register.c:290
+#: ../src/gnome/gnc-plugin-page-register.c:287
msgid "Transaction _Journal"
msgstr "_Vollständig"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../src/gnome/gnc-plugin-page-register.c:326
-#: ../src/register/ledger-core/split-register.c:1979
+#: ../src/gnome/gnc-plugin-page-register.c:323
+#: ../src/register/ledger-core/split-register.c:2001
#: ../src/register/ledger-core/split-register-layout.c:571
#: ../src/register/ledger-core/split-register-model.c:184
-#: ../intl-scm/guile-strings.c:2562
+#: ../intl-scm/guile-strings.c:3896 ../intl-scm/guile-strings.c:5046
msgid "Transfer"
msgstr "Buchen"
#. src/report/standard-reports/general-ledger.scm
-#: ../src/gnome/gnc-plugin-page-register.c:544
-#: ../src/gnome/gnc-plugin-page-register.c:1144
-#: ../src/gnome/gnc-plugin-page-register.c:1676
-#: ../intl-scm/guile-strings.c:1468
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#: ../src/gnome/gnc-plugin-page-register.c:541
+#: ../src/gnome/gnc-plugin-page-register.c:1141
+#: ../src/gnome/gnc-plugin-page-register.c:1673
+#: ../intl-scm/guile-strings.c:2178 ../intl-scm/guile-strings.c:2802
msgid "General Ledger"
msgstr "Journal"
#. Translators: %s is the name
#. of the tab page
-#: ../src/gnome/gnc-plugin-page-register.c:1083
+#: ../src/gnome/gnc-plugin-page-register.c:1080
#, c-format
msgid "Save changes to %s?"
msgstr "Änderungen in %s speichern?"
-#: ../src/gnome/gnc-plugin-page-register.c:1087
+#: ../src/gnome/gnc-plugin-page-register.c:1084
msgid ""
"This register has pending changes to a transaction. Would you like to save "
"the changes to this transaction, discard the transaction, or cancel the "
@@ -7418,85 +7484,111 @@
"Schließen der Seite die Änderungen in der Buchung speichern oder verwerfen "
"oder möchten Sie abbrechen?"
-#: ../src/gnome/gnc-plugin-page-register.c:1090
+#: ../src/gnome/gnc-plugin-page-register.c:1087
msgid "_Discard Transaction"
msgstr "Buchungsänderungen ver_werfen"
-#: ../src/gnome/gnc-plugin-page-register.c:1094
+#: ../src/gnome/gnc-plugin-page-register.c:1091
msgid "_Save Transaction"
msgstr "Buchung _speichern"
-#: ../src/gnome/gnc-plugin-page-register.c:1125
-#: ../src/gnome/gnc-plugin-page-register.c:1157
-#: ../src/import-export/hbci/gnc-hbci-utils.c:577
-#: ../src/import-export/hbci/gnc-hbci-utils.c:579
+#: ../src/gnome/gnc-plugin-page-register.c:1122
+#: ../src/gnome/gnc-plugin-page-register.c:1154
+#: ../src/import-export/hbci/gnc-hbci-utils.c:578
+#: ../src/import-export/hbci/gnc-hbci-utils.c:580
msgid "unknown"
msgstr "unbekannt"
-#: ../src/gnome/gnc-plugin-page-register.c:1146
-#: ../src/gnome/gnc-plugin-page-register.c:1682
+#: ../src/gnome/gnc-plugin-page-register.c:1143
+#: ../src/gnome/gnc-plugin-page-register.c:1679
msgid "Portfolio"
msgstr "Portfolio"
-#: ../src/gnome/gnc-plugin-page-register.c:1148
-#: ../src/gnome/gnc-plugin-page-register.c:1688
+#: ../src/gnome/gnc-plugin-page-register.c:1145
+#: ../src/gnome/gnc-plugin-page-register.c:1685
msgid "Search Results"
msgstr "Suchergebnisse"
-#: ../src/gnome/gnc-plugin-page-register.c:1678
+#: ../src/gnome/gnc-plugin-page-register.c:1675
msgid "General Ledger Report"
msgstr "Journal Bericht"
-#: ../src/gnome/gnc-plugin-page-register.c:1684
+#: ../src/gnome/gnc-plugin-page-register.c:1681
msgid "Portfolio Report"
msgstr "Portfolio Bericht"
-#: ../src/gnome/gnc-plugin-page-register.c:1690
+#: ../src/gnome/gnc-plugin-page-register.c:1687
msgid "Search Results Report"
msgstr "Suchergebnisse Bericht"
#. src/report/standard-reports/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../src/gnome/gnc-plugin-page-register.c:1694
-#: ../src/gnome-utils/glade/preferences.glade.h:83
-#: ../intl-scm/guile-strings.c:1266 ../intl-scm/guile-strings.c:2662
+#: ../src/gnome/gnc-plugin-page-register.c:1691
+#: ../src/gnome-utils/glade/preferences.glade.h:91
+#: ../intl-scm/guile-strings.c:1978 ../intl-scm/guile-strings.c:2602
+#: ../intl-scm/guile-strings.c:3996 ../intl-scm/guile-strings.c:5146
msgid "Register"
msgstr "Kontobuch"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../src/gnome/gnc-plugin-page-register.c:1696
-#: ../intl-scm/guile-strings.c:2582
+#: ../src/gnome/gnc-plugin-page-register.c:1693
+#: ../intl-scm/guile-strings.c:3916 ../intl-scm/guile-strings.c:5066
msgid "Register Report"
msgstr "Bericht zum Kontobuch"
-#: ../src/gnome/gnc-plugin-page-register.c:1712
+#: ../src/gnome/gnc-plugin-page-register.c:1709
msgid "and subaccounts"
msgstr "und Unterkonten"
-#: ../src/gnome/gnc-plugin-page-register.c:1978
+#: ../src/gnome/gnc-plugin-page-register.c:1975
msgid "You cannot void a transaction with reconciled or cleared splits."
msgstr ""
"Sie können eine Buchung mit abgeglichenen oder bestätigten Buchungsteilen "
"nicht ungültig machen."
-#: ../src/gnome/gnc-plugin-page-register.c:2046
+#: ../src/gnome/gnc-plugin-page-register.c:2043
#: ../src/gnome/gnc-split-reg.c:908
msgid "A reversing entry has already been created for this transaction."
msgstr "Zu dieser Buchung wurde bereits eine Stornierungsbuchung hinzugefügt."
#. Translations: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register.c:2094
+#: ../src/gnome/gnc-plugin-page-register.c:2091
#, c-format
msgid "Sort %s by..."
msgstr "%s sortieren nach..."
#. Translators: The %s is the name of the plugin page
-#: ../src/gnome/gnc-plugin-page-register.c:2146
-#: ../src/gnome-utils/gnc-tree-view-account.c:1842
+#: ../src/gnome/gnc-plugin-page-register.c:2143
+#: ../src/gnome-utils/gnc-tree-view-account.c:1838
#, c-format
msgid "Filter %s by..."
msgstr "%s filtern nach..."
+#. This seems to be the one that initially gets used, the InactiveDateCell
+#. is set to, and subsequently displayed.
+#: ../src/gnome/gnc-plugin-page-sx-list.c:115
+#: ../src/register/ledger-core/split-register-model.c:806
+msgid "Scheduled"
+msgstr "Terminiert"
+
+#: ../src/gnome/gnc-plugin-page-sx-list.c:117
+#, fuzzy
+msgid "Create a new scheduled transaction"
+msgstr "Bitte geben Sie der terminierten Buchung einen Namen."
+
+#: ../src/gnome/gnc-plugin-page-sx-list.c:119
+#, fuzzy
+msgid "Edit the selected scheduled transaction"
+msgstr "Ausgewählte terminierte Buchung löschen?"
+
+#: ../src/gnome/gnc-plugin-page-sx-list.c:121
+#, fuzzy
+msgid "Delete the selected scheduled transaction"
+msgstr "Ausgewählte terminierte Buchung löschen?"
+
#: ../src/gnome/gnc-plugin-register.c:48
msgid "_General Ledger"
msgstr "_Journal"
@@ -7607,39 +7699,39 @@
"Beachten Sie, dass Sie einen Buchungssatz mit abgeglichenen Buchungen "
"löschen würden. Dies bedeutet, dass ihr abgeglichener Saldo verändert wird."
-#: ../src/gnome/gnc-split-reg.c:1795
+#: ../src/gnome/gnc-split-reg.c:1794
msgid "Present:"
msgstr "Aktueller Wert:"
-#: ../src/gnome/gnc-split-reg.c:1796
+#: ../src/gnome/gnc-split-reg.c:1795
msgid "Future:"
msgstr "Zukünftiger Wert:"
-#: ../src/gnome/gnc-split-reg.c:1797
+#: ../src/gnome/gnc-split-reg.c:1796
msgid "Cleared:"
msgstr "Bestätigt:"
-#: ../src/gnome/gnc-split-reg.c:1798
+#: ../src/gnome/gnc-split-reg.c:1797
msgid "Reconciled:"
msgstr "Abgeglichen:"
-#: ../src/gnome/gnc-split-reg.c:1799
+#: ../src/gnome/gnc-split-reg.c:1798
msgid "Projected Minimum:"
msgstr "Voraussichtliches Minimum:"
-#: ../src/gnome/gnc-split-reg.c:1803
+#: ../src/gnome/gnc-split-reg.c:1802
msgid "Shares:"
msgstr "Anteile:"
-#: ../src/gnome/gnc-split-reg.c:1804
+#: ../src/gnome/gnc-split-reg.c:1803
msgid "Current Value:"
msgstr "Aktueller Wert:"
-#: ../src/gnome/gnc-split-reg.c:1876
+#: ../src/gnome/gnc-split-reg.c:1875
msgid "This account register is read-only."
msgstr "Dieses Konto ist schreibgeschützt."
-#: ../src/gnome/gnc-split-reg.c:1910
+#: ../src/gnome/gnc-split-reg.c:1909
msgid ""
"This account may not be edited. If you want to edit transactions in this "
"register, please open the account options and turn off the placeholder "
@@ -7649,7 +7741,7 @@
"Konto bearbeiten möchten, öffnen Sie bitte das Dialogfenster »Konto "
"Eigenschaften« und deaktivieren Sie die Option »Platzhalter-Konto«."
-#: ../src/gnome/gnc-split-reg.c:1917
+#: ../src/gnome/gnc-split-reg.c:1916
msgid ""
"One of the sub-accounts selected may not be edited. If you want to edit "
"transactions in this register, please open the sub-account options and turn "
@@ -7669,7 +7761,21 @@
msgid "Manage your finances, accounts, and investments"
msgstr "Der Finanzmanager für Buchführung, Online-Banking und Investments"
-#: ../src/gnome/lot-viewer.c:596
+#. src/report/standard-reports/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/register.scm
+#. src/report/standard-reports/register.scm
+#: ../src/gnome/lot-viewer.c:620 ../intl-scm/guile-strings.c:1984
+#: ../intl-scm/guile-strings.c:2608 ../intl-scm/guile-strings.c:3912
+#: ../intl-scm/guile-strings.c:5062
+msgid "Title"
+msgstr "Titel"
+
+#: ../src/gnome/lot-viewer.c:630
+msgid "Gains"
+msgstr "Wertzuwachs"
+
+#: ../src/gnome/lot-viewer.c:652
#, c-format
msgid "Lots in Account %s"
msgstr "Posten im Konto %s"
@@ -7756,7 +7862,7 @@
"unterschritten wurde."
#: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:3
-#: ../src/gnome-utils/glade/preferences.glade.h:47
+#: ../src/gnome-utils/glade/preferences.glade.h:50
msgid "Default to 'new search' if fewer than this number of items is returned."
msgstr ""
"Voreinstellung 'Neue Suche' wählen, wenn diese Anzahl an Ergebnissen "
@@ -7794,7 +7900,7 @@
msgstr "Spalten aufsteigend oder absteigend sortieren"
#: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:11
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:6
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:10
#: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:10
msgid ""
"The X,Y coordinates of the top left corner of the dialog when it was last "
@@ -7804,7 +7910,7 @@
"geöffnet war."
#: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:12
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:7
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:11
#: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:11
msgid "The width and size of the dialog when it was last closed."
msgstr "Größe des Dialogs beim letzten Schließen"
@@ -7844,13 +7950,13 @@
"sortiert wird. Mögliche Werte sind die Namen der Spalten oder »none« (keine)."
#: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:17
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:9
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:17
#: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:17
msgid "Window geometry"
msgstr "Fenstergröße"
#: ../src/gnome/schemas/apps_gnucash_dialog_common.schemas.in.h:18
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:10
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:18
#: ../src/import-export/schemas/apps_gnucash_import_generic_matcher.schemas.in.h:18
msgid "Window position"
msgstr "Fensterposition"
@@ -8052,7 +8158,7 @@
msgstr "Bestätigte Buchungen zum Abgleichen vorwählen"
#: ../src/gnome/schemas/apps_gnucash_dialog_reconcile.schemas.in.h:4
-#: ../src/gnome-utils/glade/preferences.glade.h:81
+#: ../src/gnome-utils/glade/preferences.glade.h:88
msgid ""
"Prior to reconciling an account which charges or pays interest, prompt the "
"user to enter a transaction for the interest charge or payment. Currently "
@@ -8072,6 +8178,66 @@
msgid "Prompt for interest charges"
msgstr "Nach Eingabe Sollzins fragen"
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:1
+msgid "How many days in advance to notify the user."
+msgstr ""
+"Anzahl der Tage im Voraus, mit denen über die Terminierte Buchungen "
+"benachrichtigt werden soll."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:2
+msgid "How many days in advance to remind the user."
+msgstr ""
+"Anzahl der Tage im Voraus, die an Terminierte Buchungen erinnert werden soll."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:3
+msgid ""
+"If active, any newly created scheduled transaction will have its 'auto "
+"create' flag set active by default. The user can change this flag during "
+"transaction creation, or at any later time by editing the scheduled "
+"transaction."
+msgstr ""
+"Wenn aktiviert, werden neu erstellte Terminierte Buchungen »Automatisch "
+"erstellen« als Voreinstellung aktiviert haben. Diese Einstellung kann bei "
+"jeder Terminierten Buchung geändert werden."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:4
+msgid ""
+"If active, any newly created scheduled transaction will have its 'notify' "
+"flag set by default. The user can change this flag during transaction "
+"creation, or at any later time by editing the scheduled transaction. This "
+"setting only has meaning if the create_auto setting is active."
+msgstr ""
+"Wenn aktiviert, werden neu erstellte Terminierte Buchungen »Benachrichtigen« "
+"als Voreinstellung aktiviert haben. Diese Einstellung kann bei jeder "
+"Terminierten Buchung geändert werden. Diese Einstellung hat nur Bedeutung, "
+"wenn »Automatisch erstellen« aktiviert ist."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:5
+msgid "Set the \"auto create\" flag by default"
+msgstr ""
+"»Automatisch erstellen« für neue terminierte Buchungen als Voreinstellung "
+"wählen."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:6
+msgid "Set the \"notify\" flag by default"
+msgstr ""
+"»Benachrichtigen« für neue terminierte Buchungen als Voreinstellung wählen."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:7
+msgid "Show \"since last run\" dialog when a file is opened."
+msgstr ""
+"Das Fenster »Seit letztem Aufruf« anzeigen, wenn eine Datei geöffnet wird "
+"oder beim Programmstart von GnuCash."
+
+#: ../src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in.h:8
+msgid ""
+"This setting controls whether the scheduled transactions \"since last run\" "
+"dialog is shown automatically when a data file is opened. This includes the "
+"initial opening of the data file when GnuCash starts. If this setting is "
+"active, show the dialog, otherwise it is not shown."
+msgstr ""
+"Ob das Fenster »Seit letztem Aufruf« beim Öffnen einer Datei angezeigt wird."
+
#: ../src/gnome/schemas/apps_gnucash_dialog_totd.schemas.in.h:1
msgid ""
"Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog "
@@ -8151,7 +8317,7 @@
msgstr "Alte Log/Sicherungsdateien nach so vielen Tagen löschen (0 = niemals)."
#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:16
-#: ../src/gnome-utils/glade/preferences.glade.h:52
+#: ../src/gnome-utils/glade/preferences.glade.h:55
msgid "Display negative amounts in red"
msgstr "Negative Beträge in rot anzeigen"
@@ -8268,16 +8434,21 @@
msgstr "Anzahl automatische Dezimalstellen"
#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:32
+#, fuzzy
+msgid "Position of the notebook tabs"
+msgstr "Position der Datumszeile"
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:33
msgid "Save window sizes and locations"
msgstr "Fenstergröße und -positionen speichern"
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:33
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:34
msgid "Show close buttons on notebook tabs"
msgstr "Den Knopf »Schließen« bei Karteikarten-Ansicht anzeigen"
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:34
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:35
msgid ""
-"Show horizontal borders between cells in a register. If active the border "
+"Show horizontal borders between rows in a register. If active the border "
"between cells will be indicated with a heavy line. Otherwise the border "
"between cells will not be marked."
msgstr ""
@@ -8285,11 +8456,15 @@
"deutlichen Linie gezeichnet. Andernfalls wird die Begrenzung zwischen Zeilen "
"nicht mit einer Linie markiert."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:35
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:36
msgid "Show horizontal borders in a register"
msgstr "Horizontale Begrenzungen im Kontofenster anzeigen"
#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:37
+msgid "Show splash screen"
+msgstr ""
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:39
msgid ""
"Show two lines of information for each transaction in a register. This is "
"the default setting for when a register is first opened. The setting can be "
@@ -8300,9 +8475,9 @@
"Kontofenster kann diese Einstellung jederzeit über das Menü »Anzeige/Zwei "
"Zeilen« geändert werden."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:38
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:40
msgid ""
-"Show vertical borders between cells in a register. If active the border "
+"Show vertical borders between columns in a register. If active the border "
"between cells will be indicated with a heavy line. Otherwise the border "
"between cells will not be marked."
msgstr ""
@@ -8310,19 +8485,19 @@
"deutlichen Linie gezeichnet. Andernfalls wird die Begrenzung zwischen "
"Spalten nicht mit einer Linie markiert."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:39
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:41
msgid "Show vertical borders in a register"
msgstr "Vertikale Begrenzungen im Kontofenster anzeigen"
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:40
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:42
msgid "Source of default account currency"
msgstr "Auswahl Standardwährung für Konten"
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:41
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:43
msgid "Source of default report currency"
msgstr "Auswahl Standardwährung für Berichte"
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:43
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:45
msgid ""
"This field sets the number of rows to show in a register. It does not "
"actually affect the display of the contents of the window. It is only used "
@@ -8332,7 +8507,7 @@
"Kontofenster gezeigt werden. Diese Zahl wird nur verwendet, wenn das Fenster "
"das erste Mal neu geöffnet wird."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:44
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:46
msgid ""
"This field specifies the default view style when opening a new register "
"window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The "
@@ -8345,13 +8520,13 @@
"Kontenfenster an. Mögliche Werte sind »ledger« (Einzeilig), »auto-"
"ledger« (Aktive vollständig) und »journal« (Vollständig)."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:45
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:47
msgid ""
"This field specifies the number of automatic decimal places that will be "
"filled in."
msgstr "Diese Einstellung gibt die Anzahl der automatischen Dezimalstellen an."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:46
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:48
msgid ""
"This setting allows certain accounts to have their balances reversed in sign "
"from positive to negative, or vice versa. The setting \"income_expense\" is "
@@ -8365,7 +8540,7 @@
"Einnahme-/Ausgabenkonten, »credit« für Aktiva-/Passivakonten und »none« für "
"keine Vorzeichenumkehr."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:47
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:49
msgid ""
"This setting chooses the way dates are displayed in GnuCash. Possible values "
"for this setting are \"locale\" to use the system locale setting, \"ce\" for "
@@ -8377,7 +8552,7 @@
"Kontinentaleuropa, »iso« für den ISO-8601 Standard, »uk« für Großbritannien "
"und »us« für den USA-Stil für die Datumsanzeige."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:48
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:50
msgid ""
"This setting controls how the labels on toolbar buttons are shown. If set to "
"\"system\" then GnuCash will use the desktop setting for how to draw toolbar "
@@ -8392,7 +8567,7 @@
"für alle Symbole, wobei die wichtigsten Knöpfe noch einen nebenstehenden "
"Text zeigen."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:49
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:51
msgid ""
"This setting controls the default currency used for reports. If set to "
"\"locale\" then GnuCash will retrieve the default currency from the user's "
@@ -8404,7 +8579,7 @@
"voreingestellte Währung der Systemeinstellungen (locale). Wenn auf »other« "
"gesetzt, wird die Einstellung von »currency_other« verwendet."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:50
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:52
msgid ""
"This setting controls the source of the default currency for new accounts. "
"If set to \"locale\" then GnuCash will retrieve the default currency from "
@@ -8416,7 +8591,7 @@
"Währung der Systemeinstellungen (locale). Wenn auf »other« gesetzt, wird die "
"Einstellung von »currency_other« verwendet."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:51
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:53
msgid ""
"This setting determines the character that will be used between components "
"of an account name. Possible values are any single non-alphanumeric unicode "
@@ -8427,8 +8602,20 @@
"Zeichen wählen, das kein Buchstabe oder Zahl ist, zum Beispiel »:«, »/« oder "
"»-«."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:52
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:54
msgid ""
+"This setting determines the edge at which the tabs for switching pages in "
+"notebooks are drawn. Possible values are \"top\", \"left\", \"bottom\" and "
+"\"right\". It defaults to \"top\"."
+msgstr ""
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:55
+msgid ""
+"This setting determines whether GnuCash will show a splash screen at startup."
+msgstr ""
+
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:56
+msgid ""
"This setting specifies the default currency used for new accounts if the "
"currency_choice setting is set to \"other\". This field must contain the "
"three letter ISO 4217 code for a currency (e.g. USD, GBP, RUB)."
@@ -8438,7 +8625,7 @@
"muss den Drei-Buchstaben-Code aus ISO 4217 für die Währung enthalten, z. B. "
"EUR, USD oder RUB."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:53
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:57
msgid ""
"This setting specifies the default currency used for reports if the "
"currency_choice setting is set to \"other\". This field must contain the "
@@ -8449,7 +8636,7 @@
"Einstellung muss den Drei-Buchstaben-Code aus ISO 4217 für die Währung "
"enthalten, z. B. EUR, USD oder RUB."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:54
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:58
msgid ""
"This setting specifies the number of days after which old log/backup files "
"will be deleted (0 = never)."
@@ -8457,11 +8644,11 @@
"Diese Einstellung gibt die Anzahl Tage an, nach denen alte Log/Backup-"
"Dateien gelöscht werden. 0 entspricht niemals Löschen."
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:55
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:59
msgid "Use 24 hour time format"
msgstr "24-Stunden-Format zur Zeitanzeige"
-#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:56
+#: ../src/gnome/schemas/apps_gnucash_general.schemas.in.h:60
msgid "Use formal account labels"
msgstr "Ãœberschriften aus Rechnungswesen verwenden"
@@ -8573,8 +8760,9 @@
"des Kontos verändern."
#: ../src/gnome/schemas/apps_gnucash_warnings.schemas.in.h:21
+#, fuzzy
msgid ""
-"This dialog is presented before allowing you to remove a reconciled splits "
+"This dialog is presented before allowing you to remove a reconciled split "
"from a transaction. Doing so will throw off the reconciled value of the "
"register and can make it hard to perform future reconciliations."
msgstr ""
@@ -8774,132 +8962,131 @@
msgid "Width of a column in the dialog"
msgstr "Spaltenbreite in einem Dialog"
-#: ../src/gnome-search/dialog-search.c:147
+#: ../src/gnome-search/dialog-search.c:155
msgid "You must select an item from the list"
msgstr "Sie müssen ein Kriterium der Liste auswählen"
-#: ../src/gnome-search/dialog-search.c:264
+#: ../src/gnome-search/dialog-search.c:272
msgid "Select"
msgstr "Auswählen"
-#: ../src/gnome-search/dialog-search.c:787
+#: ../src/gnome-search/dialog-search.c:806
msgid "all criteria are met"
msgstr "Alle Kriterien werden erfüllt"
-#: ../src/gnome-search/dialog-search.c:792
+#: ../src/gnome-search/dialog-search.c:807
msgid "any criteria are met"
msgstr "Irgendeines der Kriterien wird erfüllt"
#. Translators: %s is either "item" or the name of some other
#. * item, e.g. "Customer" or "Invoice".
-#: ../src/gnome-search/dialog-search.c:833
+#: ../src/gnome-search/dialog-search.c:842
#, c-format
msgid "New %s"
msgstr "Neu: %s"
-#: ../src/gnome-search/dialog-search.c:833
+#: ../src/gnome-search/dialog-search.c:842
msgid "item"
msgstr "Kriterium"
-#: ../src/gnome-search/search-account.c:167
+#: ../src/gnome-search/search-account.c:170
msgid "You have not selected any accounts"
msgstr "Sie haben keine Konten ausgewählt"
-#: ../src/gnome-search/search-account.c:212
+#: ../src/gnome-search/search-account.c:190
msgid "matches all accounts"
msgstr "entspricht allen Konten"
-#: ../src/gnome-search/search-account.c:215
+#: ../src/gnome-search/search-account.c:193
msgid "matches any account"
msgstr "entspricht irgendeinem Konto"
-#. Force one
-#: ../src/gnome-search/search-account.c:217
+#: ../src/gnome-search/search-account.c:194
msgid "matches no accounts"
msgstr "entspricht keinem Konto"
#. src/report/standard-reports/cash-flow.scm
-#: ../src/gnome-search/search-account.c:236 ../intl-scm/guile-strings.c:1324
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../src/gnome-search/search-account.c:211 ../intl-scm/guile-strings.c:2034
+#: ../intl-scm/guile-strings.c:2658
msgid "Selected Accounts"
msgstr "Ausgewählte Konten"
-#: ../src/gnome-search/search-account.c:237
+#: ../src/gnome-search/search-account.c:212
msgid "Choose Accounts"
msgstr "Konten wählen"
#. Create the label
-#: ../src/gnome-search/search-account.c:269
+#: ../src/gnome-search/search-account.c:244
msgid "Select Accounts to Match"
msgstr "Konten wählen, die den Kriterien entsprechen"
-#: ../src/gnome-search/search-account.c:273
+#: ../src/gnome-search/search-account.c:248
msgid "Select the Accounts to Compare"
msgstr "Konten wählen, die verglichen werden sollen"
#. Build and connect the toggle
-#: ../src/gnome-search/search-boolean.c:230
+#: ../src/gnome-search/search-boolean.c:201
msgid "set true"
msgstr "auf wahr setzen"
-#: ../src/gnome-search/search-date.c:214
+#: ../src/gnome-search/search-date.c:191
msgid "is before"
msgstr "vor"
-#. Force one
-#: ../src/gnome-search/search-date.c:216
+#: ../src/gnome-search/search-date.c:192
msgid "is before or on"
msgstr "vor oder am"
-#: ../src/gnome-search/search-date.c:217
+#: ../src/gnome-search/search-date.c:193
msgid "is on"
msgstr "am"
-#: ../src/gnome-search/search-date.c:218
+#: ../src/gnome-search/search-date.c:194
msgid "is not on"
msgstr "nicht am"
-#: ../src/gnome-search/search-date.c:219
+#: ../src/gnome-search/search-date.c:195
msgid "is after"
msgstr "nach"
-#: ../src/gnome-search/search-date.c:220
+#: ../src/gnome-search/search-date.c:196
msgid "is on or after"
msgstr "nach oder am"
-#: ../src/gnome-search/search-double.c:206
-#: ../src/gnome-search/search-int64.c:209
-#: ../src/gnome-search/search-numeric.c:246
+#: ../src/gnome-search/search-double.c:183
+#: ../src/gnome-search/search-int64.c:185
+#: ../src/gnome-search/search-numeric.c:216
msgid "is less than"
msgstr "weniger als"
-#. Force one
-#: ../src/gnome-search/search-double.c:208
-#: ../src/gnome-search/search-int64.c:211
-#: ../src/gnome-search/search-numeric.c:251
+#: ../src/gnome-search/search-double.c:184
+#: ../src/gnome-search/search-int64.c:186
+#: ../src/gnome-search/search-numeric.c:220
msgid "is less than or equal to"
msgstr "weniger als oder gleich"
-#: ../src/gnome-search/search-double.c:209
-#: ../src/gnome-search/search-int64.c:212
-#: ../src/gnome-search/search-numeric.c:254
+#: ../src/gnome-search/search-double.c:185
+#: ../src/gnome-search/search-int64.c:187
+#: ../src/gnome-search/search-numeric.c:223
msgid "equals"
msgstr "gleich"
-#: ../src/gnome-search/search-double.c:210
-#: ../src/gnome-search/search-int64.c:213
-#: ../src/gnome-search/search-numeric.c:257
+#: ../src/gnome-search/search-double.c:186
+#: ../src/gnome-search/search-int64.c:188
+#: ../src/gnome-search/search-numeric.c:226
msgid "does not equal"
msgstr "nicht gleich"
-#: ../src/gnome-search/search-double.c:211
-#: ../src/gnome-search/search-int64.c:214
-#: ../src/gnome-search/search-numeric.c:260
+#: ../src/gnome-search/search-double.c:187
+#: ../src/gnome-search/search-int64.c:189
+#: ../src/gnome-search/search-numeric.c:229
msgid "is greater than"
msgstr "größer als"
-#: ../src/gnome-search/search-double.c:212
-#: ../src/gnome-search/search-int64.c:215
-#: ../src/gnome-search/search-numeric.c:264
+#: ../src/gnome-search/search-double.c:188
+#: ../src/gnome-search/search-int64.c:190
+#: ../src/gnome-search/search-numeric.c:233
msgid "is greater than or equal to"
msgstr "größer als oder gleich"
@@ -8951,74 +9138,73 @@
msgstr "Suchtyp"
#: ../src/gnome-search/search.glade.h:12
-msgid "_New item ..."
+msgid "_New item..."
msgstr "_Neuer Eintrag..."
-#: ../src/gnome-search/search-numeric.c:246
+#: ../src/gnome-search/search-numeric.c:216
msgid "less than"
msgstr "kleiner"
-#: ../src/gnome-search/search-numeric.c:250
+#: ../src/gnome-search/search-numeric.c:219
msgid "less than or equal to"
msgstr "kleiner oder gleich"
-#: ../src/gnome-search/search-numeric.c:254
+#: ../src/gnome-search/search-numeric.c:223
msgid "equal to"
msgstr "gleich"
-#: ../src/gnome-search/search-numeric.c:257
+#: ../src/gnome-search/search-numeric.c:226
msgid "not equal to"
msgstr "ungleich"
-#: ../src/gnome-search/search-numeric.c:260
+#: ../src/gnome-search/search-numeric.c:229
msgid "greater than"
msgstr "größer"
-#: ../src/gnome-search/search-numeric.c:263
+#: ../src/gnome-search/search-numeric.c:232
msgid "greater than or equal to"
msgstr "größer oder gleich"
-#: ../src/gnome-search/search-numeric.c:285
+#: ../src/gnome-search/search-numeric.c:249
msgid "has credits or debits"
msgstr "hat Haben oder Soll"
-#. Force one
-#: ../src/gnome-search/search-numeric.c:288
+#: ../src/gnome-search/search-numeric.c:250
msgid "has debits"
msgstr "hat Soll"
-#: ../src/gnome-search/search-numeric.c:290
+#: ../src/gnome-search/search-numeric.c:251
msgid "has credits"
msgstr "hat Haben"
#. Build and connect the toggles
-#: ../src/gnome-search/search-reconciled.c:251
+#: ../src/gnome-search/search-reconciled.c:222
msgid "Not Cleared"
msgstr "Unbestätigt"
-#: ../src/gnome-search/search-reconciled.c:254
-#: ../src/gnome-utils/gnc-tree-view-account.c:578
+#: ../src/gnome-search/search-reconciled.c:225
+#: ../src/gnome-utils/gnc-tree-view-account.c:574
msgid "Cleared"
msgstr "Bestätigt"
-#: ../src/gnome-search/search-reconciled.c:257
-#: ../src/gnome-utils/gnc-tree-view-account.c:591
+#: ../src/gnome-search/search-reconciled.c:228
+#: ../src/gnome-utils/gnc-tree-view-account.c:587
msgid "Reconciled"
msgstr "Abgeglichen"
-#: ../src/gnome-search/search-reconciled.c:260
+#: ../src/gnome-search/search-reconciled.c:231
msgid "Frozen"
msgstr "Fixiert"
-#: ../src/gnome-search/search-reconciled.c:263
+#: ../src/gnome-search/search-reconciled.c:234
msgid "Voided"
msgstr "Storniert"
-#: ../src/gnome-search/search-string.c:183
+#: ../src/gnome-search/search-string.c:186
msgid "You need to enter a string value"
msgstr "Sie müssen einen Suchausdruck angeben"
-#: ../src/gnome-search/search-string.c:210
+#: ../src/gnome-search/search-string.c:213
#, c-format
msgid ""
"Error in regular expression '%s':\n"
@@ -9027,24 +9213,20 @@
"Fehler im regulären Ausdruck '%s':\n"
"%s"
-#: ../src/gnome-search/search-string.c:274
+#: ../src/gnome-search/search-string.c:257
msgid "contains"
msgstr "enthält"
-#: ../src/gnome-search/search-string.c:277
-msgid "does not contain"
-msgstr "enthält nicht"
-
-#: ../src/gnome-search/search-string.c:281
+#: ../src/gnome-search/search-string.c:258
msgid "matches regex"
msgstr "entspricht regulärem Ausdruck"
-#: ../src/gnome-search/search-string.c:285
+#: ../src/gnome-search/search-string.c:260
msgid "does not match regex"
msgstr "entspricht nicht regulärem Ausdruck"
#. Build and connect the toggle button
-#: ../src/gnome-search/search-string.c:353
+#: ../src/gnome-search/search-string.c:322
msgid "Case Insensitive?"
msgstr "Groß-/Kleinschreibung ignorieren?"
@@ -9053,22 +9235,22 @@
msgid "Entity Not Found: %s"
msgstr "Entity nicht gefunden: %s"
-#: ../src/gnome/top-level.c:143
+#: ../src/gnome/top-level.c:144
#, c-format
msgid "Transaction with no Accounts: %s"
msgstr "Buchungssatz ohne Konto: %s"
-#: ../src/gnome/top-level.c:154
+#: ../src/gnome/top-level.c:155
#, c-format
msgid "Unsupported entity type: %s"
msgstr "Unbekannter Entity Typ: %s"
-#: ../src/gnome/top-level.c:184
+#: ../src/gnome/top-level.c:185
#, c-format
msgid "No such price: %s"
msgstr "Kein Preis gefunden: %s"
-#: ../src/gnome/top-level.c:369
+#: ../src/gnome/top-level.c:353
#, c-format
msgid ""
"Error: Failure saving state file.\n"
@@ -9077,57 +9259,66 @@
"Fehler beim Speichern des Status-file.\n"
" %s"
-#: ../src/gnome-utils/dialog-account.c:411
+#: ../src/gnome-utils/dialog-account.c:420
msgid "Could not create opening balance."
msgstr "Anfangsbestand kann nicht erstellt werden."
-#: ../src/gnome-utils/dialog-account.c:648
-msgid "Field"
-msgstr "Feld"
+#. primary label
+#: ../src/gnome-utils/dialog-account.c:612
+msgid "Give the children the same type?"
+msgstr ""
+"Soll die Kontoart der Unterkonten zur gleichen Kontoart geändert werden?"
-#: ../src/gnome-utils/dialog-account.c:649
-msgid "Old Value"
-msgstr "Alter Wert"
+#. secondary label
+#: ../src/gnome-utils/dialog-account.c:630
+#, c-format
+msgid ""
+"The children of the edited account have to be changed to type \"%s\" to make "
+"them compatible."
+msgstr ""
+"Die Kontoart der Unterkonten des aktuell bearbeiteten Kontos muss zur "
+"Kontoart »%s« geändert werden, damit die Kontoarten wieder zueinander passen."
-#: ../src/gnome-utils/dialog-account.c:650
-msgid "New Value"
-msgstr "Neuer Wert"
+#. children
+#: ../src/gnome-utils/dialog-account.c:641
+msgid "_Show children accounts"
+msgstr "_Unterkonten anzeigen"
-#: ../src/gnome-utils/dialog-account.c:676
-msgid "Verify Changes"
-msgstr "Änderungen überprüfen"
-
-#: ../src/gnome-utils/dialog-account.c:689
-msgid "The following changes must be made. Continue?"
-msgstr "Die folgenden Änderungen müssen gemacht werden. Fortsetzen?"
-
-#: ../src/gnome-utils/dialog-account.c:757
+#: ../src/gnome-utils/dialog-account.c:714
msgid "The account must be given a name."
msgstr "Das Konto muss einen Namen erhalten."
-#: ../src/gnome-utils/dialog-account.c:779
+#: ../src/gnome-utils/dialog-account.c:736
msgid "There is already an account with that name."
msgstr "Es gibt bereits ein Konto mit diesem Namen."
-#: ../src/gnome-utils/dialog-account.c:787
+#: ../src/gnome-utils/dialog-account.c:744
msgid "You must choose a valid parent account."
msgstr "Wählen Sie ein gültiges Hauptkonto"
-#: ../src/gnome-utils/dialog-account.c:795
+#: ../src/gnome-utils/dialog-account.c:752
msgid "You must select an account type."
msgstr "Wählen Sie eine Kontoart"
-#: ../src/gnome-utils/dialog-account.c:805
+#: ../src/gnome-utils/dialog-account.c:761
+msgid ""
+"The selected account type is incompatible with the one of the selected "
+"parent."
+msgstr ""
+"Die gewählte Kontoart passt nicht zu der Kontoart des Hauptkontos von diesem "
+"Konto."
+
+#: ../src/gnome-utils/dialog-account.c:772
msgid "You must choose a commodity."
msgstr "Sie müssen eine Währung/Aktie auswählen."
-#: ../src/gnome-utils/dialog-account.c:928
+#: ../src/gnome-utils/dialog-account.c:824
msgid "You must enter a valid opening balance or leave it blank."
msgstr ""
"Sie müssen entweder einen gültigen Anfangsbestand angeben \n"
"oder das Feld freilassen."
-#: ../src/gnome-utils/dialog-account.c:952
+#: ../src/gnome-utils/dialog-account.c:848
msgid ""
"You must select a transfer account or choose the opening balances equity "
"account."
@@ -9135,12 +9326,16 @@
"Sie müssen ein Herkunftskonto wählen oder das Ausgleichskonto für den "
"Anfangsbestand benutzen."
-#: ../src/gnome-utils/dialog-account.c:1390
+#: ../src/gnome-utils/dialog-account.c:1338
+msgid "Edit Account"
+msgstr "Konto bearbeiten"
+
+#: ../src/gnome-utils/dialog-account.c:1341
#, c-format
msgid "(%d) New Accounts"
msgstr "(%d) Neue Konten"
-#: ../src/gnome-utils/dialog-account.c:1897
+#: ../src/gnome-utils/dialog-account.c:1846
#, c-format
msgid ""
"Renumber the immediate sub-accounts of %s? This will replace the account "
@@ -9149,7 +9344,7 @@
"Das Unterkonto von %s neu nummerieren? Dies wird das Kontonummer-Feld von "
"jedem Unterkonto mit dem entsprechenden neuen Wert überschreiben."
-#: ../src/gnome-utils/dialog-commodity.c:161
+#: ../src/gnome-utils/dialog-commodity.c:166
msgid ""
"\n"
"Please select a commodity to match:"
@@ -9157,7 +9352,7 @@
"\n"
"Geben Sie eine Währung/Aktie an, die passt:"
-#: ../src/gnome-utils/dialog-commodity.c:168
+#: ../src/gnome-utils/dialog-commodity.c:173
msgid ""
"\n"
"Commodity: "
@@ -9165,7 +9360,7 @@
"\n"
"Währung/Aktie: "
-#: ../src/gnome-utils/dialog-commodity.c:170
+#: ../src/gnome-utils/dialog-commodity.c:175
msgid ""
"\n"
"Exchange code (CUSIP or similar): "
@@ -9173,7 +9368,7 @@
"\n"
"Tickersymbol (CUSIP oder ähnliches): "
-#: ../src/gnome-utils/dialog-commodity.c:172
+#: ../src/gnome-utils/dialog-commodity.c:177
msgid ""
"\n"
"Mnemonic(Ticker symbol or similar): "
@@ -9181,57 +9376,57 @@
"\n"
"Abkürzung/Tickersymbol: "
-#: ../src/gnome-utils/dialog-commodity.c:259
+#: ../src/gnome-utils/dialog-commodity.c:269
msgid "Select security/currency"
msgstr "Bitte wählen Sie die Aktie/Währung"
-#: ../src/gnome-utils/dialog-commodity.c:263
+#: ../src/gnome-utils/dialog-commodity.c:273
msgid "Select security"
msgstr "Bitte wählen Sie die Aktie"
-#: ../src/gnome-utils/dialog-commodity.c:268
+#: ../src/gnome-utils/dialog-commodity.c:278
msgid "Select currency"
msgstr "Bitte wählen Sie die Währung"
-#: ../src/gnome-utils/dialog-commodity.c:487
+#: ../src/gnome-utils/dialog-commodity.c:510
msgid "You must select a commodity. To create a new one, click \"New\""
msgstr ""
"Sie müssen eine Währung/Aktie auswählen. Wenn Sie eine neue anlegen möchten, "
"klicken Sie auf »Neu«."
-#: ../src/gnome-utils/dialog-commodity.c:812
+#: ../src/gnome-utils/dialog-commodity.c:841
msgid "Use local time"
msgstr "Lokale Zeit benutzen"
-#: ../src/gnome-utils/dialog-commodity.c:935
+#: ../src/gnome-utils/dialog-commodity.c:955
msgid "Edit currency"
msgstr "Währung bearbeiten"
-#: ../src/gnome-utils/dialog-commodity.c:936
+#: ../src/gnome-utils/dialog-commodity.c:956
msgid "Currency Information"
msgstr "Währungsinformationen"
-#: ../src/gnome-utils/dialog-commodity.c:939
+#: ../src/gnome-utils/dialog-commodity.c:959
msgid "Edit security"
msgstr "Aktie bearbeiten"
-#: ../src/gnome-utils/dialog-commodity.c:939
+#: ../src/gnome-utils/dialog-commodity.c:959
msgid "New security"
msgstr "Neue Aktie/Währung"
-#: ../src/gnome-utils/dialog-commodity.c:940
+#: ../src/gnome-utils/dialog-commodity.c:960
msgid "Security Information"
msgstr "Aktieninformationen"
-#: ../src/gnome-utils/dialog-commodity.c:1184
+#: ../src/gnome-utils/dialog-commodity.c:1206
msgid "You may not create a new national currency."
msgstr "Sie können keine neue nationale Währung erstellen."
-#: ../src/gnome-utils/dialog-commodity.c:1196
+#: ../src/gnome-utils/dialog-commodity.c:1218
msgid "That commodity already exists."
msgstr "Diese Währung/Aktie existiert bereits."
-#: ../src/gnome-utils/dialog-commodity.c:1238
+#: ../src/gnome-utils/dialog-commodity.c:1261
msgid ""
"You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type"
"\" for the commodity."
@@ -9239,70 +9434,65 @@
"Sie müssen in den Feldern »Voller Name«, »Symbol/Abkürzung« und »Typ« für "
"die Währung/Aktie etwas angeben."
-#: ../src/gnome-utils/dialog-options.c:885
+#: ../src/gnome-utils/dialog-options.c:872
msgid "Select all accounts."
msgstr "Alle Konten auswählen."
-#: ../src/gnome-utils/dialog-options.c:890
-#: ../src/gnome-utils/dialog-options.c:1017
+#: ../src/gnome-utils/dialog-options.c:877
+#: ../src/gnome-utils/dialog-options.c:995
msgid "Clear All"
msgstr "Keine auswählen"
-#: ../src/gnome-utils/dialog-options.c:892
+#: ../src/gnome-utils/dialog-options.c:879
msgid "Clear the selection and unselect all accounts."
msgstr "Auswahl löschen und gar keine Konten auswählen."
-#: ../src/gnome-utils/dialog-options.c:898
-#: ../src/gnome-utils/dialog-options.c:1024
+#: ../src/gnome-utils/dialog-options.c:885
+#: ../src/gnome-utils/dialog-options.c:1002
msgid "Select Default"
msgstr "Voreinstellung"
-#: ../src/gnome-utils/dialog-options.c:900
+#: ../src/gnome-utils/dialog-options.c:887
msgid "Select the default account selection."
msgstr "Die voreingestellte Kontenauswahl auswählen."
-#: ../src/gnome-utils/dialog-options.c:1012
+#: ../src/gnome-utils/dialog-options.c:990
msgid "Select all entries."
msgstr "Alle Einträge auswählen."
-#: ../src/gnome-utils/dialog-options.c:1019
+#: ../src/gnome-utils/dialog-options.c:997
msgid "Clear the selection and unselect all entries."
msgstr "Auswahl löschen und gar keine Einträge auswählen."
-#: ../src/gnome-utils/dialog-options.c:1026
+#: ../src/gnome-utils/dialog-options.c:1004
msgid "Select the default selection."
msgstr "Die voreingestellte Auswahl auswählen."
#. The reset button on each option page
-#: ../src/gnome-utils/dialog-options.c:1178
+#: ../src/gnome-utils/dialog-options.c:1156
msgid "Defaults"
msgstr "Voreinstellung"
-#: ../src/gnome-utils/dialog-options.c:1180
+#: ../src/gnome-utils/dialog-options.c:1158
msgid "Reset all values to their defaults."
msgstr "Alle Werte auf ihre Voreinstellung zurücksetzen."
-#: ../src/gnome-utils/dialog-options.c:2038
+#: ../src/gnome-utils/dialog-options.c:1998
msgid "Clear"
msgstr "Zurücksetzen"
-#: ../src/gnome-utils/dialog-options.c:2039
+#: ../src/gnome-utils/dialog-options.c:1999
msgid "Clear any selected image file."
msgstr "Auswahl der Bilddatei wieder löschen."
-#: ../src/gnome-utils/dialog-options.c:2042
+#: ../src/gnome-utils/dialog-options.c:2001
msgid "Select image"
msgstr "Bild auswählen"
-#: ../src/gnome-utils/dialog-options.c:2044
-#: ../src/gnome-utils/dialog-options.c:2060
+#: ../src/gnome-utils/dialog-options.c:2003
msgid "Select an image file."
msgstr "Bilddatei auswählen."
-#: ../src/gnome-utils/dialog-options.c:2058
-msgid "Select pixmap"
-msgstr "Bild auswählen"
-
#. Translators: Both %s will be the account separator character; the
#. resulting string is a demonstration how the account separator
#. character will look like. You can replace these three account
@@ -9314,11 +9504,11 @@
msgid "Income%sSalary%sTaxable"
msgstr "Erträge%sEinkommen%szu versteuern"
-#: ../src/gnome-utils/dialog-transfer.c:448
+#: ../src/gnome-utils/dialog-transfer.c:449
msgid "Show the income and expense accounts"
msgstr "Anzeige der Ertrags- und Aufwand-Konten"
-#: ../src/gnome-utils/dialog-transfer.c:1356
+#: ../src/gnome-utils/dialog-transfer.c:1357
msgid ""
"You must specify an account to transfer from, or to, or both, for this "
"transaction. Otherwise, it will not be recorded."
@@ -9326,11 +9516,11 @@
"Sie müssen ein Konto angeben, zu dem oder von dem umgebucht werden soll. "
"Andernfalls wird kein Buchungssatz gespeichert."
-#: ../src/gnome-utils/dialog-transfer.c:1366
+#: ../src/gnome-utils/dialog-transfer.c:1367
msgid "You can't transfer from and to the same account!"
msgstr "Herkunfts- und Zielkonto können nicht identisch sein."
-#: ../src/gnome-utils/dialog-transfer.c:1392
+#: ../src/gnome-utils/dialog-transfer.c:1393
msgid ""
"You can't transfer from a non-currency account. Try reversing the \"from\" "
"and \"to\" accounts and making the \"amount\" negative."
@@ -9339,56 +9529,56 @@
"normaler Währung. Sie sollten Sie die Von/Nach-Konten vertauschen und den "
"Betrag negativ eingeben."
-#: ../src/gnome-utils/dialog-transfer.c:1417
+#: ../src/gnome-utils/dialog-transfer.c:1418
msgid "You must enter an amount to transfer."
msgstr "Sie müssen einen Betrag angeben."
-#: ../src/gnome-utils/dialog-transfer.c:1432
+#: ../src/gnome-utils/dialog-transfer.c:1433
msgid "You must enter a valid price."
msgstr "Sie müssen einen gültigen Preis angeben."
-#: ../src/gnome-utils/dialog-transfer.c:1444
+#: ../src/gnome-utils/dialog-transfer.c:1445
msgid "You must enter a valid `to' amount."
msgstr "Sie müssen einen gültigen Betrag eingeben."
-#: ../src/gnome-utils/dialog-transfer.c:1738
+#: ../src/gnome-utils/dialog-transfer.c:1740
msgid "Debit Account"
msgstr "Sollkonto"
-#: ../src/gnome-utils/dialog-transfer.c:1755
+#: ../src/gnome-utils/dialog-transfer.c:1757
msgid "Transfer From"
msgstr "Herkunftskonto"
-#: ../src/gnome-utils/dialog-transfer.c:1759
+#: ../src/gnome-utils/dialog-transfer.c:1761
msgid "Transfer To"
msgstr "Buchen nach"
-#: ../src/gnome-utils/dialog-transfer.c:1820
+#: ../src/gnome-utils/dialog-transfer.c:1822
msgid "Debit Amount:"
msgstr "Soll Betrag:"
-#: ../src/gnome-utils/dialog-transfer.c:1824
-#: ../src/gnome-utils/glade/transfer.glade.h:14
+#: ../src/gnome-utils/dialog-transfer.c:1826
+#: ../src/gnome-utils/glade/transfer.glade.h:13
msgid "To Amount:"
msgstr "zum Betrag:"
-#: ../src/gnome-utils/dialog-utils.c:959
+#: ../src/gnome-utils/dialog-utils.c:955
msgid "Remember and don't _ask me again."
msgstr "_Antwort speichern und nicht wieder anzeigen."
-#: ../src/gnome-utils/dialog-utils.c:960
+#: ../src/gnome-utils/dialog-utils.c:956
msgid "Don't _tell me again."
msgstr "_Nicht wieder anzeigen."
-#: ../src/gnome-utils/dialog-utils.c:963
+#: ../src/gnome-utils/dialog-utils.c:959
msgid "Remember and don't ask me again this _session."
msgstr "Antwort speichern und in _dieser Sitzung nicht wieder anzeigen."
-#: ../src/gnome-utils/dialog-utils.c:964
+#: ../src/gnome-utils/dialog-utils.c:960
msgid "Don't tell me again this _session."
msgstr "In dieser _Sitzung nicht wieder anzeigen."
-#: ../src/gnome-utils/druid-gconf-setup.c:403
+#: ../src/gnome-utils/druid-gconf-setup.c:409
msgid ""
"When you click Apply, GnuCash will modify your ~/.gconf.path file and "
"restart the gconf backend."
@@ -9396,7 +9586,7 @@
"Wenn Sie »Anwenden« klicken, wird GnuCash Ihre ~/.gconf.path Datei anpassen "
"und den gconf-Server neu starten."
-#: ../src/gnome-utils/druid-gconf-setup.c:406
+#: ../src/gnome-utils/druid-gconf-setup.c:412
#, c-format
msgid ""
"When you click Apply, GnuCash will install the gconf data into your local ~/."
@@ -9407,7 +9597,7 @@
"gconf Datei schreiben und den gconf-Server neu starten. Das Skript %s muss "
"dazu in Ihrem Suchpfad zu finden sein, damit dies korrekt funktioniert."
-#: ../src/gnome-utils/druid-gconf-setup.c:410
+#: ../src/gnome-utils/druid-gconf-setup.c:416
msgid ""
"You have chosen to correct the problem by yourself. When you click Apply, "
"GnuCash will exit. Please correct the problem and restart the gconf backend "
@@ -9421,7 +9611,7 @@
"dem Kommando »gconftool-2 --shutdown«. Sie können noch den Knopf »Zurück« "
"klicken, um den notwendigen Text zu kopieren."
-#: ../src/gnome-utils/druid-gconf-setup.c:416
+#: ../src/gnome-utils/druid-gconf-setup.c:422
#, c-format
msgid ""
"You have chosen to correct the problem by yourself. When you click Apply, "
@@ -9432,7 +9622,7 @@
"klicken, wird sich GnuCash beenden. Bitte starten Sie das Skript %s was die "
"notwendigen Daten schreibt und den gconf-Server neu startet."
-#: ../src/gnome-utils/druid-gconf-setup.c:420
+#: ../src/gnome-utils/druid-gconf-setup.c:426
msgid ""
"You have already corrected the problem and restarted the gconf backend with "
"the command 'gconftool-2 --shutdown'. When you click Apply, GnuCash will "
@@ -9444,21 +9634,24 @@
#: ../src/gnome-utils/druid-gnc-xml-import.c:189
msgid ""
-"The file you tried to load does not specify an encoding, so GnuCash is "
-"unable to unambiguously interpret it. This is typical for files created with "
-"GnuCash prior to 2.0.\n"
+"The file you are trying to load is from an older version of GnuCash. The "
+"file format in the older versions was missing the detailed specification of "
+"the character encoding being used. This means the text in your data file "
+"could be read in multiple ambiguous ways. This ambiguity cannot be resolved "
+"automatically, but the new GnuCash 2.0.0 file format will include all "
+"necessary specifications so that you do not have to go through this step "
+"again.\n"
"\n"
-"On the next page you will be asked to select the best looking decoded string "
-"for every ambiguous word GnuCash found while trying to open your file. "
-"Therefore GnuCash has guessed what encodings you might have used. So "
-"probably everything will look just fine and you can simply click 'Forward'.\n"
+"GnuCash will try to guess the correct character encoding for your data file. "
+"On the next page GnuCash will show the resulting texts when using this "
+"guess. You have to check whether the words look as expected. Either "
+"everything looks fine and you can simply press 'Forward'. Or the words "
+"contain unexpected characters, in which case you should select different "
+"character encodings to see different results. You may have to edit the list "
+"of character encodings by clicking on the respective button.\n"
"\n"
-"If it does not work for you, try to change the default encoding at the top. "
-"Maybe you even have to edit the list of encodings by clicking on the button "
-"in the top right corner.\n"
-"\n"
-"The page is not overly complicated, just take the time until you feel "
-"comfortable with it. You can always come back and read this message again."
+"Press 'Forward' now to select the correct character encoding for your data "
+"file."
msgstr ""
"Die zu öffnende Datei enthält keine Angaben zu der verwendeten "
"Zeichenkodierung. Dies ist bei allen Dateien der GnuCash-Version 1.9 oder "
@@ -9482,11 +9675,11 @@
"\n"
"Klicken Sie nun »Vor«."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:203
-msgid "Missing file encoding"
+#: ../src/gnome-utils/druid-gnc-xml-import.c:209
+msgid "Ambiguous character encoding"
msgstr "Zeichenkodierung der Datei unbekannt"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:206
+#: ../src/gnome-utils/druid-gnc-xml-import.c:212
msgid ""
"The file has been loaded successfully. If you click 'Apply' it will be saved "
"and reloaded into the main application. That way you will have a working "
@@ -9500,153 +9693,153 @@
"\n"
"Wenn Sie die Einstellungen noch ändern möchten, können Sie »Zurück« klicken."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:228
+#: ../src/gnome-utils/druid-gnc-xml-import.c:234
msgid "Unicode"
msgstr "Unicode"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:230
+#: ../src/gnome-utils/druid-gnc-xml-import.c:236
msgid "European"
msgstr "Europäisch"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:231
+#: ../src/gnome-utils/druid-gnc-xml-import.c:237
msgid "ISO-8859-1 (West European)"
msgstr "ISO-8859-1 (Westeuropäisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:232
+#: ../src/gnome-utils/druid-gnc-xml-import.c:238
msgid "ISO-8859-2 (East European)"
msgstr "ISO-8859-2 (Osteuropäisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:233
+#: ../src/gnome-utils/druid-gnc-xml-import.c:239
msgid "ISO-8859-3 (South European)"
msgstr "ISO-8859-3 (Südeuropäisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:234
+#: ../src/gnome-utils/druid-gnc-xml-import.c:240
msgid "ISO-8859-4 (North European)"
msgstr "ISO-8859-4 (Nordeuropäisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:235
+#: ../src/gnome-utils/druid-gnc-xml-import.c:241
msgid "ISO-8859-5 (Cyrillic)"
msgstr "ISO-8859-5 (Kyrillisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:236
+#: ../src/gnome-utils/druid-gnc-xml-import.c:242
msgid "ISO-8859-6 (Arabic)"
msgstr "ISO-8859-6 (Arabisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:237
+#: ../src/gnome-utils/druid-gnc-xml-import.c:243
msgid "ISO-8859-7 (Greek)"
msgstr "ISO-8859-7 (Griechisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:238
+#: ../src/gnome-utils/druid-gnc-xml-import.c:244
msgid "ISO-8859-8 (Hebrew)"
msgstr "ISO-8859-8 (Hebräisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:239
+#: ../src/gnome-utils/druid-gnc-xml-import.c:245
msgid "ISO-8859-9 (Turkish)"
msgstr "ISO-8859-9 (Türkisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:240
+#: ../src/gnome-utils/druid-gnc-xml-import.c:246
msgid "ISO-8859-10 (Nordic)"
msgstr "ISO-8859-10 (Skandinavisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:241
+#: ../src/gnome-utils/druid-gnc-xml-import.c:247
msgid "ISO-8859-11 (Thai)"
msgstr "ISO-8859-11 (Thai)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:242
+#: ../src/gnome-utils/druid-gnc-xml-import.c:248
msgid "ISO-8859-13 (Baltic)"
msgstr "ISO-8859-13 (Baltisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:243
+#: ../src/gnome-utils/druid-gnc-xml-import.c:249
msgid "ISO-8859-14 (Celtic)"
msgstr "ISO-8859-14 (Keltisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:244
+#: ../src/gnome-utils/druid-gnc-xml-import.c:250
msgid "ISO-8859-15 (West European, Euro sign)"
msgstr "ISO-8859-15 (Westeuropäisch, Euro-Zeichen)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:245
+#: ../src/gnome-utils/druid-gnc-xml-import.c:251
msgid "ISO-8859-16 (South-East European)"
msgstr "ISO-8859-16 (Südost-Europäisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:246
+#: ../src/gnome-utils/druid-gnc-xml-import.c:252
msgid "Cyrillic"
msgstr "Kyrillisch"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:247
+#: ../src/gnome-utils/druid-gnc-xml-import.c:253
msgid "KOI8-R (Russian)"
msgstr "KOI8-R (Russisch)"
-#: ../src/gnome-utils/druid-gnc-xml-import.c:248
+#: ../src/gnome-utils/druid-gnc-xml-import.c:254
msgid "KOI8-U (Ukrainian)"
msgstr "KOI8-U (Ukraninisch)"
#. Translators: Please insert encodings here that are typically used in your
#. * locale, separated by spaces. No need for ASCII or UTF-8, check `locale -m`
#. * for assistance with spelling.
-#: ../src/gnome-utils/druid-gnc-xml-import.c:571
+#: ../src/gnome-utils/druid-gnc-xml-import.c:577
msgid "ISO-8859-1 KOI8-U"
msgstr "ISO-8859-1 ISO-8859-15"
#. another error, cannot handle this here
-#: ../src/gnome-utils/druid-gnc-xml-import.c:692
-#: ../src/gnome-utils/druid-gnc-xml-import.c:711
-msgid "The file could not be reopen."
+#: ../src/gnome-utils/druid-gnc-xml-import.c:698
+#: ../src/gnome-utils/druid-gnc-xml-import.c:717
+msgid "The file could not be reopened."
msgstr "Die Datei konnte nicht neu geöffnet werden."
#. try to load once again
-#: ../src/gnome-utils/druid-gnc-xml-import.c:699
-#: ../src/gnome-utils/gnc-file.c:746 ../src/gnome-utils/gnc-file.c:758
+#: ../src/gnome-utils/druid-gnc-xml-import.c:705
+#: ../src/gnome-utils/gnc-file.c:748 ../src/gnome-utils/gnc-file.c:760
msgid "Reading file..."
msgstr "Datei wird gelesen..."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:719
+#: ../src/gnome-utils/druid-gnc-xml-import.c:725
msgid "Parsing file..."
msgstr "Datei wird verarbeitet..."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:726
+#: ../src/gnome-utils/druid-gnc-xml-import.c:732
msgid "There was an error parsing the file."
msgstr "Beim Verarbeiten der Datei ist ein Fehler aufgetreten."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:749
-#: ../src/gnome-utils/gnc-file.c:972
+#: ../src/gnome-utils/druid-gnc-xml-import.c:755
+#: ../src/gnome-utils/gnc-file.c:970
msgid "Writing file..."
msgstr "Datei wird geschrieben..."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:827
+#: ../src/gnome-utils/druid-gnc-xml-import.c:833
#, c-format
msgid "There are %d unassigned and %d undecodable words. Please add encodings."
msgstr ""
"Es gibt %d nicht zugewiesene und %d nicht dekodierbare Worte. Bitte wählen "
"Sie jeweils eine Zeichenkodierung aus."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:833
+#: ../src/gnome-utils/druid-gnc-xml-import.c:839
#, c-format
msgid "There are %d unassigned words. Please decide on them or add encodings."
msgstr ""
"Es gibt %d nicht zugewiesene Worte. Bitte wählen Sie jeweils einen der "
"Wortvorschläge oder wählen eine Zeichenkodierung."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:841
+#: ../src/gnome-utils/druid-gnc-xml-import.c:847
#, c-format
msgid "There are %d undecodable words. Please add encodings."
msgstr ""
"Es gibt %d nicht dekodierbare Worte. Bitte wählen Sie eine Zeichenkodierung "
"aus."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1029
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1035
msgid "That GnuCash XML file is already loaded. Please select another file."
msgstr ""
"Diese GnuCash-Datei ist bereits geöffnet. Bitte wählen Sie eine andere Datei."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1330
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1336
msgid "This encoding has been added to the list already."
msgstr "Diese Zeichenkodierung existiert bereits in der Liste."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1340
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1346
msgid "This is an invalid encoding."
msgstr "Dies ist keine gültige Zeichenkodierung."
-#: ../src/gnome-utils/druid-gnc-xml-import.c:1475
+#: ../src/gnome-utils/druid-gnc-xml-import.c:1481
msgid "No files to merge. Please add ones by clicking on 'Load another file'."
msgstr ""
"Keine Dateien, die zusammengefügt werden können. Bitte wählen Sie welche, "
@@ -9700,32 +9893,22 @@
"entsprechen, inklusive Groß/Kleinschreibung."
#: ../src/gnome-utils/glade/commodity.glade.h:8
-msgid ""
-"Enter the type of commodity. For stocks, this is often an exchange on which "
-"the stock is traded. You can choose an existing type from the list or enter "
-"a new type with the keyboard."
-msgstr ""
-"Geben Sie den Typ der Währung/Aktie an. Für Aktien ist dies in der Regel die "
-"Börse, an der die Aktie gehandelt wird. Sie können einen Typ aus der Liste "
-"auswählen oder einen neuen Typ eingeben."
-
-#: ../src/gnome-utils/glade/commodity.glade.h:9
msgid "F_raction traded:"
msgstr "_Handelbare Stückelung:"
-#: ../src/gnome-utils/glade/commodity.glade.h:10
+#: ../src/gnome-utils/glade/commodity.glade.h:9
msgid "Select security/currency "
msgstr "Bitte wählen Sie die Aktie/Währung"
-#: ../src/gnome-utils/glade/commodity.glade.h:11
+#: ../src/gnome-utils/glade/commodity.glade.h:10
msgid "Select user information here..."
msgstr "Benutzerinformationen hier wählen..."
-#: ../src/gnome-utils/glade/commodity.glade.h:12
+#: ../src/gnome-utils/glade/commodity.glade.h:11
msgid "Si_ngle:"
msgstr "_Einzel:"
-#: ../src/gnome-utils/glade/commodity.glade.h:13
+#: ../src/gnome-utils/glade/commodity.glade.h:12
msgid ""
"These are F::Q quote sources that retrieve information from a single site on "
"the internet. If that site is unavailable, you will not be able to retrieve "
@@ -9735,7 +9918,7 @@
"einzigen Webseite im Internet ab. Falls diese Webseite nicht verfügbar ist, "
"können Sie keine Kurse abrufen."
-#: ../src/gnome-utils/glade/commodity.glade.h:14
+#: ../src/gnome-utils/glade/commodity.glade.h:13
msgid ""
"These are F::Q quote sources that retrieve information from multiple sites "
"on the internet. If one of the sites is unavailable, F::Q will attempt to "
@@ -9745,7 +9928,7 @@
"Internetseiten ab. Wenn eine Seite nicht verfügbar ist, versucht Finance::"
"Quote, von den anderen Seiten abzurufen."
-#: ../src/gnome-utils/glade/commodity.glade.h:15
+#: ../src/gnome-utils/glade/commodity.glade.h:14
msgid ""
"These are quote sources that were recently added to F::Q. GnuCash does not "
"know if these sources retrieve information from a single site or from "
@@ -9755,35 +9938,35 @@
"nicht bekannt, ob diese Kursquellen von einer oder mehreren Internetseiten "
"ihre Informationen beziehen."
-#: ../src/gnome-utils/glade/commodity.glade.h:16
+#: ../src/gnome-utils/glade/commodity.glade.h:15
msgid "Time_zone:"
msgstr "_Zeitzone"
-#: ../src/gnome-utils/glade/commodity.glade.h:17
+#: ../src/gnome-utils/glade/commodity.glade.h:16
msgid "Type of quote source:"
msgstr "Art der Kursabruf-Quelle:"
-#: ../src/gnome-utils/glade/commodity.glade.h:18
+#: ../src/gnome-utils/glade/commodity.glade.h:17
msgid "Warning: Finance::Quote not installed properly."
msgstr "Warnung: Modul Finance::Quote ist nicht korrekt installiert."
-#: ../src/gnome-utils/glade/commodity.glade.h:19
+#: ../src/gnome-utils/glade/commodity.glade.h:18
msgid "_Full name:"
msgstr "_Voller Name:"
-#: ../src/gnome-utils/glade/commodity.glade.h:20
+#: ../src/gnome-utils/glade/commodity.glade.h:19
msgid "_Get Online Quotes"
msgstr "_Börsenkurse online abrufen"
-#: ../src/gnome-utils/glade/commodity.glade.h:21
+#: ../src/gnome-utils/glade/commodity.glade.h:20
msgid "_Multiple:"
msgstr "_Mehrere Kursquellen"
-#: ../src/gnome-utils/glade/commodity.glade.h:22
+#: ../src/gnome-utils/glade/commodity.glade.h:21
msgid "_Symbol/abbreviation:"
msgstr "_Symbol/Abkürzung:"
-#: ../src/gnome-utils/glade/commodity.glade.h:24
+#: ../src/gnome-utils/glade/commodity.glade.h:23
msgid "_Unknown:"
msgstr "_Unbekannt:"
@@ -10010,7 +10193,7 @@
"this if you have saved your accounts to separate GnuCash files.\n"
"\n"
"Click \"Forward\" to finish loading files and move to the next step of the "
-"GnuCash XML import process."
+"GnuCash Datafile import process."
msgstr ""
"Wenn Sie jetzt noch mehr Dateien importieren möchten, klicken Sie bitte "
"»Eine andere Datei laden«. Das ist insbesondere sinnvoll, wenn Sie Ihre "
@@ -10036,24 +10219,24 @@
msgstr "Die Liste der Zeichenkodierungen bearbeiten"
#: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:12
-msgid "Finish GnuCash XML Import"
+msgid "Finish GnuCash Datafile Import"
msgstr "GnuCash-Datei Import abschließen"
#: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:13
-msgid "GnuCash XML Import Druid"
+msgid "GnuCash Datafile Import Druid"
msgstr "GnuCash-Datei Import-Assistent"
#: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:14
-msgid "GnuCash XML files you have loaded"
+msgid "GnuCash data files you have loaded"
msgstr "GnuCash-Dateien, die Sie geladen haben"
#: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:15
-#: ../src/import-export/qif-import/qif.glade.h:48
+#: ../src/import-export/qif-import/qif.glade.h:42
msgid "Load another file"
msgstr "Eine weitere Datei öffnen"
#: ../src/gnome-utils/glade/druid-gnc-xml-import.glade.h:16
-#: ../src/import-export/qif-import/qif.glade.h:94
+#: ../src/import-export/qif-import/qif.glade.h:84
msgid "Unload selected file"
msgstr "Gewählte Datei wieder entladen"
@@ -10114,37 +10297,37 @@
msgid "%Y-%m-%d"
msgstr "%Y-%m-%d"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:4
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:3
msgid "Abbreviation"
msgstr "Abkürzung"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:5
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:4
msgid "Date format:"
msgstr "Datumsformat:"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:6
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:5
msgid "December 31, 2000"
msgstr "December 31, 2000"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:7
-#: ../src/import-export/generic-import.glade.h:32
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:6
+#: ../src/import-export/generic-import.glade.h:28
msgid "Format:"
msgstr "Format:"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:8
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:7
msgid "Include Century"
msgstr "Jahrhundert angeben"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:9
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:8
msgid "Months:"
msgstr "Monate:"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:12
-#: ../src/gnome-utils/glade/preferences.glade.h:88
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:11
+#: ../src/gnome-utils/glade/preferences.glade.h:96
msgid "Sample:"
msgstr "Beispiel:"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:13
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:12
msgid ""
"US (12/31/2001)\n"
"UK (31/12/2001)\n"
@@ -10162,7 +10345,7 @@
"Länderspezifisch (Locale)\n"
"Benutzerdefiniert\n"
-#: ../src/gnome-utils/glade/gnc-date-format.glade.h:21
+#: ../src/gnome-utils/glade/gnc-date-format.glade.h:20
msgid "Years:"
msgstr "Jahre:"
@@ -10187,20 +10370,20 @@
msgstr "Mit 'Eingabe' gehen Sie zur leeren Buchung"
#: ../src/gnome-utils/glade/preferences.glade.h:2
-msgid "07/31/05"
-msgstr "07/31/05"
+msgid "07/31/2005"
+msgstr "07/31/2005"
#: ../src/gnome-utils/glade/preferences.glade.h:3
msgid "2005-07-31"
msgstr "2005-07-31"
#: ../src/gnome-utils/glade/preferences.glade.h:4
-msgid "31.07.05"
-msgstr "31.07.05"
+msgid "31.07.2005"
+msgstr "31.07.2005"
#: ../src/gnome-utils/glade/preferences.glade.h:5
-msgid "31/07/05"
-msgstr "31/07/05"
+msgid "31/07/2005"
+msgstr "31/07/2005"
#: ../src/gnome-utils/glade/preferences.glade.h:6
#: ../src/import-export/generic-import.glade.h:5
@@ -10208,102 +10391,112 @@
msgstr "<b>Aktionen</b>"
#: ../src/gnome-utils/glade/preferences.glade.h:7
+#, fuzzy
+msgid "<b>Close Button</b>"
+msgstr "<b>Farben</b>"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:8
msgid "<b>Date Format</b>"
msgstr "<b>Datum</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:8
+#: ../src/gnome-utils/glade/preferences.glade.h:9
msgid "<b>Default Currency</b>"
msgstr "<b>Standardwährung</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:9
+#: ../src/gnome-utils/glade/preferences.glade.h:10
msgid "<b>Default Report Currency</b>"
msgstr "<b>Standardwährung für Berichte</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:10
+#: ../src/gnome-utils/glade/preferences.glade.h:11
msgid "<b>Default Style</b>"
msgstr "<b>Voreinstellung Buchungsansicht</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:11
+#: ../src/gnome-utils/glade/preferences.glade.h:12
msgid "<b>End Date</b>"
msgstr "<b>Enddatum</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:12
+#: ../src/gnome-utils/glade/preferences.glade.h:13
msgid "<b>Fancy Date Format</b>"
msgstr "<b>Ausführliches Datumsformat</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:13
+#: ../src/gnome-utils/glade/preferences.glade.h:14
msgid "<b>Files</b>"
msgstr "<b>Dateien</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:14
+#: ../src/gnome-utils/glade/preferences.glade.h:15
msgid "<b>General</b>"
msgstr "<b>Allgemein</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:15
+#: ../src/gnome-utils/glade/preferences.glade.h:16
msgid "<b>Graphics</b>"
msgstr "<b>Grafik</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:16
+#: ../src/gnome-utils/glade/preferences.glade.h:17
msgid "<b>Labels</b>"
msgstr "<b>Beschriftungen</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:17
+#: ../src/gnome-utils/glade/preferences.glade.h:18
msgid "<b>Location</b>"
msgstr "<b>Position</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:18
+#: ../src/gnome-utils/glade/preferences.glade.h:19
msgid "<b>Numbers</b>"
msgstr "<b>Zahlen</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:19
+#: ../src/gnome-utils/glade/preferences.glade.h:20
msgid "<b>Other Defaults</b>"
msgstr "<b>Andere Voreinstellungen</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:20
+#: ../src/gnome-utils/glade/preferences.glade.h:21
msgid "<b>Reconciling</b>"
msgstr "<b>Kontenabgleich</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:21
+#: ../src/gnome-utils/glade/preferences.glade.h:22
msgid "<b>Reverse Balanced Accounts</b>"
msgstr "<b>Betrags-Vorzeichen umkehren für Kontentypen</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:22
+#: ../src/gnome-utils/glade/preferences.glade.h:23
msgid "<b>Search Dialog</b>"
msgstr "<b>Such-Dialog</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:23
+#: ../src/gnome-utils/glade/preferences.glade.h:24
msgid "<b>Separator Character</b>"
msgstr "<b>Trennzeichen</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:24
+#: ../src/gnome-utils/glade/preferences.glade.h:25
msgid "<b>Start Date</b>"
msgstr "<b>Anfangsdatum</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:25
+#: ../src/gnome-utils/glade/preferences.glade.h:26
msgid "<b>Summarybar Content</b>"
msgstr "<b>Inhalt Zusammenfassungsleiste</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:26
+#: ../src/gnome-utils/glade/preferences.glade.h:27
+#, fuzzy
+msgid "<b>Tab Position</b>"
+msgstr "<b>Buchungen</b>"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:28
msgid "<b>Time Format</b>"
msgstr "<b>Zeit</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:27
+#: ../src/gnome-utils/glade/preferences.glade.h:29
msgid "<b>Toolbar Style</b>"
msgstr "<b>Werkzeugleiste</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:28
+#: ../src/gnome-utils/glade/preferences.glade.h:30
msgid "<b>Window Geometry</b>"
msgstr "<b>Fenster-Einstellungen</b>"
-#: ../src/gnome-utils/glade/preferences.glade.h:29
+#: ../src/gnome-utils/glade/preferences.glade.h:31
msgid "Ab_solute:"
msgstr "Ab_solut:"
-#: ../src/gnome-utils/glade/preferences.glade.h:30
+#: ../src/gnome-utils/glade/preferences.glade.h:32
msgid "Accounting Period"
msgstr "Buchführungsperioden"
-#: ../src/gnome-utils/glade/preferences.glade.h:32
+#: ../src/gnome-utils/glade/preferences.glade.h:34
msgid ""
"After reconciling a credit card statement, prompt the user to enter a credit "
"card payment."
@@ -10311,13 +10504,13 @@
"Nach Abgleich einer Kreditkartenrechnung eine Ãœberweisung zum Bezahlen "
"vorschlagen."
-#: ../src/gnome-utils/glade/preferences.glade.h:33
+#: ../src/gnome-utils/glade/preferences.glade.h:35
msgid "All transactions are expanded to show all splits."
msgstr ""
"Alle Buchungen werden vollständig angezeigt, so dass alle Buchungszeilen "
"sichtbar sind."
-#: ../src/gnome-utils/glade/preferences.glade.h:34
+#: ../src/gnome-utils/glade/preferences.glade.h:36
msgid ""
"Alternate the primary and secondary colors by transaction instead of by "
"alternating by row."
@@ -10325,15 +10518,15 @@
"Im Zweizeilenstil Farben nur mit jedem Buchungssatz abwechseln, anstatt mit "
"jeder Zeile."
-#: ../src/gnome-utils/glade/preferences.glade.h:35
+#: ../src/gnome-utils/glade/preferences.glade.h:37
msgid "Automatic _interest transfer"
msgstr "Automatische _Zinsbuchungen"
-#: ../src/gnome-utils/glade/preferences.glade.h:36
+#: ../src/gnome-utils/glade/preferences.glade.h:38
msgid "Automatic credit card _payment"
msgstr "Automatische _Kreditkartenbezahlungen"
-#: ../src/gnome-utils/glade/preferences.glade.h:37
+#: ../src/gnome-utils/glade/preferences.glade.h:39
msgid ""
"Automatically expand the current transaction to show all splits. All other "
"transactions are shown on one line. (Two in double line mode.)"
@@ -10342,7 +10535,7 @@
"Alle anderen Buchungen werden einzeilig angezeigt. (Bzw. zweizeilig, wenn "
"die Bemerkung angezeigt werden soll.)"
-#: ../src/gnome-utils/glade/preferences.glade.h:38
+#: ../src/gnome-utils/glade/preferences.glade.h:40
msgid ""
"Automatically insert a decimal point into values that are entered without "
"one."
@@ -10350,115 +10543,140 @@
"Automatisches Einfügen eines Kommas, sobald Werte ohne Komma eingegeben "
"werden. (Z.B. '2000' wird zu '20,00'.)"
-#: ../src/gnome-utils/glade/preferences.glade.h:39
+#: ../src/gnome-utils/glade/preferences.glade.h:41
msgid "Automatically raise the list of accounts or actions during input."
msgstr ""
"Automatisches Öffnen der Konten- oder Auswahlliste während der Eingabe."
-#: ../src/gnome-utils/glade/preferences.glade.h:40
+#: ../src/gnome-utils/glade/preferences.glade.h:42
+#, fuzzy
+msgid "B_ottom"
+msgstr "_Drehung"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:43
msgid "C_redit accounts"
msgstr "_Habenkonten"
-#: ../src/gnome-utils/glade/preferences.glade.h:41
+#: ../src/gnome-utils/glade/preferences.glade.h:44
msgid "Ch_oose:"
msgstr "_Auswahl:"
-#: ../src/gnome-utils/glade/preferences.glade.h:42
+#: ../src/gnome-utils/glade/preferences.glade.h:45
msgid "Character:"
msgstr "Zeichen:"
-#: ../src/gnome-utils/glade/preferences.glade.h:43
+#: ../src/gnome-utils/glade/preferences.glade.h:46
msgid "Check cleared _transactions"
msgstr "Bestätigte Buchungen automatisch abgleichen"
-#: ../src/gnome-utils/glade/preferences.glade.h:44
+#: ../src/gnome-utils/glade/preferences.glade.h:47
msgid "Com_press files"
msgstr "Datei _komprimieren"
-#: ../src/gnome-utils/glade/preferences.glade.h:45
+#: ../src/gnome-utils/glade/preferences.glade.h:48
msgid "Compress the data file with gzip when saving it to disk."
msgstr "Die Datei mit den Kontodaten mit gzip komprimiert speichern."
-#: ../src/gnome-utils/glade/preferences.glade.h:46
+#: ../src/gnome-utils/glade/preferences.glade.h:49
msgid "Date/Time"
msgstr "Datum und Zeit"
-#: ../src/gnome-utils/glade/preferences.glade.h:48
+#: ../src/gnome-utils/glade/preferences.glade.h:51
msgid "Delete old log/backup files after this many days (0 = never)."
msgstr "Alte Log/Sicherungsdateien nach so vielen Tagen löschen (0 = niemals)."
-#: ../src/gnome-utils/glade/preferences.glade.h:49
+#: ../src/gnome-utils/glade/preferences.glade.h:52
msgid "Display \"_tip of the day\" dialog"
msgstr "Anzeigen des »Tipp des Tages«"
-#: ../src/gnome-utils/glade/preferences.glade.h:50
+#: ../src/gnome-utils/glade/preferences.glade.h:53
msgid "Display hints for using GnuCash at startup"
msgstr "Anzeigen von Hinweisen beim Start von GnuCash"
-#: ../src/gnome-utils/glade/preferences.glade.h:51
+#: ../src/gnome-utils/glade/preferences.glade.h:54
msgid "Display ne_gative amounts in red"
msgstr "Negative Beträge in rot anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:53
+#: ../src/gnome-utils/glade/preferences.glade.h:56
+#, fuzzy
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "Zur freien Zeile am Ende dieser Rechnung gehen"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:57
+msgid "Display the notebook tabs at the left of the window."
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:58
+msgid "Display the notebook tabs at the right of the window."
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:59
+msgid "Display the notebook tabs at the top of the window."
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:60
msgid "Display this many rows when a register is created."
msgstr ""
"Anzahl der Zeilen, die beim Öffnen eines neuen Kontofensters angezeigt "
"werden."
-#: ../src/gnome-utils/glade/preferences.glade.h:54
+#: ../src/gnome-utils/glade/preferences.glade.h:61
msgid "Display toolbar items as icons only."
msgstr "Nur Icons in der Werkzeugleiste anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:55
+#: ../src/gnome-utils/glade/preferences.glade.h:62
msgid "Display toolbar items as text only."
msgstr "Nur Texte in der Werkzeugleiste anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:56
+#: ../src/gnome-utils/glade/preferences.glade.h:63
msgid ""
"Display toolbar items with the text label below the icon. Labels are show "
"for all items."
msgstr ""
-"Unterhalb jedes Icons in der Werkzeugleiste seine Beschreibung anzeigen"
+"Unterhalb jedes Icons in der Werkzeugleiste seine Beschreibung anzeigen. "
+"Beschreibungen werden für alle Icons angezeigt."
-#: ../src/gnome-utils/glade/preferences.glade.h:57
+#: ../src/gnome-utils/glade/preferences.glade.h:64
msgid ""
"Display toolbar items with the text label beside the icon. Labels are only "
-"shown for the most frequently used items."
-msgstr "Neben jedem Icon in der Werkzeugleiste seine Beschreibung anzeigen"
+"shown for the most important items."
+msgstr ""
+"Neben jedem Icon in der Werkzeugleiste seine Beschreibung anzeigen. "
+"Beschreibungen werden aber nur für die wichtigsten Icons angezeigt."
-#: ../src/gnome-utils/glade/preferences.glade.h:58
+#: ../src/gnome-utils/glade/preferences.glade.h:65
msgid "Don't sign reverse any accounts."
msgstr "Keine Vorzeichenumkehr"
-#: ../src/gnome-utils/glade/preferences.glade.h:59
+#: ../src/gnome-utils/glade/preferences.glade.h:66
msgid "Double _mode colors alternate with transactions"
msgstr "Zweizeilenstil: Farben abwechselnd pro Buchungssatz"
-#: ../src/gnome-utils/glade/preferences.glade.h:60
+#: ../src/gnome-utils/glade/preferences.glade.h:67
msgid "Draw _vertical lines between columns"
msgstr "_Vertikale Linien zwischen Spalten zeichnen"
-#: ../src/gnome-utils/glade/preferences.glade.h:61
+#: ../src/gnome-utils/glade/preferences.glade.h:68
msgid "Draw hori_zontal lines between rows"
msgstr "_Horizontale Linien zwischen Zeilen zeichnen"
-#: ../src/gnome-utils/glade/preferences.glade.h:62
+#: ../src/gnome-utils/glade/preferences.glade.h:69
msgid "Enables support for the European Union EURO currency."
msgstr "Aktiviert die Unterstützung der Währung EURO"
-#: ../src/gnome-utils/glade/preferences.glade.h:64
+#: ../src/gnome-utils/glade/preferences.glade.h:71
msgid "GnuCash Options"
msgstr "GnuCash Optionen"
-#: ../src/gnome-utils/glade/preferences.glade.h:65
+#: ../src/gnome-utils/glade/preferences.glade.h:72
msgid "GnuCash Preferences"
msgstr "GnuCash Einstellungen"
-#: ../src/gnome-utils/glade/preferences.glade.h:66
+#: ../src/gnome-utils/glade/preferences.glade.h:73
msgid "How many automatic decimal places will be filled in."
msgstr "Wieviele Dezimalstellen automatisch ausgefüllt werden."
-#: ../src/gnome-utils/glade/preferences.glade.h:67
+#: ../src/gnome-utils/glade/preferences.glade.h:74
msgid ""
"If checked, each register will be opened in its own top level window. If "
"clear, the register will be opened in the current window."
@@ -10467,7 +10685,7 @@
"Wenn nicht aktiviert, wird jedes Kontofenster als Karteikarte im aktuellen "
"Fenster geöffnet."
-#: ../src/gnome-utils/glade/preferences.glade.h:68
+#: ../src/gnome-utils/glade/preferences.glade.h:75
msgid ""
"If checked, each report will be opened in its own top level window. If "
"clear, the report will be opened in the current window."
@@ -10475,7 +10693,7 @@
"Falls angeklickt wird jeder Bericht in einem neuen Top-Level-Fenster "
"angezeigt. Ansonsten wird er in dem aktuellen Fenster geöffnet."
-#: ../src/gnome-utils/glade/preferences.glade.h:69
+#: ../src/gnome-utils/glade/preferences.glade.h:76
msgid ""
"If checked, non-currency commodities will be shown in the summary bar. If "
"clear, only currencies will be shown."
@@ -10483,7 +10701,7 @@
"Wenn aktiviert, werden Aktien in der Zusammenfassungs-Zeile angezeigt, die "
"keine Währungen sind. Wenn nicht aktiviert, werden nur Währungen angezeigt."
-#: ../src/gnome-utils/glade/preferences.glade.h:70
+#: ../src/gnome-utils/glade/preferences.glade.h:77
msgid ""
"If checked, pressing the 'Enter' key will move to the blank transaction at "
"the bottom of the register. If clear, pressing the 'Enter' key will move "
@@ -10492,7 +10710,7 @@
"Wenn aktiviert, nach Drücken von 'Eingabe' zum leeren Buchungssatz gehen. "
"Ansonsten nur eine Zeile nach unten gehen."
-#: ../src/gnome-utils/glade/preferences.glade.h:71
+#: ../src/gnome-utils/glade/preferences.glade.h:78
msgid ""
"If checked, the system color theme will be applied to register windows. If "
"clear, the original GnuCash register colors will be used."
@@ -10501,35 +10719,35 @@
"Kontofenstern verwendet. Wenn nicht aktiviert, werden GnuCash-spezifische "
"Farben in den Kontofenstern verwendet."
-#: ../src/gnome-utils/glade/preferences.glade.h:72
+#: ../src/gnome-utils/glade/preferences.glade.h:79
msgid "Include _grand total"
msgstr "_Gesamtsumme anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:73
+#: ../src/gnome-utils/glade/preferences.glade.h:80
msgid "Include _non-currency totals"
msgstr "_Aktien-Gesamtsumme anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:74
+#: ../src/gnome-utils/glade/preferences.glade.h:81
msgid "Loc_ale:"
msgstr "_Systemeinstellung:"
-#: ../src/gnome-utils/glade/preferences.glade.h:75
+#: ../src/gnome-utils/glade/preferences.glade.h:82
msgid "New search _limit:"
msgstr "Ergebnisanzahl für Neue Suche:"
-#: ../src/gnome-utils/glade/preferences.glade.h:77
+#: ../src/gnome-utils/glade/preferences.glade.h:84
msgid "Number of _transactions:"
msgstr "Anzahl Buchungen:"
-#: ../src/gnome-utils/glade/preferences.glade.h:78
+#: ../src/gnome-utils/glade/preferences.glade.h:85
msgid "Perform account list _setup on new file"
msgstr "Konteneinrichtung bei neuer Datei"
-#: ../src/gnome-utils/glade/preferences.glade.h:79
+#: ../src/gnome-utils/glade/preferences.glade.h:86
msgid "Pre-check cleared transactions when creating a reconcile dialog."
msgstr "Bestätigte Buchungen automatisch als Abgeglichen markieren."
-#: ../src/gnome-utils/glade/preferences.glade.h:80
+#: ../src/gnome-utils/glade/preferences.glade.h:87
msgid ""
"Present the new account list dialog when you choose \"New File\" from the "
"\"File\" menu"
@@ -10537,27 +10755,31 @@
"Assistent für neue Konteneinrichtung öffnen, wenn »Neue Datei« im Menü "
"»Datei« gewählt wird"
-#: ../src/gnome-utils/glade/preferences.glade.h:82
+#: ../src/gnome-utils/glade/preferences.glade.h:89
+msgid "Priority text besi_de icons"
+msgstr "Text _neben wichtigen Icons"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:90
msgid "Re_lative:"
msgstr "Re_lativ:"
-#: ../src/gnome-utils/glade/preferences.glade.h:84
+#: ../src/gnome-utils/glade/preferences.glade.h:92
msgid "Register Defaults"
msgstr "Voreinstellungen Kontobuch"
-#: ../src/gnome-utils/glade/preferences.glade.h:85
+#: ../src/gnome-utils/glade/preferences.glade.h:93
msgid "Register opens in a new _window"
msgstr "Kontobuch in neuem Fenster öffnen"
-#: ../src/gnome-utils/glade/preferences.glade.h:86
+#: ../src/gnome-utils/glade/preferences.glade.h:94
msgid "Report opens in a new _window"
msgstr "Bericht in neuem _Fenster öffnen"
-#: ../src/gnome-utils/glade/preferences.glade.h:87
+#: ../src/gnome-utils/glade/preferences.glade.h:95
msgid "Reports"
msgstr "Berichte"
-#: ../src/gnome-utils/glade/preferences.glade.h:89
+#: ../src/gnome-utils/glade/preferences.glade.h:97
msgid ""
"Show a close button on each notebook tab. These function identically to the "
"'Close' menu item."
@@ -10565,28 +10787,37 @@
"Einen Knopf »Schließen« auf jeder Karteikarte anzeigen. Die Schließen-"
"Funktion kann auch im gleichnamigen Menüpunkt erreicht werden."
-#: ../src/gnome-utils/glade/preferences.glade.h:90
+#: ../src/gnome-utils/glade/preferences.glade.h:98
msgid ""
"Show a grand total of all accounts converted to the default report currency."
msgstr ""
"Gesamtsumme für alle Konten anzeigen, umgerechnet in die voreingestellte "
"Währung für Berichte."
-#: ../src/gnome-utils/glade/preferences.glade.h:91
+#: ../src/gnome-utils/glade/preferences.glade.h:99
msgid "Show all transactions on one line. (Two in double line mode.)"
msgstr ""
"Alle Buchungssätze einzeilig anzeigen. (Zweizeilig, wenn die Bemerkung "
"angezeigt werden soll.)"
-#: ../src/gnome-utils/glade/preferences.glade.h:92
+#: ../src/gnome-utils/glade/preferences.glade.h:100
msgid "Show close button on _notebook tabs"
msgstr "Den Knopf »Schließen« bei _Karteikarten-Ansicht anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:93
+#: ../src/gnome-utils/glade/preferences.glade.h:101
msgid "Show horizontal borders on the cells."
msgstr "Horizontale Begrenzungen anzeigen."
-#: ../src/gnome-utils/glade/preferences.glade.h:94
+#: ../src/gnome-utils/glade/preferences.glade.h:102
+msgid "Show splash scree_n"
+msgstr ""
+
+#: ../src/gnome-utils/glade/preferences.glade.h:103
+#, fuzzy
+msgid "Show splash screen at startup."
+msgstr "Tipps beim Programmstart _anzeigen"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:104
msgid ""
"Show this many transactions in a register. A value of zero means show all "
"transactions."
@@ -10594,7 +10825,7 @@
"Diese Anzahl Buchungen in einem Kontofenster anzeigen. Der Wert Null "
"bedeutet alle Buchungen."
-#: ../src/gnome-utils/glade/preferences.glade.h:95
+#: ../src/gnome-utils/glade/preferences.glade.h:105
msgid ""
"Show two lines of information for each transaction instead of one. Does not "
"affect expanded transactions."
@@ -10602,32 +10833,28 @@
"Zwei Zeilen pro Buchung anzeigen anstatt einer. Dies betrifft nicht die "
"ausgeklappten Buchungen."
-#: ../src/gnome-utils/glade/preferences.glade.h:96
+#: ../src/gnome-utils/glade/preferences.glade.h:106
msgid "Show vertical borders on the cells."
msgstr "Vertikale Begrenzungen anzeigen."
-#: ../src/gnome-utils/glade/preferences.glade.h:97
+#: ../src/gnome-utils/glade/preferences.glade.h:107
msgid "Sign reverse balances on income and expense accounts."
msgstr "Ertrags- und Aufwandskonten mit umgekehrten Vorzeichen"
-#: ../src/gnome-utils/glade/preferences.glade.h:98
+#: ../src/gnome-utils/glade/preferences.glade.h:108
msgid ""
"Sign reverse balances on the following: Credit Card, Payable, Liability, "
"Equity, and Income."
msgstr "Passiva-, Eigenkapitals- und Ertragskonten mit umgekehrten Vorzeichen"
-#: ../src/gnome-utils/glade/preferences.glade.h:99
+#: ../src/gnome-utils/glade/preferences.glade.h:109
msgid "Text _below icons"
msgstr "Text _unter Icons"
-#: ../src/gnome-utils/glade/preferences.glade.h:100
-msgid "Text besi_de icons"
-msgstr "Text _neben Icons"
-
-#: ../src/gnome-utils/glade/preferences.glade.h:101
+#: ../src/gnome-utils/glade/preferences.glade.h:110
msgid ""
-"The character that will be used between components of an account name. "
-"Legal values are any single non-alphanumeric unicode character, or any of "
+"The character that will be used between components of an account name. A "
+"legal value is any single character except letters and numbers, or any of "
"the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and "
"\"period\"."
msgstr ""
@@ -10635,178 +10862,196 @@
"Zeichen wählen, das kein Buchstabe oder Zahl ist, zum Beispiel »:«, »/« oder "
"»-«."
-#: ../src/gnome-utils/glade/preferences.glade.h:102
+#: ../src/gnome-utils/glade/preferences.glade.h:111
+#, fuzzy
+msgid "To_p"
+msgstr "Bis"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:112
msgid "Transaction _journal"
msgstr "Buchungsjournal"
-#: ../src/gnome-utils/glade/preferences.glade.h:103
+#: ../src/gnome-utils/glade/preferences.glade.h:113
msgid "US Dollars (USD)"
msgstr "US Dollars (USD)"
-#: ../src/gnome-utils/glade/preferences.glade.h:104
+#: ../src/gnome-utils/glade/preferences.glade.h:114
msgid "U_K:"
msgstr "U_K:"
-#: ../src/gnome-utils/glade/preferences.glade.h:105
+#: ../src/gnome-utils/glade/preferences.glade.h:115
msgid "U_se 24-hour clock"
msgstr "24-Stunden-_Format"
-#: ../src/gnome-utils/glade/preferences.glade.h:106
+#: ../src/gnome-utils/glade/preferences.glade.h:116
msgid "Use _formal accounting labels"
msgstr "Buchungsüberschriften aus _Rechnungswesen"
-#: ../src/gnome-utils/glade/preferences.glade.h:107
+#: ../src/gnome-utils/glade/preferences.glade.h:117
msgid "Use a 24 hour (instead of a 12 hour) time format."
msgstr "24 Stunden-Format statt 12 Stunden-Format"
-#: ../src/gnome-utils/glade/preferences.glade.h:108
+#: ../src/gnome-utils/glade/preferences.glade.h:118
msgid "Use only 'debit' and 'credit' instead of informal synonyms"
msgstr "Nur 'Soll' und 'Haben' anstatt informeller Bezeichnungen benutzen"
-#: ../src/gnome-utils/glade/preferences.glade.h:109
-msgid "Use s_ystem _default"
+#: ../src/gnome-utils/glade/preferences.glade.h:119
+#, fuzzy
+msgid "Use s_ystem default"
msgstr "_GNOME-Voreinstellung"
-#: ../src/gnome-utils/glade/preferences.glade.h:110
-msgid "Use the date format comon in continental Europe."
-msgstr "Das auf dem europäischen Kontinent übliche Datumsformat benutzen"
+#: ../src/gnome-utils/glade/preferences.glade.h:120
+msgid "Use the date format common in continental Europe."
+msgstr "Das auf dem europäischen Kontinent übliche Datumsformat benutzen."
-#: ../src/gnome-utils/glade/preferences.glade.h:111
-msgid "Use the date format comon in the United Kingdom."
-msgstr "Das in Großbritannien übliche Datumsformat benutzen"
+#: ../src/gnome-utils/glade/preferences.glade.h:121
+msgid "Use the date format common in the United Kingdom."
+msgstr "Das in Großbritannien übliche Datumsformat benutzen."
-#: ../src/gnome-utils/glade/preferences.glade.h:112
-msgid "Use the date format comon in the United States."
+#: ../src/gnome-utils/glade/preferences.glade.h:122
+msgid "Use the date format common in the United States."
msgstr ""
-"Das in den Vereinigten Staaten von Amerika übliche Datumsformat benutzen"
+"Das in den Vereinigten Staaten von Amerika übliche Datumsformat benutzen."
-#: ../src/gnome-utils/glade/preferences.glade.h:113
+#: ../src/gnome-utils/glade/preferences.glade.h:123
msgid "Use the date format specified by the ISO-8601 standard."
-msgstr "Das in dem ISO-Standard 8601 beschriebene Datumsformat benutzen"
+msgstr "Das in dem ISO-Standard 8601 beschriebene Datumsformat benutzen."
-#: ../src/gnome-utils/glade/preferences.glade.h:114
+#: ../src/gnome-utils/glade/preferences.glade.h:124
msgid "Use the date format specified by the system locale."
-msgstr "Das Datumsformat aus den Systemeinstellungen übernehmen"
+msgstr "Das Datumsformat aus den Systemeinstellungen übernehmen."
-#: ../src/gnome-utils/glade/preferences.glade.h:115
+#: ../src/gnome-utils/glade/preferences.glade.h:125
msgid ""
"Use the specified absolute ending date for profit/loss calculations. Also "
"use this date for net assets calculations."
-msgstr "Absolutes Enddatum für Gewinn/Verlustrechnung und Datum für Bilanz"
+msgstr ""
+"Absolutes Enddatum für Gewinn/Verlustrechnung und Datum für Bilanz. Ebenso "
+"Enddatum für die Berechnung des Reingewinns."
-#: ../src/gnome-utils/glade/preferences.glade.h:116
+#: ../src/gnome-utils/glade/preferences.glade.h:126
msgid "Use the specified absolute starting date for profit/loss calculations."
-msgstr "Absolutes Anfangsdatum für Gewinn/Verlustrechnung"
+msgstr "Absolutes Anfangsdatum für Gewinn/Verlustrechnung."
-#: ../src/gnome-utils/glade/preferences.glade.h:117
+#: ../src/gnome-utils/glade/preferences.glade.h:127
msgid "Use the specified currency for all newly created accounts."
msgstr "Standard-Währung für neue Konten."
-#: ../src/gnome-utils/glade/preferences.glade.h:118
+#: ../src/gnome-utils/glade/preferences.glade.h:128
msgid "Use the specified currency for all newly created reports."
msgstr "Standard-Währung für neue Berichte."
-#: ../src/gnome-utils/glade/preferences.glade.h:119
+#: ../src/gnome-utils/glade/preferences.glade.h:129
msgid ""
"Use the specified relative ending date for profit/loss calculations. Also "
"use this date for net assets calculations."
msgstr "Relatives Enddatum für Gewinn/Verlustrechnung und Datum für Bilanz"
-#: ../src/gnome-utils/glade/preferences.glade.h:120
+#: ../src/gnome-utils/glade/preferences.glade.h:130
msgid "Use the specified relative starting date for profit/loss calculations."
msgstr "Relatives Anfangsdatum für Gewinn/Verlustrechnung"
-#: ../src/gnome-utils/glade/preferences.glade.h:121
+#: ../src/gnome-utils/glade/preferences.glade.h:131
msgid "Use the system locale currency for all newly created accounts."
msgstr "Die systemweit voreingestellte Währung für neue Konten benutzen."
-#: ../src/gnome-utils/glade/preferences.glade.h:122
+#: ../src/gnome-utils/glade/preferences.glade.h:132
msgid "Use the system locale currency for all newly created reports."
msgstr "Die systemweit voreingestellte Währung für neue Berichte benutzen."
-#: ../src/gnome-utils/glade/preferences.glade.h:123
+#: ../src/gnome-utils/glade/preferences.glade.h:133
msgid "Use the system setting for displaying toolbar items."
msgstr ""
"Die GNOME-Voreinstellung für die Anzeige der Icons in der Werkzeugleiste "
"benutzen"
-#: ../src/gnome-utils/glade/preferences.glade.h:124
+#: ../src/gnome-utils/glade/preferences.glade.h:134
msgid "Windows"
msgstr "Fenster"
-#: ../src/gnome-utils/glade/preferences.glade.h:125
+#: ../src/gnome-utils/glade/preferences.glade.h:135
msgid "_Absolute:"
msgstr "_Absolut:"
-#: ../src/gnome-utils/glade/preferences.glade.h:126
+#: ../src/gnome-utils/glade/preferences.glade.h:136
msgid "_Auto-raise lists"
msgstr "Listen automatisch aufklappen"
-#: ../src/gnome-utils/glade/preferences.glade.h:127
+#: ../src/gnome-utils/glade/preferences.glade.h:137
msgid "_Auto-split ledger"
msgstr "_Aktive vollständig"
-#: ../src/gnome-utils/glade/preferences.glade.h:128
+#: ../src/gnome-utils/glade/preferences.glade.h:138
msgid "_Automatic decimal point"
msgstr "Automatische _Dezimalstellen"
-#: ../src/gnome-utils/glade/preferences.glade.h:129
+#: ../src/gnome-utils/glade/preferences.glade.h:139
msgid "_Basic ledger"
msgstr "_Einzeilig"
-#: ../src/gnome-utils/glade/preferences.glade.h:130
+#: ../src/gnome-utils/glade/preferences.glade.h:140
msgid "_Decimal places:"
msgstr "Komma_stellen:"
-#: ../src/gnome-utils/glade/preferences.glade.h:131
+#: ../src/gnome-utils/glade/preferences.glade.h:141
msgid "_Double line mode"
msgstr "_Bemerkung anzeigen"
-#: ../src/gnome-utils/glade/preferences.glade.h:132
+#: ../src/gnome-utils/glade/preferences.glade.h:142
msgid "_Enable euro support"
msgstr "_EURO-Unterstützung aktivieren"
-#: ../src/gnome-utils/glade/preferences.glade.h:133
+#: ../src/gnome-utils/glade/preferences.glade.h:143
msgid "_Europe:"
msgstr "_Europa:"
-#: ../src/gnome-utils/glade/preferences.glade.h:134
+#: ../src/gnome-utils/glade/preferences.glade.h:144
msgid "_ISO:"
msgstr "_ISO:"
-#: ../src/gnome-utils/glade/preferences.glade.h:135
+#: ../src/gnome-utils/glade/preferences.glade.h:145
msgid "_Icons only"
msgstr "Nur _Icons"
-#: ../src/gnome-utils/glade/preferences.glade.h:136
+#: ../src/gnome-utils/glade/preferences.glade.h:146
msgid "_Income & expense"
msgstr "_Erträge & Aufwendungen"
-#: ../src/gnome-utils/glade/preferences.glade.h:137
+#: ../src/gnome-utils/glade/preferences.glade.h:147
+#, fuzzy
+msgid "_Left"
+msgstr "Links"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:148
msgid "_None"
msgstr "_Keine"
-#: ../src/gnome-utils/glade/preferences.glade.h:138
+#: ../src/gnome-utils/glade/preferences.glade.h:149
msgid "_Relative:"
msgstr "_Relativ:"
-#: ../src/gnome-utils/glade/preferences.glade.h:139
+#: ../src/gnome-utils/glade/preferences.glade.h:150
msgid "_Retain log files:"
msgstr "Logdateien au_fbewahren"
-#: ../src/gnome-utils/glade/preferences.glade.h:140
+#: ../src/gnome-utils/glade/preferences.glade.h:151
+#, fuzzy
+msgid "_Right"
+msgstr "Rechts"
+
+#: ../src/gnome-utils/glade/preferences.glade.h:152
msgid "_Save window size and position"
msgstr "_Fenstergrößen und -positionen speichern"
-#: ../src/gnome-utils/glade/preferences.glade.h:141
+#: ../src/gnome-utils/glade/preferences.glade.h:153
msgid "_Text only"
msgstr "Nur _Text"
-#: ../src/gnome-utils/glade/preferences.glade.h:142
+#: ../src/gnome-utils/glade/preferences.glade.h:154
msgid "_US:"
msgstr "_USA:"
-#: ../src/gnome-utils/glade/preferences.glade.h:143
+#: ../src/gnome-utils/glade/preferences.glade.h:155
msgid "_Use system theme colors"
msgstr "Farben der _systemweiten Einstellungen verwenden"
@@ -10822,82 +11067,91 @@
msgid "_Show tips at startup"
msgstr "Tipps beim Programmstart _anzeigen"
-#: ../src/gnome-utils/glade/transfer.glade.h:2
+#: ../src/gnome-utils/glade/transfer.glade.h:1
msgid "<b>Basic Information</b>"
msgstr "<b>Informationen</b>"
-#: ../src/gnome-utils/glade/transfer.glade.h:3
+#: ../src/gnome-utils/glade/transfer.glade.h:2
msgid "<b>Currency Transfer</b>"
msgstr "<b>Währungsbuchung</b>"
-#: ../src/gnome-utils/glade/transfer.glade.h:4
+#: ../src/gnome-utils/glade/transfer.glade.h:3
msgid "<b>Transfer From</b>"
msgstr "<b>Herkunftskonto</b>"
-#: ../src/gnome-utils/glade/transfer.glade.h:5
+#: ../src/gnome-utils/glade/transfer.glade.h:4
msgid "<b>Transfer To</b>"
msgstr "<b>Buchen nach</b>"
-#: ../src/gnome-utils/glade/transfer.glade.h:7
+#: ../src/gnome-utils/glade/transfer.glade.h:6
msgid "Currency:"
msgstr "Währung:"
-#: ../src/gnome-utils/glade/transfer.glade.h:8
+#: ../src/gnome-utils/glade/transfer.glade.h:7
msgid "Date:"
msgstr "Datum:"
-#: ../src/gnome-utils/glade/transfer.glade.h:9
+#: ../src/gnome-utils/glade/transfer.glade.h:8
msgid "Description:"
msgstr "Beschreibung:"
-#: ../src/gnome-utils/glade/transfer.glade.h:10
+#: ../src/gnome-utils/glade/transfer.glade.h:9
msgid "Exchange Rate:"
msgstr "Wechselkurs:"
-#: ../src/gnome-utils/glade/transfer.glade.h:11
+#: ../src/gnome-utils/glade/transfer.glade.h:10
msgid "Memo:"
msgstr "Buchungstext:"
-#: ../src/gnome-utils/glade/transfer.glade.h:12
+#: ../src/gnome-utils/glade/transfer.glade.h:11
msgid "Num:"
msgstr "Nummer:"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
-#: ../src/gnome-utils/glade/transfer.glade.h:13
-#: ../intl-scm/guile-strings.c:1132 ../intl-scm/guile-strings.c:1216
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../src/gnome-utils/glade/transfer.glade.h:12
+#: ../intl-scm/guile-strings.c:1844 ../intl-scm/guile-strings.c:1928
+#: ../intl-scm/guile-strings.c:2468 ../intl-scm/guile-strings.c:2552
msgid "Show Income/Expense"
msgstr "Erträge/Aufwendungen anzeigen"
-#: ../src/gnome-utils/glade/transfer.glade.h:15
+#: ../src/gnome-utils/glade/transfer.glade.h:14
msgid "Transfer Funds"
msgstr "Buchen"
#. create the button.
-#: ../src/gnome-utils/gnc-account-sel.c:476
+#: ../src/gnome-utils/gnc-account-sel.c:382
msgid "New..."
msgstr "Neu..."
#. src/report/standard-reports/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:218 ../intl-scm/guile-strings.c:1170
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/gnome-utils/gnc-date-delta.c:216 ../intl-scm/guile-strings.c:1882
+#: ../intl-scm/guile-strings.c:2506
msgid "Weeks"
msgstr "Wochen"
#. src/report/standard-reports/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:219 ../intl-scm/guile-strings.c:1174
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/gnome-utils/gnc-date-delta.c:218 ../intl-scm/guile-strings.c:1886
+#: ../intl-scm/guile-strings.c:2510
msgid "Months"
msgstr "Monate"
#. src/report/standard-reports/price-scatter.scm
-#: ../src/gnome-utils/gnc-date-delta.c:220 ../intl-scm/guile-strings.c:1176
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../src/gnome-utils/gnc-date-delta.c:220 ../intl-scm/guile-strings.c:1888
+#: ../intl-scm/guile-strings.c:2512
msgid "Years"
msgstr "Jahre"
-#: ../src/gnome-utils/gnc-date-delta.c:263
+#: ../src/gnome-utils/gnc-date-delta.c:244
msgid "Ago"
msgstr "Vor"
-#: ../src/gnome-utils/gnc-date-delta.c:264
+#: ../src/gnome-utils/gnc-date-delta.c:246
msgid "From Now"
msgstr "Von jetzt"
@@ -10908,12 +11162,15 @@
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../src/gnome-utils/gnc-dense-cal.c:286 ../intl-scm/guile-strings.c:400
-#: ../intl-scm/guile-strings.c:612
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../src/gnome-utils/gnc-dense-cal.c:252 ../intl-scm/guile-strings.c:448
+#: ../intl-scm/guile-strings.c:660 ../intl-scm/guile-strings.c:872
+#: ../intl-scm/guile-strings.c:1084
msgid "Date: "
msgstr "Datum:"
-#: ../src/gnome-utils/gnc-dense-cal.c:1065
+#: ../src/gnome-utils/gnc-dense-cal.c:1057
msgid "(unnamed)"
msgstr "(unbenannt)"
@@ -10922,74 +11179,74 @@
msgid "Failed to process file: %s"
msgstr "Kann Datei nicht verarbeiten: %s"
-#: ../src/gnome-utils/gnc-druid-provider-file-gnome.c:131
+#: ../src/gnome-utils/gnc-druid-provider-file-gnome.c:132
#, c-format
msgid "Failed to open file: %s: %s"
msgstr "Kann Datei %s nicht öffnen: %s"
-#: ../src/gnome-utils/gnc-file.c:101 ../src/gnome-utils/gnc-main-window.c:226
+#: ../src/gnome-utils/gnc-file.c:99 ../src/gnome-utils/gnc-main-window.c:230
msgid "_Import"
msgstr "_Importieren"
-#: ../src/gnome-utils/gnc-file.c:103 ../src/gnome-utils/gnc-file.c:261
+#: ../src/gnome-utils/gnc-file.c:101 ../src/gnome-utils/gnc-file.c:254
msgid "Import"
msgstr "Import"
-#: ../src/gnome-utils/gnc-file.c:109 ../src/gnome-utils/gnc-file.c:1020
+#: ../src/gnome-utils/gnc-file.c:107 ../src/gnome-utils/gnc-file.c:1018
msgid "Save"
msgstr "Speichern"
-#: ../src/gnome-utils/gnc-file.c:113 ../src/gnome-utils/gnc-main-window.c:227
+#: ../src/gnome-utils/gnc-file.c:111 ../src/gnome-utils/gnc-main-window.c:231
msgid "_Export"
msgstr "E_xportieren"
-#: ../src/gnome-utils/gnc-file.c:116 ../src/gnome-utils/gnc-file.c:277
-#: ../src/gnome-utils/gnc-file.c:877
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:975
+#: ../src/gnome-utils/gnc-file.c:114 ../src/gnome-utils/gnc-file.c:270
+#: ../src/gnome-utils/gnc-file.c:876
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:985
msgid "Export"
msgstr "Exportieren"
-#: ../src/gnome-utils/gnc-file.c:159
+#: ../src/gnome-utils/gnc-file.c:152
msgid "All files"
msgstr "Alle Dateien"
#. Just in case
-#: ../src/gnome-utils/gnc-file.c:201
+#: ../src/gnome-utils/gnc-file.c:194
#: ../src/import-export/hbci/druid-hbci-utils.c:159
#: ../src/import-export/hbci/druid-hbci-utils.c:173
msgid "(null)"
msgstr "(keine)"
-#: ../src/gnome-utils/gnc-file.c:210
+#: ../src/gnome-utils/gnc-file.c:203
#, c-format
msgid "No suitable backend was found for %s."
msgstr "Kein passendes Dateimodul wurde gefunden für %s."
-#: ../src/gnome-utils/gnc-file.c:215
+#: ../src/gnome-utils/gnc-file.c:208
#, c-format
msgid "The URL %s is not supported by this version of GnuCash."
msgstr "Die URL »%s« kann von dieser GnuCash Version nicht verarbeitet werden."
-#: ../src/gnome-utils/gnc-file.c:220
+#: ../src/gnome-utils/gnc-file.c:213
#, c-format
msgid "Can't parse the URL %s."
msgstr "Folgende URL konnte nicht verarbeitet werden: %s"
-#: ../src/gnome-utils/gnc-file.c:225
+#: ../src/gnome-utils/gnc-file.c:218
#, c-format
msgid "Can't connect to %s. The host, username or password were incorrect."
msgstr ""
"Verbindung konnte nicht aufgebaut werden zu Rechner »%s«. Der Rechnername, "
"Benutzername oder Passwort waren falsch."
-#: ../src/gnome-utils/gnc-file.c:231
+#: ../src/gnome-utils/gnc-file.c:224
#, c-format
msgid "Can't connect to %s. Connection was lost, unable to send data."
msgstr ""
"Verbindung konnte nicht aufgebaut werden zu Rechner »%s«. Verbindung "
"verloren. Daten konnten nicht gesendet werden."
-#: ../src/gnome-utils/gnc-file.c:237
+#: ../src/gnome-utils/gnc-file.c:230
msgid ""
"This file/URL appears to be from a newer version of GnuCash. You must "
"upgrade your version of GnuCash to work with this data."
@@ -10997,13 +11254,13 @@
"Diese Datei scheint von einer neueren Version von GnuCash zu sein. Sie "
"brauchen eine neuere GnuCash Version, um die Datei lesen zu können."
-#: ../src/gnome-utils/gnc-file.c:244
+#: ../src/gnome-utils/gnc-file.c:237
#, c-format
msgid "The database %s doesn't seem to exist. Do you want to create it?"
msgstr ""
"Die Datenbank oder Datei »%s« existiert nicht. Möchten Sie sie erstellen?"
-#: ../src/gnome-utils/gnc-file.c:254
+#: ../src/gnome-utils/gnc-file.c:247
#, c-format
msgid ""
"GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11016,7 +11273,7 @@
"\n"
"Möchten Sie trotzdem mit dem Öffnen der Datenbank fortfahren?"
-#: ../src/gnome-utils/gnc-file.c:262
+#: ../src/gnome-utils/gnc-file.c:255
#, c-format
msgid ""
"GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11029,7 +11286,7 @@
"\n"
"Möchten Sie trotzdem mit dem Importieren der Datenbank fortfahren?"
-#: ../src/gnome-utils/gnc-file.c:270
+#: ../src/gnome-utils/gnc-file.c:263
#, c-format
msgid ""
"GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11042,7 +11299,7 @@
"\n"
"Möchten Sie trotzdem mit dem Speichern der Datenbank fortfahren?"
-#: ../src/gnome-utils/gnc-file.c:278
+#: ../src/gnome-utils/gnc-file.c:271
#, c-format
msgid ""
"GnuCash could not obtain the lock for %s. That database may be in use by "
@@ -11055,7 +11312,7 @@
"\n"
"Möchten Sie trotzdem mit dem Öffnen der Datei fortfahren?"
-#: ../src/gnome-utils/gnc-file.c:301
+#: ../src/gnome-utils/gnc-file.c:294
#, c-format
msgid ""
"GnuCash could not write to %s. That database may be on a read-only file "
@@ -11065,14 +11322,14 @@
"einem schreibgeschützten Dateisystem befinden oder Sie haben keine "
"Schreibberechtigung in das Verzeichnis. "
-#: ../src/gnome-utils/gnc-file.c:308
+#: ../src/gnome-utils/gnc-file.c:301
#, c-format
msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
msgstr ""
"Die Datei/URL »%s« verweist nicht auf GnuCash-Daten oder diese Daten sind "
"fehlerhaft."
-#: ../src/gnome-utils/gnc-file.c:314
+#: ../src/gnome-utils/gnc-file.c:307
#, c-format
msgid ""
"The server at URL %s experienced an error or encountered bad or corrupt data."
@@ -11080,19 +11337,19 @@
"Der Server unter der URL »%s« stiess auf einen Fehler oder benutzte falsche "
"oder fehlerhafte Daten."
-#: ../src/gnome-utils/gnc-file.c:320
+#: ../src/gnome-utils/gnc-file.c:313
#, c-format
msgid "You do not have permission to access %s."
msgstr "Sie haben keine Zugriffsberechtigung für die Datei »%s«."
-#: ../src/gnome-utils/gnc-file.c:325
+#: ../src/gnome-utils/gnc-file.c:318
#: ../src/register/register-core/formulacell.c:116
#: ../src/register/register-core/pricecell.c:180
#, c-format
msgid "An error occurred while processing %s."
msgstr "Fehler aufgetreten beim Verarbeiten von »%s«."
-#: ../src/gnome-utils/gnc-file.c:331
+#: ../src/gnome-utils/gnc-file.c:324
#, c-format
msgid ""
"Invalid QSF Object file! The QSF object file %s failed to validate against "
@@ -11103,7 +11360,7 @@
"verglichen mit dem QSF Objekt-Schema. Die XML-Struktur ist entweder nicht "
"wohlgeformt oder enthält ungültige Daten."
-#: ../src/gnome-utils/gnc-file.c:338
+#: ../src/gnome-utils/gnc-file.c:331
#, c-format
msgid ""
"Invalid QSF Map file! The QSF map file %s failed to validate against the QSF "
@@ -11114,7 +11371,7 @@
"Format, verglichen mit dem QSF Map-Schema. Die XML-Struktur ist entweder "
"nicht wohlgeformt oder enthält ungültige Daten."
-#: ../src/gnome-utils/gnc-file.c:345
+#: ../src/gnome-utils/gnc-file.c:338
#, c-format
msgid ""
"The QSF Map file %s was written for a different version of QOF. It may need "
@@ -11125,7 +11382,7 @@
"Sie in der Dokumentation der anderen Version, ob Sie Konvertierungsschritte "
"durchführen müssen, um sie mit dieser Version zu lesen."
-#: ../src/gnome-utils/gnc-file.c:352
+#: ../src/gnome-utils/gnc-file.c:345
#, c-format
msgid ""
"The selected QSF map %s contains unusable data. This is usually because not "
@@ -11136,7 +11393,7 @@
"sein, wenn nicht für alle erforderlichen Parameter für die gewünschten "
"Objekte alle notwendigen Berechnungsformeln in der Zuordnung angegeben waren."
-#: ../src/gnome-utils/gnc-file.c:359
+#: ../src/gnome-utils/gnc-file.c:352
#, c-format
msgid ""
"The selected QSF object file %s contains one or more invalid GUIDs. The file "
@@ -11146,14 +11403,14 @@
"GUIDs. Die Datei kann nicht verarbeitet werden. Versuchen Sie, eine "
"korrigierte Datei zu erhalten."
-#: ../src/gnome-utils/gnc-file.c:366
+#: ../src/gnome-utils/gnc-file.c:359
#, c-format
msgid "The selected QSF Object file %s requires a map but it was not provided."
msgstr ""
"Die gewählte QSF-Objekt-Datei »%s« erfordert eine QSF-Zuordnung (Map), aber "
"es ist keine verfügbar."
-#: ../src/gnome-utils/gnc-file.c:372
+#: ../src/gnome-utils/gnc-file.c:365
#, c-format
msgid ""
"Wrong QSF map selected. The selected map %s validates but was written for "
@@ -11165,14 +11422,14 @@
"in dieser Zuordnung enthält nicht alle Objekte, die in der aktuellen QSF-"
"Objekt-Datei zu finden sind."
-#: ../src/gnome-utils/gnc-file.c:380
+#: ../src/gnome-utils/gnc-file.c:373
#, c-format
msgid "The selected file %s is a QSF map and cannot be opened as a QSF object."
msgstr ""
"Die gewählte Datei »%s« ist eine QSF-Zuordnung (Map) und kann nicht als QSF-"
"Objekt geöffnet werden."
-#: ../src/gnome-utils/gnc-file.c:386
+#: ../src/gnome-utils/gnc-file.c:379
#, c-format
msgid ""
"When converting XML strings into numbers, an overflow has been detected. The "
@@ -11183,7 +11440,7 @@
"QSF-Datei »%s« enthält ungültige Daten in einem Feld, das eine Zahl "
"enthalten soll."
-#: ../src/gnome-utils/gnc-file.c:393
+#: ../src/gnome-utils/gnc-file.c:386
#, c-format
msgid ""
"The QSF object file %s is valid and contains GnuCash objects. However, "
@@ -11197,52 +11454,57 @@
"GnuCash-Buch fusioniert werden muss. Bitte öffnen Sie eine GnuCash-Datei "
"oder erstellen eine neue, und importieren dann diese QSF-Datei."
-#: ../src/gnome-utils/gnc-file.c:403
+#: ../src/gnome-utils/gnc-file.c:396
msgid "There was an error reading the file. Do you want to continue?"
msgstr "Es gab einen Fehler beim Öffnen der Datei. Möchten Sie fortfahren?"
-#: ../src/gnome-utils/gnc-file.c:409
+#: ../src/gnome-utils/gnc-file.c:402
#, c-format
msgid "There was an error parsing the file %s."
-msgstr "Beim Leser der Datei »%s« ist ein Fehler aufgetreten."
+msgstr "Beim Lesen der Datei »%s« ist ein Fehler aufgetreten."
-#: ../src/gnome-utils/gnc-file.c:414
+#: ../src/gnome-utils/gnc-file.c:407
#, c-format
msgid "The file %s is empty."
msgstr "Die Datei »%s« ist leer."
-#: ../src/gnome-utils/gnc-file.c:419
+#: ../src/gnome-utils/gnc-file.c:415
#, c-format
msgid "The file %s could not be found."
msgstr "Die Datei »%s« konnte nicht gefunden werden."
-#: ../src/gnome-utils/gnc-file.c:424
+#: ../src/gnome-utils/gnc-file.c:421
msgid "This file is from an older version of GnuCash. Do you want to continue?"
msgstr ""
"Diese Datei ist von einer älteren Version von GnuCash. Möchten Sie "
"fortfahren?"
-#: ../src/gnome-utils/gnc-file.c:430
+#: ../src/gnome-utils/gnc-file.c:427
#, c-format
msgid "The file type of file %s is unknown."
msgstr "Der Dateityp der Datei »%s« ist unbekannt."
-#: ../src/gnome-utils/gnc-file.c:435
+#: ../src/gnome-utils/gnc-file.c:432
#, c-format
msgid "Could not make a backup of the file %s"
msgstr "Von der Datei »%s« konnte kein Backup erstellt werden."
-#: ../src/gnome-utils/gnc-file.c:440
+#: ../src/gnome-utils/gnc-file.c:437
#, c-format
msgid ""
-"Could not write to file %s Check that you have permission to write to this "
+"Could not write to file %s. Check that you have permission to write to this "
"file and that there is sufficient space to create it."
msgstr ""
"Es konnte nicht in die Datei »%s« geschrieben werden. Stellen Sie sicher, "
"dass Sie Schreibberechtigung für das Verzeichnis und diese Datei haben und "
"dass genug Platz auf dem Datenträger frei ist."
-#: ../src/gnome-utils/gnc-file.c:447
+#: ../src/gnome-utils/gnc-file.c:444
+#, c-format
+msgid "No read permission to read from file %s."
+msgstr "Sie haben keine Leseberechtigung für die Datei »%s«."
+
+#: ../src/gnome-utils/gnc-file.c:449
msgid ""
"This database is from an older version of GnuCash. Do you want to want to "
"upgrade the database to the current version?"
@@ -11250,7 +11512,7 @@
"Diese Datei ist von einer älteren Version von GnuCash. Möchten Sie die "
"Datei zur aktuellen GnuCash-Version aktualisieren?"
-#: ../src/gnome-utils/gnc-file.c:454
+#: ../src/gnome-utils/gnc-file.c:456
msgid ""
"The SQL database is in use by other users, and the upgrade cannot be "
"performed until they logoff. If there are currently no other users, consult "
@@ -11263,32 +11525,32 @@
"Wenn keine anderen Anwender mehr im System sind, konsultieren Sie bitte das "
"Handbuch, um Anweisungen zum Löschen von 'dangling login sessions' zu finden."
-#: ../src/gnome-utils/gnc-file.c:464
+#: ../src/gnome-utils/gnc-file.c:466
#, c-format
msgid "An unknown I/O error (%d) occurred."
msgstr "Ein unbekannter Eingabe/Ausgabefehler (%d) ist aufgetreten."
-#: ../src/gnome-utils/gnc-file.c:553
+#: ../src/gnome-utils/gnc-file.c:555
msgid "Save changes to the file?"
msgstr "Änderungen in Datei speichern?"
-#: ../src/gnome-utils/gnc-file.c:556 ../src/gnome-utils/gnc-main-window.c:892
+#: ../src/gnome-utils/gnc-file.c:558 ../src/gnome-utils/gnc-main-window.c:966
#, c-format
msgid "If you don't save, changes from the past %d minutes will be discarded."
msgstr ""
"Wenn Sie nicht speichern, gehen die Änderungen der letzten %d Minuten "
"verloren."
-#: ../src/gnome-utils/gnc-file.c:570
+#: ../src/gnome-utils/gnc-file.c:572
msgid "Continue _Without Saving"
msgstr "Schließen _ohne zu speichern"
-#: ../src/gnome-utils/gnc-file.c:650
+#: ../src/gnome-utils/gnc-file.c:652
#, c-format
msgid "GnuCash could not obtain the lock for %s."
msgstr "GnuCash konnte keine exklusive Schreibberechtigung für %s erreichen."
-#: ../src/gnome-utils/gnc-file.c:652
+#: ../src/gnome-utils/gnc-file.c:654
msgid ""
"That database may be in use by another user, in which case you should not "
"open the database. What would you like to do?"
@@ -11302,7 +11564,7 @@
"\n"
"Was möchten Sie tun?"
-#: ../src/gnome-utils/gnc-file.c:655
+#: ../src/gnome-utils/gnc-file.c:657
msgid ""
"That database may be on a read-only file system, or you may not have write "
"permission for the directory. If you proceed you may not be able to save any "
@@ -11317,28 +11579,28 @@
"\n"
"Was möchten Sie tun?"
-#: ../src/gnome-utils/gnc-file.c:672
+#: ../src/gnome-utils/gnc-file.c:674
msgid "_Open Anyway"
msgstr "Tr_otzdem öffnen"
-#: ../src/gnome-utils/gnc-file.c:674
+#: ../src/gnome-utils/gnc-file.c:676
msgid "_Create New File"
msgstr "_Neue Datei anlegen"
-#: ../src/gnome-utils/gnc-file.c:913 ../src/gnome-utils/gnc-file.c:1109
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1327
+#: ../src/gnome-utils/gnc-file.c:911 ../src/gnome-utils/gnc-file.c:1107
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1341
#, c-format
msgid "The file %s already exists. Are you sure you want to overwrite it?"
msgstr ""
"Die Datei »%s« existiert bereits. Sind Sie sicher, dass sie überschrieben "
"werden soll?"
-#: ../src/gnome-utils/gnc-file.c:928
+#: ../src/gnome-utils/gnc-file.c:926
msgid "Exporting file..."
msgstr "Datei exportieren..."
#. %s is the strerror(3) error string of the error that occurred.
-#: ../src/gnome-utils/gnc-file.c:941
+#: ../src/gnome-utils/gnc-file.c:939
#, c-format
msgid ""
"There was an error saving the file.\n"
@@ -11353,23 +11615,32 @@
msgid "View..."
msgstr "Ansicht..."
-#: ../src/gnome-utils/gnc-html.c:107
+#: ../src/gnome-utils/gnc-gnome-utils.c:247
+msgid ""
+"GnuCash could not find the files for the help documentation. This is likely "
+"because the 'gnucash-docs' package is not installed."
+msgstr ""
+"Die Dateien für die Hilfe-Dokumentation konnten nicht gefunden werden. Das "
+"liegt vermutlich daran, dass das Paket »gnucash-docs« noch nicht installiert "
+"ist."
+
+#: ../src/gnome-utils/gnc-html.c:108
msgid "Not found"
msgstr "Nicht gefunden"
-#: ../src/gnome-utils/gnc-html.c:109
+#: ../src/gnome-utils/gnc-html.c:110
msgid "The specified URL could not be loaded."
msgstr "Die angegebene URL konnte nicht geladen werden."
-#: ../src/gnome-utils/gnc-html.c:115
+#: ../src/gnome-utils/gnc-html.c:116
msgid "There was an error loading the specified URL."
msgstr "Beim Laden der URL ist ein Fehler aufgetreten."
-#: ../src/gnome-utils/gnc-html.c:116
+#: ../src/gnome-utils/gnc-html.c:117
msgid "Error message"
msgstr "Fehlermeldung"
-#: ../src/gnome-utils/gnc-html.c:605 ../src/gnome-utils/gnc-html.c:1064
+#: ../src/gnome-utils/gnc-html.c:610 ../src/gnome-utils/gnc-html.c:1070
msgid ""
"Secure HTTP access is disabled. You can enable it in the Network section of "
"the Preferences dialog."
@@ -11378,7 +11649,7 @@
"Sie den Netzwerk Abschnitt der Einstellungen und aktivieren die "
"entsprechende Option."
-#: ../src/gnome-utils/gnc-html.c:614 ../src/gnome-utils/gnc-html.c:1074
+#: ../src/gnome-utils/gnc-html.c:619 ../src/gnome-utils/gnc-html.c:1080
msgid ""
"Network HTTP access is disabled. You can enable it in the Network section of "
"the Preferences dialog."
@@ -11387,7 +11658,7 @@
"Menü »Voreinstellungen«einschalten"
#. %s is a URL (some location somewhere).
-#: ../src/gnome-utils/gnc-html.c:1005
+#: ../src/gnome-utils/gnc-html.c:1010
#, c-format
msgid "There was an error accessing %s."
msgstr "Beim Zugriff auf %s ist ein Fehler aufgetreten."
@@ -11396,320 +11667,298 @@
msgid "_Delete Account"
msgstr "_Konto löschen"
+#: ../src/gnome-utils/gnc-icons.c:18 ../src/gnome/window-reconcile.c:2011
+msgid "_Edit Account"
+msgstr "Konto _bearbeiten"
+
#: ../src/gnome-utils/gnc-icons.c:19
msgid "_New Account"
msgstr "_Neues Konto"
#. Account menu
-#: ../src/gnome-utils/gnc-icons.c:20 ../src/gnome/window-reconcile.c:2006
+#: ../src/gnome-utils/gnc-icons.c:20 ../src/gnome/window-reconcile.c:2008
msgid "_Open Account"
msgstr "_Konto öffnen"
#. Toplevel
-#: ../src/gnome-utils/gnc-main-window.c:211
+#: ../src/gnome-utils/gnc-main-window.c:215
msgid "_File"
msgstr "_Datei"
-#: ../src/gnome-utils/gnc-main-window.c:215
+#: ../src/gnome-utils/gnc-main-window.c:219
msgid "Tra_nsaction"
-msgstr "_Buchung"
+msgstr "B_uchung"
-#: ../src/gnome-utils/gnc-main-window.c:216
+#: ../src/gnome-utils/gnc-main-window.c:220
msgid "_Reports"
msgstr "Be_richte"
-#: ../src/gnome-utils/gnc-main-window.c:217
+#: ../src/gnome-utils/gnc-main-window.c:221
msgid "_Tools"
msgstr "_Werkzeuge"
-#: ../src/gnome-utils/gnc-main-window.c:218
+#: ../src/gnome-utils/gnc-main-window.c:222
msgid "E_xtensions"
msgstr "Er_weiterungen"
-#: ../src/gnome-utils/gnc-main-window.c:219
+#: ../src/gnome-utils/gnc-main-window.c:223
msgid "_Windows"
msgstr "_Fenster"
#. Help menu
-#: ../src/gnome-utils/gnc-main-window.c:220
-#: ../src/gnome/window-reconcile.c:1986 ../src/gnome/window-reconcile.c:2034
+#: ../src/gnome-utils/gnc-main-window.c:224
+#: ../src/gnome/window-reconcile.c:1988 ../src/gnome/window-reconcile.c:2036
msgid "_Help"
msgstr "_Hilfe"
#. File menu
#. Transaction menu
-#: ../src/gnome-utils/gnc-main-window.c:224
-#: ../src/gnome/window-reconcile.c:2022
+#: ../src/gnome-utils/gnc-main-window.c:228
+#: ../src/gnome/window-reconcile.c:2024
msgid "_New"
msgstr "_Neu"
-#: ../src/gnome-utils/gnc-main-window.c:225
+#: ../src/gnome-utils/gnc-main-window.c:229
msgid "_Open"
msgstr "Ö_ffnen"
-#: ../src/gnome-utils/gnc-main-window.c:228
+#: ../src/gnome-utils/gnc-main-window.c:232
msgid "_Print..."
msgstr "_Drucken..."
-#: ../src/gnome-utils/gnc-main-window.c:229
+#: ../src/gnome-utils/gnc-main-window.c:233
msgid "Print the currently active page"
msgstr "Aktuelle Seite drucken"
-#: ../src/gnome-utils/gnc-main-window.c:230
+#: ../src/gnome-utils/gnc-main-window.c:234
msgid "Proper_ties"
msgstr "_Eigenschaften"
-#: ../src/gnome-utils/gnc-main-window.c:231
+#: ../src/gnome-utils/gnc-main-window.c:235
msgid "Edit the properties of the current file"
msgstr "Eigenschaften dieser Datei anzeigen und bearbeiten."
-#: ../src/gnome-utils/gnc-main-window.c:233
+#: ../src/gnome-utils/gnc-main-window.c:237
msgid "_Close"
msgstr "S_chließen"
-#: ../src/gnome-utils/gnc-main-window.c:234
+#: ../src/gnome-utils/gnc-main-window.c:238
msgid "Close the currently active page"
msgstr "Aktuelle Seite schließen"
-#: ../src/gnome-utils/gnc-main-window.c:236
+#: ../src/gnome-utils/gnc-main-window.c:240
msgid "_Quit"
msgstr "_Beenden"
-#: ../src/gnome-utils/gnc-main-window.c:237
+#: ../src/gnome-utils/gnc-main-window.c:241
msgid "Quit this application"
msgstr "GnuCash beenden"
-#: ../src/gnome-utils/gnc-main-window.c:251
+#: ../src/gnome-utils/gnc-main-window.c:255
msgid "Pr_eferences"
msgstr "_Einstellungen"
-#: ../src/gnome-utils/gnc-main-window.c:252
+#: ../src/gnome-utils/gnc-main-window.c:256
msgid "Edit the global preferences of GnuCash"
msgstr "Die globalen Einstellungen von GnuCash bearbeiten"
-#: ../src/gnome-utils/gnc-main-window.c:258
+#: ../src/gnome-utils/gnc-main-window.c:262
msgid "Select sorting criteria for this page view"
msgstr "Sortierungskriterien für die aktuelle Ansicht wählen"
-#: ../src/gnome-utils/gnc-main-window.c:260
+#: ../src/gnome-utils/gnc-main-window.c:264
msgid "Select the account types that should be displayed."
msgstr "Wählen Sie die Kontoarten, die in der Kontenansicht angezeigt werden."
-#: ../src/gnome-utils/gnc-main-window.c:261
+#: ../src/gnome-utils/gnc-main-window.c:265
msgid "_Refresh"
msgstr "Aktualisie_ren"
-#: ../src/gnome-utils/gnc-main-window.c:262
+#: ../src/gnome-utils/gnc-main-window.c:266
msgid "Refresh this window"
msgstr "Dieses Fenster aktualisieren"
#. Actions menu
-#: ../src/gnome-utils/gnc-main-window.c:267
-#: ../src/gnome/window-reconcile.c:2015
+#: ../src/gnome-utils/gnc-main-window.c:271
+#: ../src/gnome/window-reconcile.c:2017
msgid "_Check & Repair"
msgstr "Überprüfen"
-#: ../src/gnome-utils/gnc-main-window.c:268
+#: ../src/gnome-utils/gnc-main-window.c:272
msgid "Reset _Warnings..."
msgstr "_Warnungen zurücksetzen..."
-#: ../src/gnome-utils/gnc-main-window.c:269
+#: ../src/gnome-utils/gnc-main-window.c:273
msgid "Reset the state of all warning message so they will be shown again."
msgstr ""
"Den gespeicherten Status aller Warnungsmeldungen zurücksetzen, so dass alle "
"wieder angezeigt werden."
-#: ../src/gnome-utils/gnc-main-window.c:271
+#: ../src/gnome-utils/gnc-main-window.c:275
msgid "Re_name Page"
msgstr "Seite umbe_nennen"
-#: ../src/gnome-utils/gnc-main-window.c:272
+#: ../src/gnome-utils/gnc-main-window.c:276
msgid "Rename this page."
msgstr "Diese Seite umbenennen."
#. Windows menu
-#: ../src/gnome-utils/gnc-main-window.c:277
+#: ../src/gnome-utils/gnc-main-window.c:281
msgid "_New Window"
msgstr "_Neues Fenster"
-#: ../src/gnome-utils/gnc-main-window.c:278
+#: ../src/gnome-utils/gnc-main-window.c:282
msgid "Open a new top-level GnuCash window."
msgstr "Ein neues Top-Level GnuCash Fenster öffnen."
-#: ../src/gnome-utils/gnc-main-window.c:280
+#: ../src/gnome-utils/gnc-main-window.c:284
msgid "New Window with _Page"
msgstr "Neues Fenster mit _Seite"
-#: ../src/gnome-utils/gnc-main-window.c:281
+#: ../src/gnome-utils/gnc-main-window.c:285
msgid "Move the current page to a new top-level GnuCash window."
msgstr "Aktuelle Seite in ein neues Top-Level GnuCash Fenster verschieben."
#. Help menu
-#: ../src/gnome-utils/gnc-main-window.c:286
+#: ../src/gnome-utils/gnc-main-window.c:290
msgid "Tutorial and Concepts _Guide"
msgstr "GnuCash-_Kurs und Konzepte"
-#: ../src/gnome-utils/gnc-main-window.c:287
+#: ../src/gnome-utils/gnc-main-window.c:291
msgid "Open the GnuCash Tutorial"
msgstr "Den GnuCash-Online-Kurs öffnen"
-#: ../src/gnome-utils/gnc-main-window.c:289
+#: ../src/gnome-utils/gnc-main-window.c:293
msgid "_Contents"
msgstr "I_nhalt"
-#: ../src/gnome-utils/gnc-main-window.c:290
+#: ../src/gnome-utils/gnc-main-window.c:294
msgid "Open the GnuCash Help"
msgstr "Die GnuCash-Hilfe öffnen"
-#: ../src/gnome-utils/gnc-main-window.c:292
+#: ../src/gnome-utils/gnc-main-window.c:296
msgid "_About"
msgstr "_Info"
-#: ../src/gnome-utils/gnc-main-window.c:293
+#: ../src/gnome-utils/gnc-main-window.c:297
msgid "About GnuCash"
msgstr "Info zu GnuCash"
-#: ../src/gnome-utils/gnc-main-window.c:303
+#: ../src/gnome-utils/gnc-main-window.c:307
msgid "_Toolbar"
msgstr "_Werkzeugleiste"
-#: ../src/gnome-utils/gnc-main-window.c:304
+#: ../src/gnome-utils/gnc-main-window.c:308
msgid "Show/hide the toolbar on this window"
msgstr "Die Werkzeugleiste in diesem Fenster anzeigen/verbergen"
-#: ../src/gnome-utils/gnc-main-window.c:306
+#: ../src/gnome-utils/gnc-main-window.c:310
msgid "Su_mmary Bar"
msgstr "_Zusammenfassungsleiste"
-#: ../src/gnome-utils/gnc-main-window.c:307
+#: ../src/gnome-utils/gnc-main-window.c:311
msgid "Show/hide the summary bar on this window"
msgstr "Die Zusammenfassungs-Leiste in diesem Fenster anzeigen/verbergen"
-#: ../src/gnome-utils/gnc-main-window.c:309
+#: ../src/gnome-utils/gnc-main-window.c:313
msgid "Stat_us Bar"
msgstr "_Statusleiste"
-#: ../src/gnome-utils/gnc-main-window.c:310
+#: ../src/gnome-utils/gnc-main-window.c:314
msgid "Show/hide the status bar on this window"
msgstr "Die Statusleiste in diesem Fenster anzeigen/verbergen"
-#: ../src/gnome-utils/gnc-main-window.c:320
+#: ../src/gnome-utils/gnc-main-window.c:324
msgid "Window _1"
msgstr "Fenster _1"
-#: ../src/gnome-utils/gnc-main-window.c:321
+#: ../src/gnome-utils/gnc-main-window.c:325
msgid "Window _2"
msgstr "Fenster _2"
-#: ../src/gnome-utils/gnc-main-window.c:322
+#: ../src/gnome-utils/gnc-main-window.c:326
msgid "Window _3"
msgstr "Fenster _3"
-#: ../src/gnome-utils/gnc-main-window.c:323
+#: ../src/gnome-utils/gnc-main-window.c:327
msgid "Window _4"
msgstr "Fenster _4"
-#: ../src/gnome-utils/gnc-main-window.c:324
+#: ../src/gnome-utils/gnc-main-window.c:328
msgid "Window _5"
msgstr "Fenster _5"
-#: ../src/gnome-utils/gnc-main-window.c:325
+#: ../src/gnome-utils/gnc-main-window.c:329
msgid "Window _6"
msgstr "Fenster _6"
-#: ../src/gnome-utils/gnc-main-window.c:326
+#: ../src/gnome-utils/gnc-main-window.c:330
msgid "Window _7"
msgstr "Fenster _7"
-#: ../src/gnome-utils/gnc-main-window.c:327
+#: ../src/gnome-utils/gnc-main-window.c:331
msgid "Window _8"
msgstr "Fenster _8"
-#: ../src/gnome-utils/gnc-main-window.c:328
+#: ../src/gnome-utils/gnc-main-window.c:332
msgid "Window _9"
msgstr "Fenster _9"
-#: ../src/gnome-utils/gnc-main-window.c:329
+#: ../src/gnome-utils/gnc-main-window.c:333
msgid "Window _0"
msgstr "Fenster _0"
-#: ../src/gnome-utils/gnc-main-window.c:889
+#: ../src/gnome-utils/gnc-main-window.c:963
#, c-format
msgid "Save changes to file %s before closing?"
msgstr "Änderungen der Datei %s vor dem Schließen speichern?"
-#: ../src/gnome-utils/gnc-main-window.c:900
+#: ../src/gnome-utils/gnc-main-window.c:974
msgid "<unknown>"
msgstr "<unbekannt>"
-#: ../src/gnome-utils/gnc-main-window.c:916
+#: ../src/gnome-utils/gnc-main-window.c:990
msgid "Close _Without Saving"
msgstr "Schließen _ohne zu speichern"
-#: ../src/gnome-utils/gnc-main-window.c:987
-msgid "Quit GnuCash?"
-msgstr "GnuCash beenden?"
-
-#: ../src/gnome-utils/gnc-main-window.c:988
-msgid ""
-"You are attempting to close the last GnuCash window. Doing so will quit the "
-"application. Are you sure that this is what you want to do?"
-msgstr ""
-"Sie sind im Begriff, das letzte geöffnete GnuCash-Fenster zu schließen. Dies "
-"wird GnuCash beenden. Sind Sie sich sicher, dass Sie das wollen?"
-
-#: ../src/gnome-utils/gnc-main-window.c:1123
+#: ../src/gnome-utils/gnc-main-window.c:1178
msgid "<no file>"
msgstr "<Keine Datei>"
-#: ../src/gnome-utils/gnc-main-window.c:3215
+#: ../src/gnome-utils/gnc-main-window.c:3339
msgid "The GnuCash personal finance manager. The GNU way to manage your money!"
msgstr ""
"GnuCash: Ihr privater Finanzmanager. Die freie Lösung zur Finanzverwaltung."
#. Development version
-#: ../src/gnome-utils/gnc-main-window.c:3228
+#: ../src/gnome-utils/gnc-main-window.c:3352
#, c-format
msgid "%s This copy was built from svn r%s on %s."
msgstr "%s Dieses Programm wurde aus SVN r%s am %s erstellt."
-#: ../src/gnome-utils/gnc-main-window.c:3231
+#: ../src/gnome-utils/gnc-main-window.c:3355
#, c-format
msgid "%s This copy was built from r%s on %s."
msgstr "%s Dieses Programm wurde aus r%s am %s erstellt."
-#. Translators: Insert your translator's credits here so that
-#. they will be shown in the "About" dialog.
-#: ../src/gnome-utils/gnc-main-window.c:3243
-#: ../src/gnome-utils/gnc-main-window.c:3282
+#: ../src/gnome-utils/gnc-main-window.c:3367
msgid "translator_credits"
msgstr "Christian Stimming <stimming at tuhh.de>"
-#. Translators: This is the "About" message.
-#: ../src/gnome-utils/gnc-main-window.c:3260
-msgid ""
-"The GnuCash personal finance manager.\n"
-"The GNU way to manage your money!\n"
-"http://www.gnucash.org/"
-msgstr ""
-"GnuCash: Ihr privater Finanzmanager.\n"
-"Die freie Lösung zur Finanzverwaltung.\n"
-"http://www.gnucash.org"
-
#. CY Strings
#. src/app-utils/date-utilities.scm
#: ../src/gnome-utils/gnc-period-select.c:66
-#: ../src/gnome-utils/gnc-period-select.c:81 ../intl-scm/guile-strings.c:170
+#: ../src/gnome-utils/gnc-period-select.c:81 ../intl-scm/guile-strings.c:218
msgid "Today"
msgstr "Heute"
#. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:67 ../intl-scm/guile-strings.c:138
+#: ../src/gnome-utils/gnc-period-select.c:67 ../intl-scm/guile-strings.c:186
msgid "Start of this month"
msgstr "Anfang dieses Monats"
#. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:68 ../intl-scm/guile-strings.c:146
+#: ../src/gnome-utils/gnc-period-select.c:68 ../intl-scm/guile-strings.c:194
msgid "Start of previous month"
msgstr "Anfang des vorherigen Monats"
@@ -11718,7 +11967,7 @@
msgstr "Anfang dieses Quartals"
#. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:70 ../intl-scm/guile-strings.c:162
+#: ../src/gnome-utils/gnc-period-select.c:70 ../intl-scm/guile-strings.c:210
msgid "Start of previous quarter"
msgstr "Anfang des vorherigen Quartals"
@@ -11740,12 +11989,12 @@
msgstr "Anfang des vorherigen Haushaltsjahres"
#. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:82 ../intl-scm/guile-strings.c:142
+#: ../src/gnome-utils/gnc-period-select.c:82 ../intl-scm/guile-strings.c:190
msgid "End of this month"
msgstr "Ende dieses Monats"
#. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:83 ../intl-scm/guile-strings.c:150
+#: ../src/gnome-utils/gnc-period-select.c:83 ../intl-scm/guile-strings.c:198
msgid "End of previous month"
msgstr "Ende des vorherigen Monats"
@@ -11754,7 +12003,7 @@
msgstr "Ende dieses Quartals"
#. src/app-utils/date-utilities.scm
-#: ../src/gnome-utils/gnc-period-select.c:85 ../intl-scm/guile-strings.c:166
+#: ../src/gnome-utils/gnc-period-select.c:85 ../intl-scm/guile-strings.c:214
msgid "End of previous quarter"
msgstr "Ende des vorherigen Quartals"
@@ -11797,139 +12046,167 @@
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../src/gnome-utils/gnc-tree-view-account.c:514
-#: ../intl-scm/guile-strings.c:1460 ../intl-scm/guile-strings.c:1486
-#: ../intl-scm/guile-strings.c:2190 ../intl-scm/guile-strings.c:2328
-#: ../intl-scm/guile-strings.c:2448 ../intl-scm/guile-strings.c:2954
-#: ../intl-scm/guile-strings.c:3044
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../src/gnome-utils/gnc-tree-view-account.c:510
+#: ../intl-scm/guile-strings.c:2170 ../intl-scm/guile-strings.c:2196
+#: ../intl-scm/guile-strings.c:2794 ../intl-scm/guile-strings.c:2820
+#: ../intl-scm/guile-strings.c:3524 ../intl-scm/guile-strings.c:3662
+#: ../intl-scm/guile-strings.c:3782 ../intl-scm/guile-strings.c:4674
+#: ../intl-scm/guile-strings.c:4812 ../intl-scm/guile-strings.c:4932
+#: ../intl-scm/guile-strings.c:5442 ../intl-scm/guile-strings.c:5532
+#: ../intl-scm/guile-strings.c:5622 ../intl-scm/guile-strings.c:5712
msgid "Account Name"
msgstr "Kontobezeichnung"
-#: ../src/gnome-utils/gnc-tree-view-account.c:523
+#: ../src/gnome-utils/gnc-tree-view-account.c:519
msgid "Commodity"
msgstr "Währung/Aktie"
#. src/report/report-system/options-utilities.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/transaction.scm
-#: ../src/gnome-utils/gnc-tree-view-account.c:529
-#: ../intl-scm/guile-strings.c:770 ../intl-scm/guile-strings.c:1490
-#: ../intl-scm/guile-strings.c:1900 ../intl-scm/guile-strings.c:2222
-#: ../intl-scm/guile-strings.c:2332 ../intl-scm/guile-strings.c:2456
+#: ../src/gnome-utils/gnc-tree-view-account.c:525
+#: ../intl-scm/guile-strings.c:1282 ../intl-scm/guile-strings.c:2200
+#: ../intl-scm/guile-strings.c:2824 ../intl-scm/guile-strings.c:3234
+#: ../intl-scm/guile-strings.c:3556 ../intl-scm/guile-strings.c:3666
+#: ../intl-scm/guile-strings.c:3790 ../intl-scm/guile-strings.c:4384
+#: ../intl-scm/guile-strings.c:4706 ../intl-scm/guile-strings.c:4816
+#: ../intl-scm/guile-strings.c:4940
msgid "Account Code"
msgstr "Kontonummer"
-#: ../src/gnome-utils/gnc-tree-view-account.c:540
+#: ../src/gnome-utils/gnc-tree-view-account.c:536
msgid "Last Num"
msgstr "Letzte Nummer"
-#: ../src/gnome-utils/gnc-tree-view-account.c:545
+#: ../src/gnome-utils/gnc-tree-view-account.c:541
msgid "Present"
msgstr "Aktuell"
-#: ../src/gnome-utils/gnc-tree-view-account.c:552
+#: ../src/gnome-utils/gnc-tree-view-account.c:548
msgid "Present (Report)"
msgstr "Aktuell (als Bericht)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:565
+#: ../src/gnome-utils/gnc-tree-view-account.c:561
msgid "Balance (Report)"
msgstr "Bilanz (als Bericht)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:572
+#: ../src/gnome-utils/gnc-tree-view-account.c:568
msgid "Balance (Period)"
msgstr "Bilanz (Periodenbezogen)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:585
+#: ../src/gnome-utils/gnc-tree-view-account.c:581
msgid "Cleared (Report)"
msgstr "Bestätigt (als Bericht)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:598
+#: ../src/gnome-utils/gnc-tree-view-account.c:594
msgid "Reconciled (Report)"
msgstr "Abgeglichen (als Bericht)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:604
+#: ../src/gnome-utils/gnc-tree-view-account.c:600
msgid "Future Minimum"
msgstr "Zukünftiges Minimum"
-#: ../src/gnome-utils/gnc-tree-view-account.c:611
+#: ../src/gnome-utils/gnc-tree-view-account.c:607
msgid "Future Minimum (Report)"
msgstr "Zukünftiges Minimum (als Bericht)"
#. src/report/report-system/html-acct-table.scm
#. src/report/report-system/html-utilities.scm
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/aging.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/aging.scm
#. src/business/business-reports/invoice.scm
-#: ../src/gnome-utils/gnc-tree-view-account.c:617
-#: ../intl-scm/guile-strings.c:846 ../intl-scm/guile-strings.c:886
-#: ../intl-scm/guile-strings.c:1742 ../intl-scm/guile-strings.c:2030
-#: ../intl-scm/guile-strings.c:2956 ../intl-scm/guile-strings.c:3046
-#: ../intl-scm/guile-strings.c:3204 ../intl-scm/guile-strings.c:3260
-#: ../intl-scm/guile-strings.c:3522 ../intl-scm/guile-strings.c:3578
-#: ../intl-scm/guile-strings.c:3756 ../intl-scm/guile-strings.c:3760
-#: ../intl-scm/guile-strings.c:3780 ../intl-scm/guile-strings.c:3836
+#: ../src/gnome-utils/gnc-tree-view-account.c:613
+#: ../intl-scm/guile-strings.c:1360 ../intl-scm/guile-strings.c:1400
+#: ../intl-scm/guile-strings.c:2452 ../intl-scm/guile-strings.c:3076
+#: ../intl-scm/guile-strings.c:3364 ../intl-scm/guile-strings.c:4514
+#: ../intl-scm/guile-strings.c:5444 ../intl-scm/guile-strings.c:5534
+#: ../intl-scm/guile-strings.c:5624 ../intl-scm/guile-strings.c:5714
+#: ../intl-scm/guile-strings.c:5930 ../intl-scm/guile-strings.c:5986
+#: ../intl-scm/guile-strings.c:6248 ../intl-scm/guile-strings.c:6304
+#: ../intl-scm/guile-strings.c:6454 ../intl-scm/guile-strings.c:6510
+#: ../intl-scm/guile-strings.c:6772 ../intl-scm/guile-strings.c:6828
+#: ../intl-scm/guile-strings.c:7006 ../intl-scm/guile-strings.c:7010
+#: ../intl-scm/guile-strings.c:7032 ../intl-scm/guile-strings.c:7088
+#: ../intl-scm/guile-strings.c:7246 ../intl-scm/guile-strings.c:7250
+#: ../intl-scm/guile-strings.c:7272 ../intl-scm/guile-strings.c:7328
msgid "Total"
msgstr "Betrag"
-#: ../src/gnome-utils/gnc-tree-view-account.c:624
+#: ../src/gnome-utils/gnc-tree-view-account.c:620
msgid "Total (Report)"
msgstr "Saldo (als Bericht)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:630
+#: ../src/gnome-utils/gnc-tree-view-account.c:626
msgid "Total (Period)"
msgstr "Saldo (Periodenbezogen)"
-#: ../src/gnome-utils/gnc-tree-view-account.c:642
+#: ../src/gnome-utils/gnc-tree-view-account.c:638
msgid "Tax Info"
msgstr "Steuerrelevante Information"
#. Translators: This string has a context prefix; the translation
#. must only contain the part after the | character.
-#: ../src/gnome-utils/gnc-tree-view-account.c:650
+#: ../src/gnome-utils/gnc-tree-view-account.c:646
msgid "Column letter for 'Placeholder'|P"
msgstr "P"
#. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1409
+#: ../src/gnome-utils/gnc-tree-view-account.c:1405
#, c-format
msgid "Present (%s)"
msgstr "Aktuell (%s)"
#. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1412
+#: ../src/gnome-utils/gnc-tree-view-account.c:1408
#, c-format
msgid "Balance (%s)"
msgstr "Saldo (%s)"
#. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1415
+#: ../src/gnome-utils/gnc-tree-view-account.c:1411
#, c-format
msgid "Cleared (%s)"
msgstr "Bestätigt (%s)"
#. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1418
+#: ../src/gnome-utils/gnc-tree-view-account.c:1414
#, c-format
msgid "Reconciled (%s)"
msgstr "Abgeglichen (%s)"
#. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1421
+#: ../src/gnome-utils/gnc-tree-view-account.c:1417
#, c-format
msgid "Future Minimum (%s)"
msgstr "Zukünftiges Minimum (%s)"
#. Translators: %s is a currency mnemonic.
-#: ../src/gnome-utils/gnc-tree-view-account.c:1424
+#: ../src/gnome-utils/gnc-tree-view-account.c:1420
#, c-format
msgid "Total (%s)"
msgstr "Gesamt (%s)"
@@ -11981,22 +12258,39 @@
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
#: ../src/gnome-utils/gnc-tree-view-price.c:465
-#: ../src/register/ledger-core/split-register.c:2036
+#: ../src/register/ledger-core/split-register.c:2058
#: ../src/register/ledger-core/split-register-model.c:228
-#: ../intl-scm/guile-strings.c:1124 ../intl-scm/guile-strings.c:1198
-#: ../intl-scm/guile-strings.c:1286 ../intl-scm/guile-strings.c:1500
-#: ../intl-scm/guile-strings.c:1738 ../intl-scm/guile-strings.c:2038
-#: ../intl-scm/guile-strings.c:2202 ../intl-scm/guile-strings.c:2256
-#: ../intl-scm/guile-strings.c:2476 ../intl-scm/guile-strings.c:2566
-#: ../intl-scm/guile-strings.c:2616 ../intl-scm/guile-strings.c:3236
-#: ../intl-scm/guile-strings.c:3554 ../intl-scm/guile-strings.c:3812
+#: ../intl-scm/guile-strings.c:1836 ../intl-scm/guile-strings.c:1910
+#: ../intl-scm/guile-strings.c:1996 ../intl-scm/guile-strings.c:2210
+#: ../intl-scm/guile-strings.c:2448 ../intl-scm/guile-strings.c:2460
+#: ../intl-scm/guile-strings.c:2534 ../intl-scm/guile-strings.c:2620
+#: ../intl-scm/guile-strings.c:2834 ../intl-scm/guile-strings.c:3072
+#: ../intl-scm/guile-strings.c:3372 ../intl-scm/guile-strings.c:3536
+#: ../intl-scm/guile-strings.c:3590 ../intl-scm/guile-strings.c:3810
+#: ../intl-scm/guile-strings.c:3900 ../intl-scm/guile-strings.c:3950
+#: ../intl-scm/guile-strings.c:4522 ../intl-scm/guile-strings.c:4686
+#: ../intl-scm/guile-strings.c:4740 ../intl-scm/guile-strings.c:4960
+#: ../intl-scm/guile-strings.c:5050 ../intl-scm/guile-strings.c:5100
+#: ../intl-scm/guile-strings.c:5962 ../intl-scm/guile-strings.c:6280
+#: ../intl-scm/guile-strings.c:6486 ../intl-scm/guile-strings.c:6804
+#: ../intl-scm/guile-strings.c:7064 ../intl-scm/guile-strings.c:7304
msgid "Price"
msgstr "Preis"
@@ -12040,18 +12334,18 @@
"deaktivieren. Dieser Wert kann maximal 10 betragen."
#: ../src/gnome-utils/window-main-summarybar.c:316
-#, c-format
-msgid "%s, total:"
+#, fuzzy, c-format
+msgid "%s, Total:"
msgstr "%s, Summe:"
#: ../src/gnome-utils/window-main-summarybar.c:319
-#, c-format
-msgid "%s, non currency commodities total:"
+#, fuzzy, c-format
+msgid "%s, Non Currency Commodities Total:"
msgstr "%s, Aktien gesamt:"
#: ../src/gnome-utils/window-main-summarybar.c:322
-#, c-format
-msgid "%s, grand total:"
+#, fuzzy, c-format
+msgid "%s, Grand Total:"
msgstr "%s, Gesamt:"
#: ../src/gnome-utils/window-main-summarybar.c:326
@@ -12067,79 +12361,79 @@
msgid "Profits:"
msgstr "Gewinn:"
-#: ../src/gnome/window-reconcile.c:432
+#: ../src/gnome/window-reconcile.c:431
msgid "Interest Payment"
msgstr "Habenzinsen"
-#: ../src/gnome/window-reconcile.c:435
+#: ../src/gnome/window-reconcile.c:434
msgid "Interest Charge"
msgstr "Sollzinsen"
-#: ../src/gnome/window-reconcile.c:453
+#: ../src/gnome/window-reconcile.c:452
msgid "Payment From"
msgstr "Zahlung von"
-#: ../src/gnome/window-reconcile.c:457 ../src/gnome/window-reconcile.c:467
+#: ../src/gnome/window-reconcile.c:456 ../src/gnome/window-reconcile.c:466
msgid "Reconcile Account"
msgstr "Konto abgleichen"
-#: ../src/gnome/window-reconcile.c:472
+#: ../src/gnome/window-reconcile.c:471
msgid "Payment To"
msgstr "Zahlung an"
-#: ../src/gnome/window-reconcile.c:483
+#: ../src/gnome/window-reconcile.c:482
msgid "No Auto Interest Payments for this Account"
msgstr "Keine automatischen Habenzins-Zahlungen für dieses Konto"
-#: ../src/gnome/window-reconcile.c:484
+#: ../src/gnome/window-reconcile.c:483
msgid "No Auto Interest Charges for this Account"
msgstr "Keine automatischen Sollzins-Zahlungen für dieses Konto"
-#: ../src/gnome/window-reconcile.c:723
+#: ../src/gnome/window-reconcile.c:722
msgid "Enter _Interest Charge..."
msgstr "Zahlung _Sollzins eingeben..."
-#: ../src/gnome/window-reconcile.c:981
+#: ../src/gnome/window-reconcile.c:980
msgid "Debits"
msgstr "Soll"
#. src/report/report-system/report-utilities.scm
-#: ../src/gnome/window-reconcile.c:991 ../intl-scm/guile-strings.c:852
+#: ../src/gnome/window-reconcile.c:990 ../intl-scm/guile-strings.c:1366
msgid "Credits"
msgstr "Haben"
-#: ../src/gnome/window-reconcile.c:1130
+#: ../src/gnome/window-reconcile.c:1129
msgid "Are you sure you want to delete the selected transaction?"
msgstr ""
"Sind Sie sicher, dass Sie den ausgewählten Buchungssatz löschen wollen?"
#. ending balance title/value
-#: ../src/gnome/window-reconcile.c:1673
+#: ../src/gnome/window-reconcile.c:1674
msgid "Ending Balance:"
msgstr "Schlußsaldo:"
#. reconciled balance title/value
-#: ../src/gnome/window-reconcile.c:1683
+#: ../src/gnome/window-reconcile.c:1684
msgid "Reconciled Balance:"
msgstr "Abgeglichener Saldo:"
#. difference title/value
-#: ../src/gnome/window-reconcile.c:1693
+#: ../src/gnome/window-reconcile.c:1694
msgid "Difference:"
msgstr "Differenz:"
-#: ../src/gnome/window-reconcile.c:1875
+#: ../src/gnome/window-reconcile.c:1877
msgid "The account is not balanced. Are you sure you want to finish?"
msgstr ""
"Das Konto ist nicht ausgeglichen. Sind Sie sicher, dass Sie das Abgleichen "
"beenden wollen?"
-#: ../src/gnome/window-reconcile.c:1932
+#: ../src/gnome/window-reconcile.c:1934
msgid "Do you want to postpone this reconciliation and finish it later?"
msgstr ""
"Möchten Sie dieses Abgleichen jetzt unterbrechen und später fertigstellen?"
-#: ../src/gnome/window-reconcile.c:1966
+#: ../src/gnome/window-reconcile.c:1968
msgid ""
"You have made changes to this reconcile window. Are you sure you want to "
"cancel?"
@@ -12148,67 +12442,67 @@
"wollen?"
#. Toplevel
-#: ../src/gnome/window-reconcile.c:1983
+#: ../src/gnome/window-reconcile.c:1985
msgid "_Reconcile"
msgstr "Ab_gleichen"
-#: ../src/gnome/window-reconcile.c:1984
+#: ../src/gnome/window-reconcile.c:1986
msgid "_Account"
msgstr "_Konto"
#. Reconcile menu
-#: ../src/gnome/window-reconcile.c:1990
+#: ../src/gnome/window-reconcile.c:1992
msgid "_Reconcile Information..."
msgstr "_Informationen zum Abgleich..."
-#: ../src/gnome/window-reconcile.c:1991
+#: ../src/gnome/window-reconcile.c:1993
msgid ""
"Change the reconcile information including statement date and ending balance."
msgstr ""
"Informationen zum Abgleich ändern, zum Beispiel das Datum und der "
"Schlußsaldo des Kontoauszugs."
-#: ../src/gnome/window-reconcile.c:1994
+#: ../src/gnome/window-reconcile.c:1996
msgid "_Finish"
msgstr "_Fertig"
-#: ../src/gnome/window-reconcile.c:1995
+#: ../src/gnome/window-reconcile.c:1997
msgid "Finish the reconciliation of this account"
msgstr "Kontoabstimmung beenden"
-#: ../src/gnome/window-reconcile.c:1997
+#: ../src/gnome/window-reconcile.c:1999
msgid "_Postpone"
msgstr "_Unterbrechen"
-#: ../src/gnome/window-reconcile.c:1998
+#: ../src/gnome/window-reconcile.c:2000
msgid "Postpone the reconciliation of this account"
msgstr "Das Abgleichen des Kontos unterbrechen"
-#: ../src/gnome/window-reconcile.c:2001
+#: ../src/gnome/window-reconcile.c:2003
msgid "Cancel the reconciliation of this account"
msgstr "Die Abstimmung dieses Kontos abbrechen"
-#: ../src/gnome/window-reconcile.c:2007
+#: ../src/gnome/window-reconcile.c:2009
msgid "Open the account"
msgstr "Konto öffnen"
-#: ../src/gnome/window-reconcile.c:2010
+#: ../src/gnome/window-reconcile.c:2012
msgid "Edit the main account for this register"
msgstr "Bearbeiten des Hauptkonto für dieses Kontobuch"
-#: ../src/gnome/window-reconcile.c:2023
+#: ../src/gnome/window-reconcile.c:2025
msgid "Add a new transaction to the account"
msgstr "Dem Konto einen neuen Buchungssatz hinzufügen"
-#: ../src/gnome/window-reconcile.c:2026
+#: ../src/gnome/window-reconcile.c:2028
msgid "Edit the current transaction"
msgstr "Aktuellen Buchungssatz bearbeiten"
-#: ../src/gnome/window-reconcile.c:2029
+#: ../src/gnome/window-reconcile.c:2031
msgid "Delete the selected transaction"
msgstr "Ausgewählten Buchungssatz löschen"
-#: ../src/gnome/window-reconcile.c:2035
+#: ../src/gnome/window-reconcile.c:2037
msgid "Open the GnuCash help window"
msgstr "Das GnuCash-Hilfe-Fenster öffnen"
@@ -12242,10 +12536,6 @@
msgstr "<b>Buchungen importieren</b>"
#: ../src/import-export/generic-import.glade.h:8
-msgid "A"
-msgstr "Neu"
-
-#: ../src/import-export/generic-import.glade.h:9
msgid ""
"A transaction whose best match's score is in the green zone (above or equal "
"to the Auto-CLEAR threshold) will be CLEARed by default."
@@ -12254,7 +12544,7 @@
"grünen Bereich liegt (größer oder gleich der Auto-Abgleich-Schwelle) hat als "
"Voreinstellung 'Abgleichen'."
-#: ../src/import-export/generic-import.glade.h:10
+#: ../src/import-export/generic-import.glade.h:9
msgid ""
"A transaction whose best match's score is in the red zone (above the display "
"threshold but below or equal to the Auto-ADD threshold) will be ADDed by "
@@ -12264,44 +12554,36 @@
"roten Bereich liegt (größer als Anzeige-Schwelle, aber kleiner oder gleich "
"der Auto-Hinzufügen-Schwelle), hat als Voreinstellung 'Hinzufügen'."
-#: ../src/import-export/generic-import.glade.h:13
+#: ../src/import-export/generic-import.glade.h:11
msgid "Auto-_add threshold"
msgstr "Entscheidungsschwelle für automatisches Hinzufügen"
-#: ../src/import-export/generic-import.glade.h:14
+#: ../src/import-export/generic-import.glade.h:12
msgid "Auto-c_lear threshold"
msgstr "Entscheidungsschwelle für automatisches Abgleichen"
-#: ../src/import-export/generic-import.glade.h:15
+#: ../src/import-export/generic-import.glade.h:13
msgid "Choose a format"
msgstr "Wählen Sie das Export-Format"
-#: ../src/import-export/generic-import.glade.h:16
+#: ../src/import-export/generic-import.glade.h:14
msgid "Commercial ATM _fees threshold"
msgstr "Auszahlungsgebühren"
-#: ../src/import-export/generic-import.glade.h:17
-msgid "Confidence"
-msgstr "Genauigkeit"
-
-#: ../src/import-export/generic-import.glade.h:21
-msgid "EDIT"
-msgstr "Bearbeiten"
-
-#: ../src/import-export/generic-import.glade.h:22
+#: ../src/import-export/generic-import.glade.h:18
msgid "Enable edit match action"
msgstr "»Bearbeiten«-Aktion aktivieren"
-#: ../src/import-export/generic-import.glade.h:23
+#: ../src/import-export/generic-import.glade.h:19
msgid "Enable skip transaction action"
msgstr "»Überspringen«-Aktion aktivieren "
-#: ../src/import-export/generic-import.glade.h:24
+#: ../src/import-export/generic-import.glade.h:20
msgid "Enable the EDIT action in the transaction matcher. NOT YET SUPPORTED"
msgstr ""
"»Bearbeiten«-Aktion im Buchungsimporter aktivieren. Noch nicht implementiert"
-#: ../src/import-export/generic-import.glade.h:25
+#: ../src/import-export/generic-import.glade.h:21
msgid ""
"Enable the SKIP action in the transaction matcher. If enabled, a "
"transaction whose best match's score is in the yellow zone (above the Auto-"
@@ -12312,7 +12594,7 @@
"liegt (größer als die Auto-Hinzufügen-Schwelle, aber kleiner als die Auto-"
"Abgleichen-Schwelle), hat als Voreinstellung »Überspringen«."
-#: ../src/import-export/generic-import.glade.h:26
+#: ../src/import-export/generic-import.glade.h:22
msgid ""
"For a new transaction, click on the \"Other Account\" entry to choose the "
"other (destination) account of this transaction.\n"
@@ -12334,19 +12616,19 @@
"Wenn allen neuen Buchungen ein »Anderes Konto« zugeordnet wurde und alle "
"Duplikate richtig erkannt wurden, klicken Sie »Ok«."
-#: ../src/import-export/generic-import.glade.h:33
+#: ../src/import-export/generic-import.glade.h:29
msgid "Generic import transaction matcher"
msgstr "Buchungszuordnung für Allgemeinen Import"
-#: ../src/import-export/generic-import.glade.h:34
+#: ../src/import-export/generic-import.glade.h:30
msgid "Green"
msgstr "Grün"
-#: ../src/import-export/generic-import.glade.h:36
+#: ../src/import-export/generic-import.glade.h:31
msgid "Imported transaction's first split:"
msgstr "Erster Teil der importierten Buchung"
-#: ../src/import-export/generic-import.glade.h:37
+#: ../src/import-export/generic-import.glade.h:32
msgid ""
"In some places commercial ATMs (not belonging to a financial institution) "
"are installed in places like convienience store. These ATM add its fee "
@@ -12362,66 +12644,59 @@
"existierende Buchung richtig zuzuordnen, können Sie hier die Höhe für solche "
"zusätzlichen Auszahlungsgebühren in Ihrer lokalen Währung angeben."
-#: ../src/import-export/generic-import.glade.h:38
+#: ../src/import-export/generic-import.glade.h:33
msgid "List of downloaded transactions (source split shown):"
msgstr ""
"Liste der importierten Buchungen (angezeigt wird die Herkunftsbuchung):"
-#: ../src/import-export/generic-import.glade.h:39
+#: ../src/import-export/generic-import.glade.h:34
msgid "Match _display threshold"
msgstr "Entscheidungsschwelle für Anzeige in Zuordnung"
-#: ../src/import-export/generic-import.glade.h:41
-#: ../src/import-export/hbci/glade/hbci.glade.h:38
-#: ../src/import-export/qif-import/qif.glade.h:53
+#: ../src/import-export/generic-import.glade.h:35
+#: ../src/import-export/hbci/druid-hbci-initial.c:707
+#: ../src/import-export/qif-import/dialog-account-picker.c:296
+#: ../src/import-export/qif-import/druid-qif-import.c:1056
msgid "New?"
msgstr "Neu?"
-#: ../src/import-export/generic-import.glade.h:42
+#: ../src/import-export/generic-import.glade.h:36
msgid "Online account ID here..."
msgstr "Online Kontonummer hier..."
-#: ../src/import-export/generic-import.glade.h:43
+#: ../src/import-export/generic-import.glade.h:37
msgid "Other Account"
msgstr "Anderes Konto"
-#: ../src/import-export/generic-import.glade.h:44
+#: ../src/import-export/generic-import.glade.h:38
msgid "Please select or create an appropriate GnuCash account for:"
msgstr "Auswählen oder Hinzufügen des passenden GnuCash Kontos:"
-#: ../src/import-export/generic-import.glade.h:45
+#: ../src/import-export/generic-import.glade.h:39
msgid "Potential splits matching the selected transaction: "
msgstr "Mögliche Buchungen, die zum aktuellen Buchungssatz passen: "
-#: ../src/import-export/generic-import.glade.h:47
-msgid "R"
-msgstr "Abgl"
-
-#: ../src/import-export/generic-import.glade.h:48
+#: ../src/import-export/generic-import.glade.h:41
msgid "Red"
msgstr "Rot"
-#: ../src/import-export/generic-import.glade.h:49
+#: ../src/import-export/generic-import.glade.h:42
msgid "Select \"A\" to add the transaction as new."
msgstr "Wählen Sie »Neu«, um die Buchung als neue Buchung zu importieren."
-#: ../src/import-export/generic-import.glade.h:50
+#: ../src/import-export/generic-import.glade.h:43
msgid "Select \"R\" to reconcile a matching transaction."
msgstr "Wählen Sie »Abgl«, um eine existierende Buchung abzugleichen"
-#: ../src/import-export/generic-import.glade.h:52
-msgid "Select Import Action"
-msgstr "Import-Aktion auswählen"
-
-#: ../src/import-export/generic-import.glade.h:53
+#: ../src/import-export/generic-import.glade.h:45
msgid "Select matching existing transaction"
msgstr "Wählen Sie die zugeordnete, schon existierende Buchung"
-#: ../src/import-export/generic-import.glade.h:54
+#: ../src/import-export/generic-import.glade.h:46
msgid "Select neither to skip the transaction (it won't be imported at all)."
msgstr "Ist keines der beiden gewählt, wird die Buchung nicht importiert."
-#: ../src/import-export/generic-import.glade.h:55
+#: ../src/import-export/generic-import.glade.h:47
msgid ""
"The minimum score a potential match must have to be displayed in the match "
"list."
@@ -12430,116 +12705,121 @@
"existierenden Buchung im Buchungs-Import überhaupt berücksichtigt und "
"angezeigt wird."
-#: ../src/import-export/generic-import.glade.h:56
+#: ../src/import-export/generic-import.glade.h:48
msgid ""
"This transaction probably requires your intervention or it will be imported "
"unbalanced."
msgstr ""
"Diese Buchung benötigt Ihre Auswahl oder sie würde unausgeglichen importiert."
-#: ../src/import-export/generic-import.glade.h:57
+#: ../src/import-export/generic-import.glade.h:49
msgid "This transaction requires your intervention or it will NOT be imported."
msgstr "Diese Buchung benötigt Ihre Auswahl oder sie würde nicht importiert."
-#: ../src/import-export/generic-import.glade.h:58
+#: ../src/import-export/generic-import.glade.h:50
msgid ""
"This transaction will be imported balanced (you may still want to double "
"check the match or destination account)."
msgstr "Diese Buchung wird ausgeglichen importiert."
-#: ../src/import-export/generic-import.glade.h:59
+#: ../src/import-export/generic-import.glade.h:51
msgid "Transaction List Help"
msgstr "Buchungsimport Hilfe"
-#: ../src/import-export/generic-import.glade.h:60
+#: ../src/import-export/generic-import.glade.h:52
msgid "Use _bayesian matching"
msgstr "_Bayes-Algorithmus verwenden"
-#: ../src/import-export/generic-import.glade.h:61
+#: ../src/import-export/generic-import.glade.h:53
msgid ""
"Use bayesian algorithms to match new transactions with existing accounts."
msgstr ""
"Bayes-Algorithmus verwenden, um importierte Buchungen mit existierenden "
"abzugleichen."
-#: ../src/import-export/generic-import.glade.h:62
+#: ../src/import-export/generic-import.glade.h:54
msgid "Yellow"
msgstr "Gelb"
-#: ../src/import-export/generic-import.glade.h:63
+#: ../src/import-export/generic-import.glade.h:55
msgid "do not translate"
msgstr "do not translate"
-#: ../src/import-export/generic-import.glade.h:64
-#: ../src/import-export/qif-import/qif.glade.h:97
+#: ../src/import-export/generic-import.glade.h:56
+#: ../src/import-export/qif-import/qif.glade.h:87
msgid "gnc-new-account"
msgstr "gnc-new-account"
#. Numeric formats
-#: ../src/import-export/gnc-import-format-gnome.c:91
+#: ../src/import-export/gnc-import-format-gnome.c:106
msgid "Period-as-decimal (1,000.00)"
msgstr "Punkt als Kommastelle (Englisch: 1,000.00)"
-#: ../src/import-export/gnc-import-format-gnome.c:92
+#: ../src/import-export/gnc-import-format-gnome.c:107
msgid "Comma-as-decimal (1.000,00)"
msgstr "Komma als Kommastelle (1.000,00)"
#. Date formats
-#: ../src/import-export/gnc-import-format-gnome.c:95
+#: ../src/import-export/gnc-import-format-gnome.c:110
msgid "m-d-y"
msgstr "Monat-Tag-Jahr"
-#: ../src/import-export/gnc-import-format-gnome.c:96
+#: ../src/import-export/gnc-import-format-gnome.c:111
msgid "d-m-y"
msgstr "Tag-Monat-Jahr"
-#: ../src/import-export/gnc-import-format-gnome.c:97
+#: ../src/import-export/gnc-import-format-gnome.c:112
msgid "y-m-d"
msgstr "Jahr-Monat-Tag"
-#: ../src/import-export/gnc-import-format-gnome.c:98
+#: ../src/import-export/gnc-import-format-gnome.c:113
msgid "y-d-m"
msgstr "Jahr-Tag-Monat"
-#. Translators: Strings from this file are really only
-#. * needed inside Germany (HBCI is not supported anywhere
-#. * else). You may safely ignore strings from the
-#. * import-export/hbci subdirectory in other countries.
-#: ../src/import-export/hbci/dialog-hbcitrans.c:372
+#. Translators: Strings from this file are needed only in
+#. * countries that have one of aqbanking's Online Banking
+#. * techniques available. This is 'OFX DirectConnect'
+#. * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet'
+#. * (Switzerland). If none of these techniques are available
+#. * in your country, you may safely ignore strings from the
+#. * import-export/hbci subdirectory.
+#: ../src/import-export/hbci/dialog-hbcitrans.c:375
msgid "Enter an Online Direct Debit Note"
msgstr "Online-Lastschrift eingeben"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:375
+#: ../src/import-export/hbci/dialog-hbcitrans.c:378
msgid "Debited Account Owner"
msgstr "Zahlungspflichtiger"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:377
+#: ../src/import-export/hbci/dialog-hbcitrans.c:380
msgid "Debited Account Number"
msgstr "Konto-Nr. des Zahlungspflichtigen"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:379
+#: ../src/import-export/hbci/dialog-hbcitrans.c:382
msgid "Debited Account Bank Code"
msgstr "BLZ des Zahlungspflichtigen"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:382
+#: ../src/import-export/hbci/dialog-hbcitrans.c:385
msgid "Credited Account Owner"
msgstr "Auftraggeber"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:384
+#: ../src/import-export/hbci/dialog-hbcitrans.c:387
msgid "Credited Account Number"
msgstr "Konto-Nr. des Auftraggebers"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:386
+#: ../src/import-export/hbci/dialog-hbcitrans.c:389
msgid "Credited Account Bank Code"
msgstr "BLZ des Auftraggebers"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:405
-#: ../src/import-export/hbci/dialog-hbcitrans.c:879
-#: ../src/import-export/hbci/dialog-hbcitrans.c:889
+#. Conversion was erroneous, so don't use the string
+#: ../src/import-export/hbci/dialog-hbcitrans.c:415
+#: ../src/import-export/hbci/dialog-hbcitrans.c:901
+#: ../src/import-export/hbci/dialog-hbcitrans.c:905
+#: ../src/import-export/hbci/dialog-hbcitrans.c:915
msgid "(unknown)"
msgstr "(unbekannt)"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:536
+#: ../src/import-export/hbci/dialog-hbcitrans.c:549
msgid ""
"The amount is zero or the amount field could not be interpreted correctly. "
"You might have mixed up decimal point and comma, compared to your locale "
@@ -12555,7 +12835,7 @@
"Dies ergibt keinen zulässigen Zahlungsauftrag. Wollen Sie den Auftrag erneut "
"eingeben?"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:558
+#: ../src/import-export/hbci/dialog-hbcitrans.c:571
msgid ""
"You did not enter any transaction purpose. A purpose is required for an "
"online transfer.\n"
@@ -12567,7 +12847,7 @@
"\n"
"Wollen Sie den Auftrag erneut eingeben?"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:693
+#: ../src/import-export/hbci/dialog-hbcitrans.c:706
#, c-format
msgid ""
"The internal check of the destination account number '%s' at the specified "
@@ -12580,7 +12860,7 @@
"Fehler enthält. Wollen Sie den Auftrag trotzdem mit dieser Kontonummer "
"abschicken?"
-#: ../src/import-export/hbci/dialog-hbcitrans.c:799
+#: ../src/import-export/hbci/dialog-hbcitrans.c:812
msgid ""
"The job was sent to the bank successfully, but the bank is refusing to "
"execute the job. Please check the log window for the exact error message of "
@@ -12600,37 +12880,43 @@
msgid "The two passwords didn't match. Please try again."
msgstr "Die beiden PINs haben nicht übereingestimmt. Bitte erneut eingeben."
-#: ../src/import-export/hbci/druid-hbci-initial.c:145
+#: ../src/import-export/hbci/druid-hbci-initial.c:133
#, c-format
msgid "%s at %s (code %s)"
msgstr "%s bei %s (BLZ %s)"
-#: ../src/import-export/hbci/druid-hbci-initial.c:150
+#: ../src/import-export/hbci/druid-hbci-initial.c:138
#, c-format
msgid "%s at bank code %s"
msgstr "%s bei %s"
-#: ../src/import-export/hbci/druid-hbci-initial.c:522
+#: ../src/import-export/hbci/druid-hbci-initial.c:478
msgid "Choose AqBanking Backend"
msgstr "AqBanking-Modul wählen"
-#: ../src/import-export/hbci/druid-hbci-initial.c:523
+#: ../src/import-export/hbci/druid-hbci-initial.c:479
msgid "Please choose an AqBanking backend to be configured"
msgstr "Wählen Sie das Modul von AqBanking, das Sie einrichten möchten."
-#: ../src/import-export/hbci/druid-hbci-initial.c:524
+#: ../src/import-export/hbci/druid-hbci-initial.c:480
msgid "Co_nfigure"
msgstr "_Einrichten"
-#. Each of the %s is the name of the backend, e.g. "aqhbci".
-#: ../src/import-export/hbci/druid-hbci-initial.c:642
+#: ../src/import-export/hbci/druid-hbci-initial.c:552
#, c-format
msgid ""
-"The external program \"%s Setup Wizard\" returned a nonzero exit code which "
-"means it has not been finished successfully. The further HBCI setup can only "
-"be finished if the %s Setup Wizard is run successfully. Please try to start "
-"and successfully finish the %s Setup Wizard program again."
+"The Windows version of GnuCash does not (yet) have the capability to start "
+"the external program \"%s Setup Wizard\". Please start it yourself from the "
+"location \"%s\" before you continue."
msgstr ""
+
+#: ../src/import-export/hbci/druid-hbci-initial.c:616
+#, fuzzy
+msgid ""
+"The external program \"AqBanking Setup Wizard\" failed to run successfully. "
+"Online Banking can only be setup if this wizard has run successfully. "
+"Please try running the \"AqBanking Setup Wizard\" again."
+msgstr ""
"Das externe Programm »%s Einrichtungs-Assistent« hat einen Fehlercode "
"zurückgegeben, was bedeutet, dass die Einrichtung nicht erfolgreich "
"abgeschlossen worden ist. Die weitere HBCI Einrichtung in GnuCash kann nur "
@@ -12639,13 +12925,14 @@
"auszuführen."
#. Each of the %s is the name of the backend, e.g. "aqhbci".
-#: ../src/import-export/hbci/druid-hbci-initial.c:655
-#, c-format
+#: ../src/import-export/hbci/druid-hbci-initial.c:627
+#, fuzzy
msgid ""
-"The external program \"%s Setup Wizard\" has not been found. \n"
+"The external program \"AqBanking Setup Wizard\" has not been found. \n"
"\n"
-"The package aqbanking is supposed to install the program \"%s-qt3-wizard\". "
-"Please check your installation of aqbanking."
+"The aqbanking package should include the program \"qt3-wizard\". Please "
+"check your installation to ensure this program is present. On some "
+"distributions this may require installing additional packages."
msgstr ""
"Das externe Programm »%s Einrichtungs-Assistent« konnte nicht gefunden "
"werden. \n"
@@ -12654,6 +12941,15 @@
"dann ein Programm namens »%s-qt3-wizard« installiert ist. Bitte "
"kontrollieren Sie Ihre Installation der Bibliothek aqbanking."
+#: ../src/import-export/hbci/druid-hbci-initial.c:692
+#, fuzzy
+msgid "Online Banking Account Name"
+msgstr "Name des Gegenkontos"
+
+#: ../src/import-export/hbci/druid-hbci-initial.c:699
+msgid "GnuCash Account Name"
+msgstr "GnuCash Kontoname"
+
#: ../src/import-export/hbci/druid-hbci-utils.c:158
#, c-format
msgid "The file %s does not exist. Would you like to create it now?"
@@ -12697,293 +12993,266 @@
msgstr "Aktuelle Online-Buchung als neue Überweisungsvorlage hinzufügen"
#: ../src/import-export/hbci/glade/hbci.glade.h:9
-msgid ""
-"AqHBCI \n"
-"Setup"
-msgstr ""
-"AqHBCI \n"
-"Einrichtung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:11
msgid "Bank Code"
msgstr "Bankleitzahl"
-#: ../src/import-export/hbci/glade/hbci.glade.h:12
-msgid "Choose a HBCI Version to use with the selected bank:"
+#: ../src/import-export/hbci/glade/hbci.glade.h:10
+#, fuzzy
+msgid "Choose an Online Banking Version to use with the selected bank:"
msgstr "Wählen Sie eine HBCI-Version, die benutzt werden soll:"
-#: ../src/import-export/hbci/glade/hbci.glade.h:13
+#: ../src/import-export/hbci/glade/hbci.glade.h:11
+#, fuzzy
msgid ""
-"Click on the line of a HBCI account name if you want to match it to a "
-"GnuCash account. Click \"Forward\" when all desired accounts are matching."
+"Click on the line of an Online Banking account name if you want to match it "
+"to a GnuCash account. Click \"Forward\" when all desired accounts are "
+"matching."
msgstr ""
"Klicken Sie auf die Zeile eines HBCI-Kontos, um diesem HBCI-Konto ein "
"GnuCash-Konto zuzuordnen. Klicken Sie »Vor«, wenn alle gewünschten Konten "
"zugeordnet sind."
-#: ../src/import-export/hbci/glade/hbci.glade.h:14
+#: ../src/import-export/hbci/glade/hbci.glade.h:12
msgid "Close when finished"
msgstr "Fenster nach Verbindungsende schließen"
-#: ../src/import-export/hbci/glade/hbci.glade.h:15
+#: ../src/import-export/hbci/glade/hbci.glade.h:13
msgid "Current Action"
msgstr "Momentane Aktion"
-#: ../src/import-export/hbci/glade/hbci.glade.h:16
+#: ../src/import-export/hbci/glade/hbci.glade.h:14
msgid "Current Job"
msgstr "Momentaner Auftrag"
-#: ../src/import-export/hbci/glade/hbci.glade.h:17
+#: ../src/import-export/hbci/glade/hbci.glade.h:15
msgid "Date range of transactions to retrieve:"
msgstr "Datumsbereich der abzurufenden Buchungen:"
-#: ../src/import-export/hbci/glade/hbci.glade.h:18
+#: ../src/import-export/hbci/glade/hbci.glade.h:16
msgid "Delete the currently selected transaction template"
msgstr "Ausgewählte Überweisungsvorlage löschen"
-#: ../src/import-export/hbci/glade/hbci.glade.h:19
+#: ../src/import-export/hbci/glade/hbci.glade.h:17
msgid "E_nter date:"
msgstr "D_atum eingeben:"
-#: ../src/import-export/hbci/glade/hbci.glade.h:20
+#: ../src/import-export/hbci/glade/hbci.glade.h:18
msgid "Ente_r date:"
msgstr "Datum _eingeben:"
-#: ../src/import-export/hbci/glade/hbci.glade.h:21
+#: ../src/import-export/hbci/glade/hbci.glade.h:19
msgid "Enter an Online Transaction"
msgstr "Online-Ãœberweisung eingeben"
-#: ../src/import-export/hbci/glade/hbci.glade.h:22
+#: ../src/import-export/hbci/glade/hbci.glade.h:20
msgid "Enter name for new template:"
msgstr "Bitte geben Sie einen Namen für die neue Überweisungsvorlage ein:"
-#: ../src/import-export/hbci/glade/hbci.glade.h:23
+#: ../src/import-export/hbci/glade/hbci.glade.h:21
msgid "Execute Now"
msgstr "Jetzt ausführen"
-#: ../src/import-export/hbci/glade/hbci.glade.h:24
+#: ../src/import-export/hbci/glade/hbci.glade.h:22
msgid "Execute later (unimpl.)"
msgstr "Später ausführen (unfertig)"
-#: ../src/import-export/hbci/glade/hbci.glade.h:25
+#: ../src/import-export/hbci/glade/hbci.glade.h:23
msgid "Execute this online transaction now"
msgstr "Diesen Auftrag jetzt online abschicken"
-#: ../src/import-export/hbci/glade/hbci.glade.h:26
+#: ../src/import-export/hbci/glade/hbci.glade.h:24
msgid "Get Transactions Online"
msgstr "Online Kontoumsätze abfragen"
-#: ../src/import-export/hbci/glade/hbci.glade.h:27
-#: ../src/import-export/qif-import/qif.glade.h:22
-msgid "GnuCash account name"
-msgstr "GnuCash Kontobezeichnung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:28
-msgid "HBCI Connection Window"
-msgstr "HBCI Verbindungsfenster"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:29
-msgid "HBCI Setup"
-msgstr "HBCI Einrichtung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:30
-msgid "HBCI Setup Finished"
-msgstr "HBCI Einrichtung beendet"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:31
-msgid "HBCI Version"
-msgstr "HBCI Version"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:32
-msgid "HBCI account name"
-msgstr "HBCI Kontobezeichnung"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:33
-msgid "Initial HBCI Setup"
+#: ../src/import-export/hbci/glade/hbci.glade.h:25
+#, fuzzy
+msgid "Initial Online Banking Setup"
msgstr "Grundlegende HBCI Einrichtung"
-#: ../src/import-export/hbci/glade/hbci.glade.h:34
-msgid "Match HBCI accounts with GnuCash accounts"
+#: ../src/import-export/hbci/glade/hbci.glade.h:26
+#, fuzzy
+msgid "Match Online Banking accounts with GnuCash accounts"
msgstr "HBCI Konten mit GnuCash Konten zuordnen"
-#: ../src/import-export/hbci/glade/hbci.glade.h:35
+#: ../src/import-export/hbci/glade/hbci.glade.h:27
msgid "Move the selected transaction template one row down"
msgstr "Gewählte Überweisungsvorlage eine Zeile nach unten umsortieren"
-#: ../src/import-export/hbci/glade/hbci.glade.h:36
+#: ../src/import-export/hbci/glade/hbci.glade.h:28
msgid "Move the selected transaction template one row up"
msgstr "Gewählte Überweisungsvorlage eine Zeile nach oben umsortieren"
-#: ../src/import-export/hbci/glade/hbci.glade.h:37
+#: ../src/import-export/hbci/glade/hbci.glade.h:29
msgid "Name for new template"
msgstr "Namen für neue Überweisungsvorlage"
-#: ../src/import-export/hbci/glade/hbci.glade.h:39
-msgid ""
-"Now the setup for all HBCI accounts that are matching to a GnuCash account "
-"is finished. You can now invoke HBCI actions on those accounts.\n"
-"\n"
-"If you want to add another HBCI bank, user, or account, you can start this "
-"druid again anytime.\n"
-"\n"
-"Press \"Apply\" now."
-msgstr ""
-"Die Einrichtung des HBCI Zugangs und die Zuordnung zu den passenden GnuCash "
-"Konten ist fertig gestellt. Sie können nun HBCI-Aktionen in diesen Konten "
-"aufrufen (Menü Aktionen: Online Aktionen).\n"
-"\n"
-"Wenn Sie eine neue HBCI-Bank, einen neuen Benutzer oder ein neues Konto "
-"hinzufügen möchten, können Sie diesen Assistenten (Druiden) jederzeit wieder "
-"aufrufen.\n"
-"\n"
-"Klicken Sie jetzt »Anwenden«."
+#: ../src/import-export/hbci/glade/hbci.glade.h:30
+msgid "Online Banking Connection Window"
+msgstr "Onlinebanking Verbindungsfenster"
-#: ../src/import-export/hbci/glade/hbci.glade.h:44
+#: ../src/import-export/hbci/glade/hbci.glade.h:31
+#, fuzzy
+msgid "Online Banking Setup Finished"
+msgstr "HBCI Einrichtung beendet"
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:32
+#, fuzzy
+msgid "Online Banking Version"
+msgstr "Online-Auftrag Einzelüberweisung"
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:33
msgid "Online Transaction"
msgstr "Online-Auftrag Einzelüberweisung"
-#: ../src/import-export/hbci/glade/hbci.glade.h:45
+#: ../src/import-export/hbci/glade/hbci.glade.h:34
msgid "Originator Account Number"
msgstr "Konto-Nr. des Auftraggebers"
-#: ../src/import-export/hbci/glade/hbci.glade.h:46
+#: ../src/import-export/hbci/glade/hbci.glade.h:35
msgid "Originator Name"
msgstr "Auftraggeber: Name, Vorname"
-#: ../src/import-export/hbci/glade/hbci.glade.h:47
+#: ../src/import-export/hbci/glade/hbci.glade.h:36
msgid "Payment Purpose (only for recipient)"
msgstr "Verwendungszweck - z.B. Kunden-Referenznummer - (nur für Empfänger)"
-#: ../src/import-export/hbci/glade/hbci.glade.h:48
+#: ../src/import-export/hbci/glade/hbci.glade.h:37
msgid "Payment Purpose continued"
msgstr "noch Verwendungszweck (ggf. noch Anschrift des Auftraggebers)"
+#. src/import-export/qif-import/qif-import/qif-file.scm
+#. src/import-export/qif-import/qif-import/qif-to-gnc.scm
+#. src/import-export/qif-import/qif-import/qif-merge-groups.scm
#. src/import-export/qif-import/qif-file.scm
#. src/import-export/qif-import/qif-to-gnc.scm
#. src/import-export/qif-import/qif-merge-groups.scm
-#: ../src/import-export/hbci/glade/hbci.glade.h:49
-#: ../intl-scm/guile-strings.c:3114 ../intl-scm/guile-strings.c:3120
-#: ../intl-scm/guile-strings.c:3128
+#: ../src/import-export/hbci/glade/hbci.glade.h:38
+#: ../intl-scm/guile-strings.c:5804 ../intl-scm/guile-strings.c:5810
+#: ../intl-scm/guile-strings.c:5818 ../intl-scm/guile-strings.c:5822
+#: ../intl-scm/guile-strings.c:5828 ../intl-scm/guile-strings.c:5836
msgid "Progress"
msgstr "Verlauf"
-#: ../src/import-export/hbci/glade/hbci.glade.h:50
+#: ../src/import-export/hbci/glade/hbci.glade.h:39
msgid "Recipient Account Number"
msgstr "Konto-Nr. des Empfängers"
-#: ../src/import-export/hbci/glade/hbci.glade.h:51
+#: ../src/import-export/hbci/glade/hbci.glade.h:40
msgid "Recipient Bank Code"
msgstr "Bankleitzahl"
-#: ../src/import-export/hbci/glade/hbci.glade.h:52
+#: ../src/import-export/hbci/glade/hbci.glade.h:41
msgid "Recipient Name"
msgstr "Empfänger: Name, Vorname / Firma"
-#: ../src/import-export/hbci/glade/hbci.glade.h:53
+#: ../src/import-export/hbci/glade/hbci.glade.h:42
msgid "Sort"
msgstr "Sortieren"
-#: ../src/import-export/hbci/glade/hbci.glade.h:54
+#: ../src/import-export/hbci/glade/hbci.glade.h:43
msgid "Sort the list of transaction templates alphabetically"
msgstr "Die Liste der Ãœberweisungsvorlagen alphabetisch sortieren"
-#: ../src/import-export/hbci/glade/hbci.glade.h:55
-msgid "Start AqHBCI Setup Wizard"
-msgstr "AqHBCI Einrichtungs-Assistent starten"
+#: ../src/import-export/hbci/glade/hbci.glade.h:44
+msgid "Start AqBanking Setup Wizard"
+msgstr "AqBanking Einrichtungs-Assistent starten"
-#: ../src/import-export/hbci/glade/hbci.glade.h:56
-msgid "Start AqHBCI Wizard"
-msgstr "AqHBCI Einrichtungs-Assistenten starten"
+#: ../src/import-export/hbci/glade/hbci.glade.h:45
+msgid "Start AqBanking Wizard"
+msgstr "AqBanking Einrichtungs-Assistenten starten"
-#: ../src/import-export/hbci/glade/hbci.glade.h:57
+#: ../src/import-export/hbci/glade/hbci.glade.h:46
+msgid "Start Online Banking Wizard"
+msgstr "Onlinebanking Einrichtungs-Assistenten starten"
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:47
msgid ""
-"The Setup of your HBCI connection is handled by the external program "
-"\"AqHBCI Setup Wizard\". Please press the button below to start this program."
-"\t"
+"The Setup of your Online Banking connection is handled by the external "
+"program \"AqBanking Setup Wizard\". Please press the button below to start "
+"this program.\t"
+msgstr "Die Einrichtung Ihrer Onlinebanking-Verbindung (HBCI) wird von dem externen Programm »AqBanking Einrichtungs-Assistent« durchgeführt. Bitte klicken Sie den Knopf, um dieses Programm zu starten."
+
+#: ../src/import-export/hbci/glade/hbci.glade.h:48
+msgid ""
+"The setup for matching Online Banking accounts to GnuCash accounts is now "
+"finished. You can now invoke Online Banking actions on those accounts.\n"
+"\n"
+"If you want to add another bank, user, or account, you can start this druid "
+"again anytime.\n"
+"\n"
+"Press \"Apply\" now."
msgstr ""
-"Die Einrichtung Ihrer HBCI-Verbindung wird von dem externen Programm »AqHBCI "
-"Einrichtungs-Assistent« durchgeführt. Bitte klicken Sie den Knopf, um dieses "
-"Programm zu starten."
+"Die Einrichtung des Onlinebanking-Zugangs und die Zuordnung zu den passenden GnuCash Konten ist fertig gestellt. Sie können nun Onlinebanking-Aktionen in diesen Konten aufrufen (Menü Aktionen: Online Aktionen).\n"
+"\n"
+"Wenn Sie eine neue Bank, einen neuen Benutzer oder ein neues Konto hinzufügen möchten, können Sie diesen Assistenten (Druiden) jederzeit wieder aufrufen.\n"
+"\n"
+"Klicken Sie jetzt »Anwenden«."
-#: ../src/import-export/hbci/glade/hbci.glade.h:58
+#: ../src/import-export/hbci/glade/hbci.glade.h:53
msgid ""
-"This druid helps you setting up your HBCI connection with your bank.\n"
+"This druid helps you setting up your Online Banking connection with your "
+"bank.\n"
"\n"
-"You first need to apply for HBCI access at your bank. If your bank decides "
-"to grant you HBCI access, the bank will send you a letter, containing \n"
+"You first need to apply for Online Banking access at your bank. If your "
+"bank decides to grant you electronic access, they will send you a letter "
+"containing \n"
"\n"
"* The bank code of your bank\n"
"* The user ID that identifies you to your bank\n"
-"* The Internet address of your bank's HBCI server\n"
-"* Information about the cryptographic public key of your bank (\"Ini-Letter"
-"\").\n"
+"* The Internet address of your bank's Online Banking server\n"
+"* For HBCI Online Banking, information about the cryptographic public key of "
+"your bank (\"Ini-Letter\").\n"
"\n"
"This information will be needed in the following. Press \"Forward\" now.\n"
"\n"
-"NOTE: NO WARRANTIES FOR ANYTHING. Some banks are running a poorly "
-"implemented HBCI. You should not rely on time-critical transfers through "
-"HBCI, since sometimes your bank does not give you correct feedback when a "
-"transfer has been rejected.\n"
+"NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online "
+"Banking server. You should not rely on time-critical transfers through "
+"Online Banking, because sometimes the bank does not give you correct "
+"feedback when a transfer is rejected.\n"
"\n"
-"Press \"Cancel\" if you do not wish to setup any HBCI connection now."
+"Press \"Cancel\" if you do not wish to setup any Online Banking connection "
+"now."
msgstr ""
-"Dieser Assistent hilft Ihnen, die HBCI Verbindung mit Ihrer Bank "
-"einzurichten.\n"
+"Dieser Assistent hilft Ihnen, die Online-Verbindung (HBCI) mit Ihrer Bank einzurichten.\n"
"\n"
-"Zunächst müssen Sie bei Ihrer Bank die Freischaltung des HBCI Zugangs "
-"beantragt haben. Ihre Bank müsste Ihnen dann einen Brief zugesandt haben, "
-"der u.a. folgende Angaben enthält:\n"
+"Zunächst müssen Sie bei Ihrer Bank die Freischaltung des HBCI-Zugangs beantragt haben. Ihre Bank müsste Ihnen dann einen Brief zugesandt haben, der u.a. folgende Angaben enthält:\n"
"\n"
"* Die Bankleitzahl Ihrer Bank\n"
"* Die Benutzerkennung, die Sie gegenüber Ihrer Bank identifiziert\n"
"* Die Internetadresse des Bank-Servers \n"
-"* Informationen über die öffentlichen kryptographischen Schlüssel Ihrer Bank "
-"(»Ini-Brief«)\n"
+"* Informationen über die öffentlichen kryptographischen Schlüssel Ihrer Bank (»Ini-Brief«)\n"
"\n"
"Diese Informationen werden im folgenden benötigt. Klicken Sie jetzt »Vor«.\n"
"\n"
-"ACHTUNG: Die Programmierer geben keine Garantie auf korrekte Funktion. "
-"Insbesondere kann bei manchen Bank-Servern eine schlechte HBCI-"
-"Implementierung dazu führen, dass Sie keine Fehlermeldung bei "
-"zurückgewiesenen Aufträgen erhalten. Sie sollten sich daher bei "
-"zeitkritischen Aufträgen nicht auf HBCI allein verlassen.\n"
+"ACHTUNG: Die Programmierer geben keine Garantie auf korrekte Funktion. Insbesondere kann bei manchen Bank-Servern eine schlechte HBCI-Implementierung dazu führen, dass Sie keine Fehlermeldung bei zurückgewiesenen Aufträgen erhalten. Sie sollten sich daher bei zeitkritischen Aufträgen nicht auf HBCI allein verlassen.\n"
"\n"
-"Klicken Sie »Abbrechen«, wenn Sie jetzt keine HBCI Verbindung einrichten "
-"möchten."
+"Klicken Sie »Abbrechen«, wenn Sie jetzt keine HBCI Verbindung einrichten möchten."
-#: ../src/import-export/hbci/glade/hbci.glade.h:72
-msgid ""
-"Update \n"
-"account list"
-msgstr ""
-"Kontoliste\n"
-"aktualisieren"
-
-#: ../src/import-export/hbci/glade/hbci.glade.h:74
+#: ../src/import-export/hbci/glade/hbci.glade.h:67
msgid "Use Transaction Template"
msgstr "Ãœberweisungsvorlage:"
-#: ../src/import-export/hbci/glade/hbci.glade.h:75
+#: ../src/import-export/hbci/glade/hbci.glade.h:68
msgid "Version"
msgstr "Version"
-#: ../src/import-export/hbci/glade/hbci.glade.h:76
+#: ../src/import-export/hbci/glade/hbci.glade.h:69
msgid "_Earliest possible date"
msgstr "_Frühestes mögliches Datum"
-#: ../src/import-export/hbci/glade/hbci.glade.h:77
+#: ../src/import-export/hbci/glade/hbci.glade.h:70
msgid "_Last retrieval date"
msgstr "_Letztes Abrufdatum"
-#: ../src/import-export/hbci/glade/hbci.glade.h:78
+#: ../src/import-export/hbci/glade/hbci.glade.h:71
msgid "_Now"
msgstr "_Jetzt"
-#: ../src/import-export/hbci/glade/hbci.glade.h:79
+#: ../src/import-export/hbci/glade/hbci.glade.h:72
msgid "at Bank"
msgstr "der Bank"
-#: ../src/import-export/hbci/glade/hbci.glade.h:80
+#: ../src/import-export/hbci/glade/hbci.glade.h:73
msgid "something"
msgstr "irgendwas"
@@ -13012,63 +13281,128 @@
msgstr "Passwort:"
#: ../src/import-export/hbci/glade/hbciprefs.glade.h:1
-msgid "<b>HBCI</b>"
-msgstr "<b>HBCI</b>"
+msgid "<b>Online Banking</b>"
+msgstr "<b>Onlinebanking</b>"
#: ../src/import-export/hbci/glade/hbciprefs.glade.h:2
-msgid "Activate verbose debug messages for HBCI Online Banking."
-msgstr "Ausführliche Fehlermeldungen für HBCI Online Banking aktivieren."
+msgid "Activate verbose debug messages for Online Banking."
+msgstr "Ausführliche Fehlermeldungen für Onlinebanking aktivieren."
#: ../src/import-export/hbci/glade/hbciprefs.glade.h:4
msgid "Remember _PIN"
msgstr "_PIN merken"
#: ../src/import-export/hbci/glade/hbciprefs.glade.h:5
-msgid "Remember the PIN for HBCI in memory during a session."
-msgstr "Die PIN für HBCI während einer GnuCash-Sitzung im Speicher merken."
+msgid "Remember the Online Banking PIN in memory during a session."
+msgstr "Die PIN für Onlinebanking während einer GnuCash-Sitzung im Speicher merken."
#: ../src/import-export/hbci/glade/hbciprefs.glade.h:6
msgid "_Verbose debug messages"
msgstr "Ausführliche _Fehlermeldungen"
-#. Translators: Strings from this file are really only
-#. * needed inside Germany (HBCI is not supported anywhere
-#. * else). You may safely ignore strings from the
-#. * import-export/hbci subdirectory in other countries.
-#.
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:265
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:156
+#, fuzzy
+msgid "Select an DTAUS file to process"
+msgstr "Zu verarbeitende MT940-Datei auswählen"
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:336
msgid ""
-"The downloaded HBCI Balance was zero.\n"
+"No Online Banking account found for this gnucash account. These transactions "
+"will not be executed by Online Banking."
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:384
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:136
+#, fuzzy
+msgid ""
+"The backend found an error during the preparation of the job. It is not "
+"possible to execute this job. \n"
"\n"
+"Most probable the bank does not support your chosen job or your Online "
+"Banking account does not have the permission to execute this job. More error "
+"messages might be visible on your console log.\n"
+"\n"
+"Do you want to enter the job again?"
+msgstr ""
+"Das AqBanking-Modul hat einen Fehler während der Vorbereitung des Auftrags "
+"gefunden. Es ist nicht möglich, den Auftrag auszuführen.\n"
+"\n"
+"Wahrscheinlich wird dieser HBCI Geschäftsvorfall von Ihrer Bank leider nicht "
+"unterstützt oder ist für Ihren HBCI-Zugang nicht freigeschaltet. Weitere "
+"Fehlermeldungen könnten auf dem Console-Log sichtbar sein.\n"
+"\n"
+"Wollen Sie den Auftrag erneut eingeben?"
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:420
+msgid ""
+"Executing the Online Banking outbox failed. Please check the log window."
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:447
+#, c-format
+msgid ""
+"A debit note has been refused by the bank. The refused debit note has the "
+"following data:\n"
+"Remote bank code: \"%s\"\n"
+"Remote account number: \"%s\"\n"
+"Description and remote name: \"%s\"\n"
+"Value: \"%s\"\n"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-file-aqb-import.c:463
+msgid ""
+"One of the jobs was sent to the bank successfully, but the bank is refusing "
+"to execute the job. Please check the log window for the exact error message "
+"of the bank. The line with the error message contains a code number that is "
+"greater than 9000.\n"
+"\n"
+"The job has been removed from the queue."
+msgstr ""
+"Der Auftrag wurde erfolgreich an die Bank geschickt, aber die Bank "
+"verweigert die Ausführung. Bitte überprüfen Sie die Ausgaben im Protokoll-"
+"Fenster, um die genaue Fehlermeldung zu lesen. Die Zeile mit der genauen "
+"Fehlermeldung enthält eine Code-Nummer, die größer als 9000 ist.\n"
+"\n"
+"Wollen Sie den Auftrag erneut eingeben?"
+
+#. Translators: Strings from this file are needed only in
+#. * countries that have one of aqbanking's Online Banking
+#. * techniques available. This is 'OFX DirectConnect'
+#. * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet'
+#. * (Switzerland). If none of these techniques are available
+#. * in your country, you may safely ignore strings from the
+#. * import-export/hbci subdirectory.
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:271
+msgid ""
+"The downloaded Online Banking Balance was zero.\n"
+"\n"
"Either this is the correct balance, or your bank does not support Balance "
-"download in this HBCI version. In the latter case you should choose a higher "
-"HBCI version number in the HBCI Setup. After that, try again to download the "
-"HBCI Balance."
+"download in this Online Banking version. In the latter case you should "
+"choose a different Online Banking version number in the Online Banking "
+"(AqBanking or HBCI) Setup. After that, try again to download the Online "
+"Banking Balance."
msgstr ""
"Der abgefragte Saldo war Null. \n"
"\n"
-"Entweder war dies der korrekte Saldo, oder Ihre Bank bietet anscheinend "
-"keine Saldenabfrage in der gewählten HBCI-Version an. Im letzteren Fall "
-"können Sie im HBCI-Einrichtungs-Assistent eine höhere HBCI-Version "
-"auswählen. Versuchen Sie anschließend erneut, den Saldo abzufragen."
+"Entweder war dies der korrekte Saldo, oder Ihre Bank bietet anscheinend keine Saldenabfrage in der gewählten HBCI-Version an. Im letzteren Fall können Sie im Onlinebanking-Einrichtungs-Assistent eine höhere HBCI-Version auswählen. Versuchen Sie anschließend erneut, den Saldo abzufragen."
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:281
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:289
#, c-format
msgid ""
-"Result of HBCI job: \n"
+"Result of Online Banking job: \n"
"Account booked balance is %s"
msgstr ""
-"Ergebnis des HBCI Auftrag:\n"
+"Ergebnis der Saldenabfrage:\n"
"Gebuchter Saldo des Kontos ist %s"
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:288
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:296
#, c-format
msgid "For your information: This account also has a noted balance of %s\n"
msgstr ""
"Zu Ihrer Information: Dieses Konto hat außerdem folgenden Saldo an zur "
"Ausführung vorgemerkten Aufträgen: %s\n"
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:293
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:301
msgid ""
"The booked balance is identical to the current reconciled balance of the "
"account."
@@ -13076,36 +13410,18 @@
"Dieser gebuchte Saldo stimmt mit dem aktuellen abgeglichenen Saldo Ihres "
"Kontos überein."
-#: ../src/import-export/hbci/gnc-hbci-getbalance.c:307
+#: ../src/import-export/hbci/gnc-hbci-getbalance.c:315
msgid "Reconcile account now?"
msgstr "Konto jetzt abgleichen?"
#: ../src/import-export/hbci/gnc-hbci-gettrans.c:207
-msgid "The HBCI import returned no transactions for the selected time period."
+msgid ""
+"The Online Banking import returned no transactions for the selected time "
+"period."
msgstr "Es liegen keine Buchungen für die gewählte Zeitspanne vor."
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:133
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:219
msgid ""
-"The backend found an error during the preparation of the job. It is not "
-"possible to execute this job. \n"
-"\n"
-"Most probable the bank does not support your chosen job or your HBCI account "
-"does not have the permission to execute this job. More error messages might "
-"be visible on your console log.\n"
-"\n"
-"Do you want to enter the job again?"
-msgstr ""
-"Das AqBanking-Modul hat einen Fehler während der Vorbereitung des Auftrags "
-"gefunden. Es ist nicht möglich, den Auftrag auszuführen.\n"
-"\n"
-"Wahrscheinlich wird dieser HBCI Geschäftsvorfall von Ihrer Bank leider nicht "
-"unterstützt oder ist für Ihren HBCI-Zugang nicht freigeschaltet. Weitere "
-"Fehlermeldungen könnten auf dem Console-Log sichtbar sein.\n"
-"\n"
-"Wollen Sie den Auftrag erneut eingeben?"
-
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:216
-msgid ""
"You have changed the list of online transfer templates, but you cancelled "
"the transfer dialog. Do you nevertheless want to store the changes?"
msgstr ""
@@ -13113,19 +13429,19 @@
"Überweisungsdialog abgebrochen. Möchten Sie die Liste der "
"Ãœberweisungsvorlagen trotzdem speichern?"
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:247
-msgid "Online HBCI Direct Debit Note"
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:250
+msgid "Online Banking Direct Debit Note"
msgstr "Online-Auftrag Einzellastschrift"
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:249
-msgid "Online HBCI Bank-Internal Transfer"
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:252
+msgid "Online Banking Bank-Internal Transfer"
msgstr "Online-Auftrag Einzelumbuchung"
-#: ../src/import-export/hbci/gnc-hbci-transfer.c:252
-msgid "Online HBCI Transaction"
+#: ../src/import-export/hbci/gnc-hbci-transfer.c:255
+msgid "Online Banking Transaction"
msgstr "Online-Auftrag Einzelüberweisung"
-#: ../src/import-export/hbci/gnc-hbci-utils.c:291
+#: ../src/import-export/hbci/gnc-hbci-utils.c:290
msgid ""
"The PIN you entered was wrong.\n"
"Do you want to try again?"
@@ -13133,7 +13449,7 @@
"Die eingegebene PIN war falsch.\n"
"Möchten Sie erneut versuchen?"
-#: ../src/import-export/hbci/gnc-hbci-utils.c:297
+#: ../src/import-export/hbci/gnc-hbci-utils.c:296
msgid ""
"The PIN you entered was wrong.\n"
"ATTENTION: You have zero further wrong retries left!\n"
@@ -13143,7 +13459,7 @@
"VORSICHT: Es ist kein weiterer Fehlversuch möglich!\n"
"Möchten Sie erneut versuchen?"
-#: ../src/import-export/hbci/gnc-hbci-utils.c:304
+#: ../src/import-export/hbci/gnc-hbci-utils.c:303
msgid ""
"Unfortunately you entered a wrong PIN for too many times. Your chip card is "
"therefore destroyed. Aborting."
@@ -13151,97 +13467,152 @@
"Sie haben zu oft eine falsche PIN eingegeben. Ihre Chipkarte ist damit "
"leider unbrauchbar geworden. Aktion wird abgebrochen."
-#: ../src/import-export/hbci/gnc-hbci-utils.c:313
+#: ../src/import-export/hbci/gnc-hbci-utils.c:312
msgid ""
"No chip card has been found in the chip card reader. Do you want to try "
"again?"
msgstr ""
"Im Kartenleser wurde keine Chipkarte erkannt. Möchten Sie erneut versuchen?"
-#: ../src/import-export/hbci/gnc-hbci-utils.c:319
+#: ../src/import-export/hbci/gnc-hbci-utils.c:318
msgid ""
-"Unfortunately this HBCI job is not supported by your bank or for your "
-"account. Aborting."
+"Unfortunately this Online Banking job is not supported by your bank or for "
+"your account. Aborting."
msgstr ""
"Dieser HBCI Geschäftsvorfall wird von Ihrer Bank leider nicht unterstützt "
"oder ist Ihnen nicht gestattet. Aktion wird abgebrochen."
-#: ../src/import-export/hbci/gnc-hbci-utils.c:327
+#: ../src/import-export/hbci/gnc-hbci-utils.c:326
msgid ""
-"The server of your bank refused the HBCI connection. Please try again later. "
-"Aborting."
-msgstr ""
-"Der HBCI Server der Bank hat die Verbindung abgewiesen. Bitte versuchen Sie "
-"es später noch einmal. Aktion wird abgebrochen."
+"The server of your bank refused the Online Banking connection. Please try "
+"again later. Aborting."
+msgstr "Der Onlinebanking-Server der Bank hat die Verbindung abgewiesen. Bitte versuchen Sie es später noch einmal. Aktion wird abgebrochen."
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/hbci/gnc-hbci-utils.c:533
-#: ../intl-scm/guile-strings.c:3090 ../intl-scm/guile-strings.c:3112
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/hbci/gnc-hbci-utils.c:534
+#: ../intl-scm/guile-strings.c:5758 ../intl-scm/guile-strings.c:5780
+#: ../intl-scm/guile-strings.c:5802
msgid "Unspecified"
msgstr "Nicht spezifiziert"
#. Menus
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:85
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:96
msgid "_Online Actions"
msgstr "_Online Aktionen"
#. Menu Items
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:88
-msgid "_HBCI Setup..."
-msgstr "_HBCI Einrichtung..."
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:99
+msgid "_Online Banking Setup..."
+msgstr "_Onlinebanking Einrichtung..."
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:89
-msgid "Initial setup of HBCI/AqBanking access"
-msgstr "Grundlegende HBCI/AqBanking Einrichtung"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:100
+msgid ""
+"Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using "
+"AqBanking)"
+msgstr ""
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:91
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:102
msgid "Get _Balance"
msgstr "_Saldenabfrage"
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:92
-msgid "Get the account balance online through HBCI/AqBanking"
-msgstr "Kontosaldo online abfragen via HBCI/AqBanking"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:103
+msgid "Get the account balance online through Online Banking"
+msgstr "Kontosaldo online abfragen via HBCI/Onlinebanking"
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:94
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:105
msgid "Get _Transactions..."
msgstr "Abfrage Konto_umsätze..."
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:95
-msgid "Get the transactions online through HBCI/AqBanking"
-msgstr "Kontoumsätze online abfragen via HBCI/AqBanking"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:106
+msgid "Get the transactions online through Online Banking"
+msgstr "Kontoumsätze online abfragen via HBCI/Onlinebanking"
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:97
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:108
msgid "_Issue Transaction..."
msgstr "_Einzelüberweisung..."
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:98
-msgid "Issue a new transaction online through HBCI"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:109
+msgid "Issue a new transaction online through Online Banking"
msgstr "Neue Einzelüberweisung mit HBCI online absenden"
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:106
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:117
msgid "I_nternal Transaction..."
msgstr "Interne _Umbuchung..."
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:107
-msgid "Issue a new bank-internal transaction online through HBCI/AqBanking"
-msgstr "Neue bankinterne Einzelumbuchung mit HBCI/AqBanking online absenden"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:118
+msgid "Issue a new bank-internal transaction online through Online Banking"
+msgstr "Neue bankinterne Einzelumbuchung mit HBCI/Onlinebanking online absenden"
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:110
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:121
msgid "_Direct Debit..."
msgstr "Einzel_lastschrift..."
-#: ../src/import-export/hbci/gnc-plugin-hbci.c:111
-msgid "Issue a new direct debit note online through HBCI/AqBanking"
-msgstr "Neue Einzellastschrift online mit HBCI/AqBanking absenden"
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:122
+msgid "Issue a new direct debit note online through Online Banking"
+msgstr "Neue Einzellastschrift online mit HBCI/Onlinebanking absenden"
-#: ../src/import-export/hbci/hbci-interaction.c:358
+#. File -> Import menu item
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:126
+msgid "Import _MT940"
+msgstr "_MT940 importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:127
+msgid "Import a MT940 file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:129
+msgid "Import MT94_2"
+msgstr "MT94_2 importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:130
+msgid "Import a MT942 file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:132
+msgid "Import _DTAUS"
+msgstr "_DTAUS importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:133
+msgid "Import a DTAUS file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:135
+msgid "Import _CSV"
+msgstr "_CSV importieren"
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:136
+msgid "Import a CSV file into GnuCash"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:138
+msgid "Import DTAUS and _send..."
+msgstr "DTAUS importieren und _senden..."
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:139
+msgid ""
+"Import a DTAUS file into GnuCash and send the transfers online through "
+"Online Banking"
+msgstr ""
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:141
+msgid "Import CSV and s_end..."
+msgstr "CSV importieren und _senden..."
+
+#: ../src/import-export/hbci/gnc-plugin-hbci.c:142
+msgid ""
+"Import a CSV file into GnuCash and send the transfers online through Online "
+"Banking"
+msgstr ""
+
+#: ../src/import-export/hbci/hbci-interaction.c:389
#, c-format
msgid ""
"The PIN needs to be at least %d characters long. Do you want to try again?"
msgstr "Die PIN muss mindestens %d Zeichen lang sein. Erneut versuchen?"
-#: ../src/import-export/hbci/hbci-interaction.c:371
+#: ../src/import-export/hbci/hbci-interaction.c:402
#, c-format
msgid ""
"You entered %ld characters, but the PIN must be no longer than %d "
@@ -13250,13 +13621,13 @@
"Sie haben %ld Zeichen eingegeben, aber die PIN darf nicht länger als %d "
"Zeichen sein. Erneut versuchen?"
-#: ../src/import-export/hbci/hbci-interaction.c:439
+#: ../src/import-export/hbci/hbci-interaction.c:470
#, c-format
msgid ""
"This TAN needs to be at least %d characters long. Do you want to try again?"
msgstr "Diese TAN muss mindestens %d Zeichen lang sein. Erneut versuchen?"
-#: ../src/import-export/hbci/hbci-interaction.c:452
+#: ../src/import-export/hbci/hbci-interaction.c:483
#, c-format
msgid ""
"You entered %ld characters, but the TAN must be no longer than %d "
@@ -13266,14 +13637,22 @@
"Zeichen sein. Erneut versuchen?"
#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:1
+msgid "CSV import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:2
msgid "Close dialog when finished"
msgstr "Fenster nach Verbindungsende schließen"
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:2
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:3
+msgid "DTAUS import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:4
msgid "Enables verbose debug messages for HBCI/AqBanking Online Banking."
msgstr "Ausführliche Fehlermeldungen für HBCI Online Banking aktivieren."
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:3
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:5
msgid ""
"If active, the PIN for HBCI/AqBanking actions will be remembered in memory "
"during a session. Otherwise it will have to be entered again each time "
@@ -13284,7 +13663,7 @@
"Wenn nicht aktiviert, muss die PIN bei jeder einzelnen Aktion von HBCI/"
"AqBanking eingegeben werden und wird nicht im Speicher gehalten."
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:4
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:6
msgid ""
"If active, the window will be closed automatically when you finish the HBCI/"
"AqBanking import process. Otherwise it will stay open."
@@ -13292,11 +13671,47 @@
"Wenn aktiviert, wird das Fenster automatisch geschlossen, wenn der HBCI/"
"AqBanking-Import beendet ist. Andernfalls bleibt das Fenster geöffnet."
-#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:5
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:7
msgid "Remember the PIN in memory"
msgstr "HBCI PIN im Speicher merken"
#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:8
+msgid "SWIFT MT940 import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:9
+msgid "SWIFT MT942 import data format"
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:12
+msgid ""
+"This setting specifies the data format when importing CSV files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:13
+msgid ""
+"This setting specifies the data format when importing DTAUS files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:14
+msgid ""
+"This setting specifies the data format when importing SWIFT MT940 files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:15
+msgid ""
+"This setting specifies the data format when importing SWIFT MT942 files. The "
+"AqBanking library offers various import formats (called \"profiles\") of "
+"which you can choose one here."
+msgstr ""
+
+#: ../src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in.h:16
msgid "Verbose HBCI debug messages"
msgstr "Ausführliche HBCI-Fehlermeldungen"
@@ -13304,11 +13719,11 @@
msgid "Account ID"
msgstr "Kontonummer"
-#: ../src/import-export/import-account-matcher.c:197
+#: ../src/import-export/import-account-matcher.c:209
msgid "(Full account ID: "
msgstr "(Komplette Kontonummer: "
-#: ../src/import-export/import-account-matcher.c:220
+#: ../src/import-export/import-account-matcher.c:234
#, c-format
msgid ""
"The account %s is a placeholder account and does not allow transactions. "
@@ -13351,56 +13766,72 @@
msgid "y/d/m"
msgstr "Jahr/Tag/Monat"
-#: ../src/import-export/import-main-matcher.c:304
+#: ../src/import-export/import-main-matcher.c:208
msgid "Destination account for the auto-balance split."
msgstr "Gegenkonto für Ausgleichsbuchung."
-#: ../src/import-export/import-main-matcher.c:651
+#: ../src/import-export/import-main-matcher.c:423
+msgid "A"
+msgstr "Neu"
+
+#: ../src/import-export/import-main-matcher.c:425
+msgid "R"
+msgstr "Abgl"
+
+#: ../src/import-export/import-main-matcher.c:435
+msgid "Info"
+msgstr "Information"
+
+#: ../src/import-export/import-main-matcher.c:586
msgid "New, already balanced"
msgstr "Neu (und ausgeglichen)"
#. Translators: %1$s is the amount to be
#. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:677
+#: ../src/import-export/import-main-matcher.c:610
#, c-format
msgid "New, transfer %s to (manual) \"%s\""
msgstr "Neu (Buchung von %s nach »%s«, manuell gewählt)"
#. Translators: %1$s is the amount to be
#. transferred. %2$s is the destination account.
-#: ../src/import-export/import-main-matcher.c:685
+#: ../src/import-export/import-main-matcher.c:618
#, c-format
msgid "New, transfer %s to (auto) \"%s\""
msgstr "Neu (Buchung von %s nach »%s«, automatisch gewählt)"
#. Translators: %s is the amount to be transferred.
-#: ../src/import-export/import-main-matcher.c:697
+#: ../src/import-export/import-main-matcher.c:629
#, c-format
msgid "New, UNBALANCED (need acct to transfer %s)!"
msgstr "Neu (Nicht ausgeglichen, %s noch auszugleichen)"
-#: ../src/import-export/import-main-matcher.c:711
+#: ../src/import-export/import-main-matcher.c:641
msgid "Reconcile (manual) match"
msgstr "Abgleichen (mit manuell gewählter Zuordnung)"
-#: ../src/import-export/import-main-matcher.c:716
+#: ../src/import-export/import-main-matcher.c:645
msgid "Reconcile (auto) match"
msgstr "Abgleichen (mit automatisch gewählter Zuordnung)"
-#: ../src/import-export/import-main-matcher.c:724
+#: ../src/import-export/import-main-matcher.c:651
msgid "Match missing!"
msgstr "Zuordnung fehlt"
-#: ../src/import-export/import-main-matcher.c:732
+#: ../src/import-export/import-main-matcher.c:660
msgid "Do not import (no action selected)"
msgstr "Nicht importieren (keine Import-Aktion gewählt)"
+#: ../src/import-export/import-match-picker.c:363
+msgid "Confidence"
+msgstr "Genauigkeit"
+
#: ../src/import-export/import-provider-format.glade.h:1
msgid "(no)"
msgstr "(kein(e))"
#: ../src/import-export/import-provider-format.glade.h:2
-#: ../src/import-export/qif-import/qif.glade.h:11
+#: ../src/import-export/qif-import/qif.glade.h:9
msgid "Click \"Back\" to cancel the loading of this file and choose another."
msgstr ""
"Drücken Sie »Zurück«, um nicht diese Datei zu laden, sondern eine andere "
@@ -13411,12 +13842,12 @@
msgstr "Beispieldatum:"
#: ../src/import-export/import-provider-format.glade.h:4
-#: ../src/import-export/qif-import/qif.glade.h:78
+#: ../src/import-export/qif-import/qif.glade.h:68
msgid "Set a date format for this QIF file"
msgstr "Ein Datumsformat für diese QIF-Datei setzen"
#: ../src/import-export/import-provider-format.glade.h:5
-#: ../src/import-export/qif-import/qif.glade.h:81
+#: ../src/import-export/qif-import/qif.glade.h:71
msgid ""
"The QIF file format does not specify which order the day, month, and year "
"components of a date are printed. In most cases, it is possible to "
@@ -13426,7 +13857,7 @@
"\n"
"Please select a date format for the file. QIF files created by European "
"software are likely to be in \"d-m-y\" or day-month-year format, where US "
-"QIF files are likely to be \"m-d-y\" or month-year-day. \n"
+"QIF files are likely to be \"m-d-y\" or month-day-year. \n"
msgstr ""
"Das QIF-Dateiformat macht keine Angaben darüber, in welcher Reihenfolge Tag, "
"Monat und Jahr gespeichert sind. In den meisten Fällen kann dies automatisch "
@@ -13438,12 +13869,12 @@
"Monat-Jahr), wogegen Dateien aus dem amerikanischen Raum eher das Format »m-"
"d-y« (Monat-Tag-Jahr) haben.\n"
-#: ../src/import-export/log-replay/gnc-log-replay.c:525
+#: ../src/import-export/log-replay/gnc-log-replay.c:522
msgid "Select a .log file to replay"
msgstr "Zu ladende Log-Datei auswählen"
#. Translators: %s is the file name.
-#: ../src/import-export/log-replay/gnc-log-replay.c:542
+#: ../src/import-export/log-replay/gnc-log-replay.c:541
#, c-format
msgid "Cannot open the current log file: %s"
msgstr "Kann nicht die aktuelle Log-Datei öffnen: %s"
@@ -13452,16 +13883,16 @@
#. * First argument is the filename,
#. * second argument is the error.
#.
-#: ../src/import-export/log-replay/gnc-log-replay.c:555
+#: ../src/import-export/log-replay/gnc-log-replay.c:554
#, c-format
msgid "Failed to open log file: %s: %s"
msgstr "Kann Log-Datei nicht öffnen: %s: %s"
-#: ../src/import-export/log-replay/gnc-log-replay.c:562
+#: ../src/import-export/log-replay/gnc-log-replay.c:561
msgid "The log file you selected was empty."
msgstr "Die gewählte Log-Datei ist leer."
-#: ../src/import-export/log-replay/gnc-log-replay.c:568
+#: ../src/import-export/log-replay/gnc-log-replay.c:567
msgid ""
"The log file you selected cannot be read. The file header was not "
"recognized."
@@ -13479,18 +13910,6 @@
"Einträge aus Logdatei nach einem Programmabsturz abspielen. Dies kann nicht "
"rückgängig gemacht werden."
-#: ../src/import-export/mt940/gnc-mt940-import.c:143
-msgid "Select an MT940 file to process"
-msgstr "Zu verarbeitende MT940-Datei auswählen"
-
-#: ../src/import-export/mt940/gnc-plugin-mt940.c:47
-msgid "Import MT940"
-msgstr "MT940 importieren"
-
-#: ../src/import-export/mt940/gnc-plugin-mt940.c:48
-msgid "Process an MT940 response file"
-msgstr "Eine MT940 Datei verarbeiten"
-
#. This string is a default account
#. name. It MUST NOT contain the
#. character ':' anywhere in it or
@@ -13537,7 +13956,7 @@
msgid "Unknown OFX investment account"
msgstr "Unbekanntes OFX Investment-Konto"
-#: ../src/import-export/ofx/gnc-ofx-import.c:653
+#: ../src/import-export/ofx/gnc-ofx-import.c:651
msgid "Select an OFX/QFX file to process"
msgstr "Zu verarbeitende OFX/QFX-Datei auswählen"
@@ -13549,57 +13968,61 @@
msgid "Process an OFX/QFX response file"
msgstr "Eine OFX/QFX Datei verarbeiten"
-#: ../src/import-export/qif-import/dialog-account-picker.c:164
+#: ../src/import-export/qif-import/dialog-account-picker.c:167
msgid "Enter a name for the account"
msgstr "Bitte geben Sie einen Namen für das Konto ein"
-#: ../src/import-export/qif-import/druid-qif-import.c:363
+#: ../src/import-export/qif-import/druid-qif-import.c:389
msgid "Select QIF File"
msgstr "QIF-Datei auswählen"
#. stay here if no file specified
-#: ../src/import-export/qif-import/druid-qif-import.c:457
+#: ../src/import-export/qif-import/druid-qif-import.c:480
msgid "Please select a file to load."
msgstr "Sie müssen eine Datei angeben, die geladen werden soll"
-#: ../src/import-export/qif-import/druid-qif-import.c:463
+#: ../src/import-export/qif-import/druid-qif-import.c:486
msgid "File not found or read permission denied. Please select another file."
msgstr ""
"Datei nicht gefunden oder Zugriffsberechtigung liegt nicht vor. Bitte wählen "
"Sie eine andere Datei."
-#: ../src/import-export/qif-import/druid-qif-import.c:475
+#: ../src/import-export/qif-import/druid-qif-import.c:498
msgid "That QIF file is already loaded. Please select another file."
msgstr "Diese QIF Datei ist bereits geladen. Bitte wählen Sie eine andere."
-#: ../src/import-export/qif-import/druid-qif-import.c:505
+#: ../src/import-export/qif-import/druid-qif-import.c:528
#, c-format
msgid "QIF file load warning: %s"
msgstr "Warnung beim Laden der QIF Datei: %s"
-#: ../src/import-export/qif-import/druid-qif-import.c:512
+#: ../src/import-export/qif-import/druid-qif-import.c:535
msgid "An error occurred while loading the QIF file."
msgstr "Beim Laden der QIF Datei ist ein Fehler aufgetreten."
-#: ../src/import-export/qif-import/druid-qif-import.c:520
+#: ../src/import-export/qif-import/druid-qif-import.c:543
#, c-format
msgid "QIF file load failed: %s"
msgstr "Fehler beim Laden der QIF-Datei:%s"
-#: ../src/import-export/qif-import/druid-qif-import.c:584
+#: ../src/import-export/qif-import/druid-qif-import.c:606
msgid "An error occurred while parsing the QIF file."
msgstr "Beim Verarbeiten der QIF Datei ist ein Fehler aufgetreten."
-#: ../src/import-export/qif-import/druid-qif-import.c:594
+#: ../src/import-export/qif-import/druid-qif-import.c:616
#, c-format
msgid "QIF file parse failed: %s"
msgstr "QIF-Datei Analyse fehlerhaft: %s"
-#: ../src/import-export/qif-import/druid-qif-import.c:823
+#: ../src/import-export/qif-import/druid-qif-import.c:865
msgid "You must enter an account name."
msgstr "Sie müssen einen Kontonamen eingeben."
-#: ../src/import-export/qif-import/druid-qif-import.c:1183
+#: ../src/import-export/qif-import/druid-qif-import.c:1048
+msgid "GnuCash account name"
+msgstr "GnuCash Kontobezeichnung"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:1298
msgid ""
"An error occurred while importing QIF transactions into GnuCash. Your "
"accounts are unchanged."
@@ -13607,43 +14030,43 @@
"Es ist ein Fehler während des QIF Imports aufgetreten. Ihre Konten wurden "
"nicht geändert."
-#: ../src/import-export/qif-import/druid-qif-import.c:1230
-#: ../src/import-export/qif-import/druid-qif-import.c:1674
+#: ../src/import-export/qif-import/druid-qif-import.c:1342
+#: ../src/import-export/qif-import/druid-qif-import.c:1794
msgid "(split)"
msgstr "(Buchung)"
-#: ../src/import-export/qif-import/druid-qif-import.c:1394
+#: ../src/import-export/qif-import/druid-qif-import.c:1513
msgid "You must enter a Type for the commodity."
msgstr "Sie müssen einen Typ für die Währung/Aktie angeben."
-#: ../src/import-export/qif-import/druid-qif-import.c:1399
+#: ../src/import-export/qif-import/druid-qif-import.c:1520
msgid "You must enter a name for the commodity."
msgstr "Sie müssen einen Namen für die Währung/Aktie angeben."
-#: ../src/import-export/qif-import/druid-qif-import.c:1404
+#: ../src/import-export/qif-import/druid-qif-import.c:1525
msgid "You must enter an abbreviation for the commodity."
msgstr "Sie müssen eine Abkürzung für die Währung/Aktie angeben."
-#: ../src/import-export/qif-import/druid-qif-import.c:1413
+#: ../src/import-export/qif-import/druid-qif-import.c:1534
msgid "You must enter an existing national currency or enter a different type."
msgstr ""
"Sie müssen entweder eine existierende Währung angeben oder einen anderen Typ "
"wählen."
-#: ../src/import-export/qif-import/druid-qif-import.c:1547
+#: ../src/import-export/qif-import/druid-qif-import.c:1672
#, c-format
msgid "Enter information about \"%s\""
msgstr "Informationen über »%s«"
-#: ../src/import-export/qif-import/druid-qif-import.c:1559
+#: ../src/import-export/qif-import/druid-qif-import.c:1684
msgid "Pick the commodity's exchange or listing (NASDAQ, NYSE, etc)."
msgstr "Wählen Sie das Börsenplatzkürzel für die Aktie (NASDAQ, NYSE, etc)."
-#: ../src/import-export/qif-import/druid-qif-import.c:1583
+#: ../src/import-export/qif-import/druid-qif-import.c:1708
msgid "Enter the full name of the commodity, such as \"Red Hat Stock\""
msgstr "Geben Sie den vollen Namen der Aktie an, z.B. »Deutsche Telekom«"
-#: ../src/import-export/qif-import/druid-qif-import.c:1605
+#: ../src/import-export/qif-import/druid-qif-import.c:1730
msgid ""
"Enter the ticker symbol (such as \"RHAT\") or other unique abbreviation for "
"the name."
@@ -13651,11 +14074,27 @@
"Geben Sie das Tickersymbol (z.B. »DTE«) der Aktie oder eine andere "
"eindeutige Abkürzung an."
-#: ../src/import-export/qif-import/druid-qif-import.c:1626
+#: ../src/import-export/qif-import/druid-qif-import.c:1751
msgid "Click \"Next\" to accept the information and move on."
msgstr ""
"Wenn Sie fertig gelesen haben, klicken Sie bitte »Vor«, um fortzufahren."
+#: ../src/import-export/qif-import/druid-qif-import.c:2140
+msgid "QIF account name"
+msgstr "QIF-Kontobezeichnung"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:2143
+msgid "QIF category name"
+msgstr "QIF Kategorie"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:2146
+msgid "QIF payee/memo"
+msgstr "QIF Empfänger/Text"
+
+#: ../src/import-export/qif-import/druid-qif-import.c:2209
+msgid "Dup?"
+msgstr "Duplikat?"
+
#: ../src/import-export/qif-import/gnc-plugin-qif-import.c:48
msgid "Import _QIF..."
msgstr "_QIF-Datei importieren..."
@@ -13668,15 +14107,15 @@
msgid "<b>QIF Import</b>"
msgstr "<b>QIF Import</b>"
-#: ../src/import-export/qif-import/qif.glade.h:3
+#: ../src/import-export/qif-import/qif.glade.h:2
msgid "Account name:"
msgstr "Kontobezeichnung:"
-#: ../src/import-export/qif-import/qif.glade.h:4
+#: ../src/import-export/qif-import/qif.glade.h:3
msgid "Accounts and stock holdings"
msgstr "Konten und Aktienanteile"
-#: ../src/import-export/qif-import/qif.glade.h:6
+#: ../src/import-export/qif-import/qif.glade.h:4
msgid ""
"Click \"Apply\" to import data from the staging area and update your GnuCash "
"accounts. The account and category matching information you have entered "
@@ -13700,13 +14139,13 @@
"\n"
"Klicken Sie auf »Abbrechen«, um den QIF-Import-Prozess abzubrechen."
-#: ../src/import-export/qif-import/qif.glade.h:12
+#: ../src/import-export/qif-import/qif.glade.h:10
msgid "Click \"Forward\" to check matchings for QIF categories. "
msgstr ""
"Klicken Sie bitte auf »Vor«, um passende Zuordnungen für QIF\n"
"Kategorien zu prüfen."
-#: ../src/import-export/qif-import/qif.glade.h:13
+#: ../src/import-export/qif-import/qif.glade.h:11
msgid ""
"Click \"Forward\" to enter information about stocks and mutual funds in the "
"imported data."
@@ -13714,7 +14153,7 @@
"Klicken Sie nun auf »Vor«, um Informationen über die Aktien und Aktienfonds "
"einzugeben, die aus den importierten Daten stammen."
-#: ../src/import-export/qif-import/qif.glade.h:14
+#: ../src/import-export/qif-import/qif.glade.h:12
msgid ""
"Click \"Forward\" to enter information about the currency used in your QIF "
"files."
@@ -13722,7 +14161,7 @@
"Bitte klicken Sie »Vor«, um Informationen über Währungen in Ihren\n"
"QIF-Dateien einzugeben."
-#: ../src/import-export/qif-import/qif.glade.h:15
+#: ../src/import-export/qif-import/qif.glade.h:13
msgid ""
"Click \"Load another file\" if you have more data to import at this time. Do "
"this if you have saved your accounts to separate QIF files.\n"
@@ -13737,15 +14176,11 @@
"Klicken Sie auf »Vor«, um das Laden von Dateien zu beenden und zum nächsten "
"Schritt des QIF-Importprozesses zu gehen."
-#: ../src/import-export/qif-import/qif.glade.h:20
-msgid "Dup?"
-msgstr "Duplikat?"
-
-#: ../src/import-export/qif-import/qif.glade.h:21
+#: ../src/import-export/qif-import/qif.glade.h:16
msgid "Enter the currency used for new accounts"
msgstr "Standard-Währung für neue Konten"
-#: ../src/import-export/qif-import/qif.glade.h:23
+#: ../src/import-export/qif-import/qif.glade.h:17
msgid ""
"GnuCash can import financial data from QIF (Quicken Interchange Format) "
"files written by Quicken/QuickBooks, MS Money, Moneydance, and many other "
@@ -13767,7 +14202,8 @@
"Klicken Sie jetzt »Vor«, um mit dem Laden Ihrer QIF Daten zu beginnen. Sie "
"können den Import jederzeit mit »Abbrechen« ohne Änderungen beenden."
-#: ../src/import-export/qif-import/qif.glade.h:28
+#: ../src/import-export/qif-import/qif.glade.h:22
+#, fuzzy
msgid ""
"GnuCash uses separate Income and Expense accounts rather than categories to "
"classify your transactions. Each of the categories in your QIF file will be "
@@ -13775,7 +14211,8 @@
"\n"
"On the next page, you will have an opportunity to look at the suggested "
"matches between QIF categories and GnuCash accounts. You may change matches "
-"that you do not like by clicking on the line containing the category name.\n"
+"that you do not like by double-clicking on the line containing the category "
+"name.\n"
"\n"
"If you change your mind later, you can reorganize the account structure "
"safely within GnuCash."
@@ -13791,7 +14228,8 @@
"\n"
"Sie können jederzeit auch später in GnuCash Änderungen vornehmen."
-#: ../src/import-export/qif-import/qif.glade.h:33
+#: ../src/import-export/qif-import/qif.glade.h:27
+#, fuzzy
msgid ""
"If you are importing a QIF file downloaded from a bank or other financial "
"institution, some of the information in the QIF file may duplicate "
@@ -13803,7 +14241,8 @@
"left side of the page, and possible matches for the selected left-hand "
"transaction are shown to the right. There may be several old transactions "
"that could match an imported transaction; you will be able to select the "
-"correct one by clicking in the \"Dup?\" column of the correct transaction.\n"
+"correct one by double-clicking in the \"Dup?\" column of the correct "
+"transaction.\n"
"\n"
"You can control the rules used by GnuCash to find duplicate transactions in "
"the \"QIF Import\" section of the GnuCash Preferences dialog.\n"
@@ -13827,15 +14266,15 @@
"\n"
"Klicken Sie nun auf »Vor«, um doppelte Buchungen zu finden."
-#: ../src/import-export/qif-import/qif.glade.h:40
+#: ../src/import-export/qif-import/qif.glade.h:34
msgid "Import QIF files"
msgstr "QIF-Datei importieren"
-#: ../src/import-export/qif-import/qif.glade.h:41
+#: ../src/import-export/qif-import/qif.glade.h:35
msgid "Imported transactions with duplicates"
msgstr "Importierte Buchungen mit Duplikaten"
-#: ../src/import-export/qif-import/qif.glade.h:42
+#: ../src/import-export/qif-import/qif.glade.h:36
msgid ""
"In the next pages, you will be asked to provide information about stocks, "
"mutual funds, and other tradable commodities that appear in the QIF file(s) "
@@ -13865,34 +14304,35 @@
"exakte Tickersymbol für die Aktie, das bei der offiziellen Börsennotierung "
"benutzt wird."
-#: ../src/import-export/qif-import/qif.glade.h:47
+#: ../src/import-export/qif-import/qif.glade.h:41
msgid "Income and Expense categories"
msgstr "Erträge und Aufwendungen"
-#: ../src/import-export/qif-import/qif.glade.h:49
+#: ../src/import-export/qif-import/qif.glade.h:43
msgid "Match QIF accounts with GnuCash accounts"
msgstr "Füge QIF-Konten in GnuCash Konten ein"
-#: ../src/import-export/qif-import/qif.glade.h:50
+#: ../src/import-export/qif-import/qif.glade.h:44
msgid "Match QIF categories with GnuCash accounts"
msgstr "Vereine QIF-Kategorien mit GnuCash Konten"
-#: ../src/import-export/qif-import/qif.glade.h:51
+#: ../src/import-export/qif-import/qif.glade.h:45
msgid "Match duplicate transactions"
msgstr "Doppelte Buchungssätze suchen"
-#: ../src/import-export/qif-import/qif.glade.h:52
+#: ../src/import-export/qif-import/qif.glade.h:46
msgid "Match payees/memos to GnuCash accounts"
msgstr "Finde passende GnuCash Konten für QIF-Zahlungsempfänger/Buchungstext"
-#: ../src/import-export/qif-import/qif.glade.h:54
+#: ../src/import-export/qif-import/qif.glade.h:47
+#, fuzzy
msgid ""
"On the next page, the accounts in your QIF files and any stocks or mutual "
"funds you own will be matched with GnuCash accounts. If a GnuCash account "
"already exists with the same name, or a similar name and compatible type, "
"that account will be used as a match; otherwise, GnuCash will create a new "
"account with the same name and type as the QIF account. If you do not like "
-"the suggested GnuCash account, click to change it.\n"
+"the suggested GnuCash account, double-click to change it.\n"
"\n"
"Note that GnuCash will be creating many accounts that did not exist on your "
"other personal finance program, including a separate account for each stock "
@@ -13916,11 +14356,11 @@
"nächsten Seite können Sie diese Konten bearbeiten. Allerdings wird "
"empfohlen, die Auswahl zu übernehmen.\n"
-#: ../src/import-export/qif-import/qif.glade.h:58
+#: ../src/import-export/qif-import/qif.glade.h:51
msgid "Payees and memos"
msgstr "Zahlungsempfänger, Buchungstext"
-#: ../src/import-export/qif-import/qif.glade.h:59
+#: ../src/import-export/qif-import/qif.glade.h:52
msgid ""
"Please select a file to load. When you click \"Forward\", the file will be "
"loaded and analyzed. You may need to answer some questions about the account"
@@ -13936,23 +14376,15 @@
"Sie können soviele Dateien laden, wie Sie möchten. Es ist kein Problem, "
"falls sich Ihre Daten in mehreren Dateien befinden.\n"
-#: ../src/import-export/qif-import/qif.glade.h:63
+#: ../src/import-export/qif-import/qif.glade.h:56
msgid "Possible duplicates for selected new transaction"
msgstr "Mögliche Duplikate für ausgewählte neue Buchungen"
-#: ../src/import-export/qif-import/qif.glade.h:65
+#: ../src/import-export/qif-import/qif.glade.h:58
msgid "QIF Import"
msgstr "QIF-Import"
-#: ../src/import-export/qif-import/qif.glade.h:66
-msgid "QIF account name"
-msgstr "QIF-Kontobezeichnung"
-
-#: ../src/import-export/qif-import/qif.glade.h:67
-msgid "QIF category name"
-msgstr "QIF Kategorie"
-
-#: ../src/import-export/qif-import/qif.glade.h:68
+#: ../src/import-export/qif-import/qif.glade.h:59
msgid ""
"QIF files downloaded from banks and other financial institutions may not "
"have information about Accounts and Categories which would allow them to be "
@@ -13974,32 +14406,28 @@
"zugeordnet. Wenn Sie nun die Buchungssätze einem anderen Konto zuweisen, "
"wird diese Auswahl für zukünftige Importvorgänge gespeichert."
-#: ../src/import-export/qif-import/qif.glade.h:71
+#: ../src/import-export/qif-import/qif.glade.h:62
msgid "QIF files you have loaded"
msgstr "QIF-Datei, die geladen wurde"
-#: ../src/import-export/qif-import/qif.glade.h:72
-msgid "QIF payee/memo"
-msgstr "QIF Empfänger/Text"
-
-#: ../src/import-export/qif-import/qif.glade.h:74
+#: ../src/import-export/qif-import/qif.glade.h:64
msgid "Select a QIF file to load"
msgstr "Zu ladende QIF-Datei auswählen"
-#: ../src/import-export/qif-import/qif.glade.h:76
+#: ../src/import-export/qif-import/qif.glade.h:66
msgid "Select possible duplicates"
msgstr "Mögliche Duplikate auswählen"
-#: ../src/import-export/qif-import/qif.glade.h:79
+#: ../src/import-export/qif-import/qif.glade.h:69
msgid "Set the default QIF account name"
msgstr "Den Namen des Standard QIF Konto setzen"
-#: ../src/import-export/qif-import/qif.glade.h:80
+#: ../src/import-export/qif-import/qif.glade.h:70
msgid "Show some documentation-only pages in QIF Import druid."
msgstr ""
"Seiten im QIF-Import anzeigen, die ausschließlich Dokumentation enthalten."
-#: ../src/import-export/qif-import/qif.glade.h:85
+#: ../src/import-export/qif-import/qif.glade.h:75
msgid ""
"The QIF file that you just loaded appears to contain transactions for just "
"one account, but the file does not specify a name for that account. \n"
@@ -14015,7 +14443,7 @@
"anderen Finanzprogramm exportiert wurde, sollten Sie den gleichen Kontonamen "
"wie dort verwenden.\n"
-#: ../src/import-export/qif-import/qif.glade.h:89
+#: ../src/import-export/qif-import/qif.glade.h:79
msgid ""
"The QIF importer cannot currently handle multi-currency QIF files. All the "
"accounts in the QIF file(s) you are importing must be denominated in the "
@@ -14031,64 +14459,75 @@
"Bitte wählen Sie die Währung für die Buchungssätze aus der Datei/den "
"Dateien: \n"
-#: ../src/import-export/qif-import/qif.glade.h:93
+#: ../src/import-export/qif-import/qif.glade.h:83
msgid "Tradable commodities"
msgstr "Handelbare Währungen/Aktien"
-#: ../src/import-export/qif-import/qif.glade.h:95
+#: ../src/import-export/qif-import/qif.glade.h:85
msgid "Update your GnuCash accounts"
msgstr "Aktualisieren Ihrer GnuCash Konten"
-#: ../src/import-export/qif-import/qif.glade.h:96
+#: ../src/import-export/qif-import/qif.glade.h:86
msgid "_Show documentation"
msgstr "_Erklärungsseiten anzeigen"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:66 ../intl-scm/guile-strings.c:3088
-#: ../intl-scm/guile-strings.c:3110
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/qif/qif-defaults.c:66 ../intl-scm/guile-strings.c:5756
+#: ../intl-scm/guile-strings.c:5778 ../intl-scm/guile-strings.c:5800
msgid "Margin Interest"
msgstr "Zinsmarge"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:74 ../intl-scm/guile-strings.c:3086
-#: ../intl-scm/guile-strings.c:3108
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/qif/qif-defaults.c:74 ../intl-scm/guile-strings.c:5754
+#: ../intl-scm/guile-strings.c:5776 ../intl-scm/guile-strings.c:5798
msgid "Commissions"
msgstr "Kommissionen"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
-#: ../src/import-export/qif/qif-defaults.c:90 ../intl-scm/guile-strings.c:3076
-#: ../intl-scm/guile-strings.c:3098
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
+#: ../src/import-export/qif/qif-defaults.c:90 ../intl-scm/guile-strings.c:5744
+#: ../intl-scm/guile-strings.c:5766 ../intl-scm/guile-strings.c:5788
msgid "Cap. gain (long)"
msgstr "Kapitalertrag (langfristig)"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
#: ../src/import-export/qif/qif-defaults.c:100
-#: ../intl-scm/guile-strings.c:3078 ../intl-scm/guile-strings.c:3100
+#: ../intl-scm/guile-strings.c:5746 ../intl-scm/guile-strings.c:5768
+#: ../intl-scm/guile-strings.c:5790
msgid "Cap. gain (mid)"
msgstr "Kapitalertrag (mittelfristig)"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
#: ../src/import-export/qif/qif-defaults.c:110
-#: ../intl-scm/guile-strings.c:3080 ../intl-scm/guile-strings.c:3102
+#: ../intl-scm/guile-strings.c:5748 ../intl-scm/guile-strings.c:5770
+#: ../intl-scm/guile-strings.c:5792
msgid "Cap. gain (short)"
msgstr "Kapitalertrag (kurzfristig)"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
#: ../src/import-export/qif/qif-defaults.c:120
-#: ../intl-scm/guile-strings.c:3070 ../intl-scm/guile-strings.c:3092
+#: ../intl-scm/guile-strings.c:5738 ../intl-scm/guile-strings.c:5760
+#: ../intl-scm/guile-strings.c:5782
msgid "Dividends"
msgstr "Dividenden"
#. src/import-export/qif-io-core/qif-invst-xtn-import.scm
#. src/import-export/qif-import/qif-dialog-utils.scm
+#. src/import-export/qif-import/qif-import/qif-dialog-utils.scm
#: ../src/import-export/qif/qif-defaults.c:140
-#: ../intl-scm/guile-strings.c:3074 ../intl-scm/guile-strings.c:3096
+#: ../intl-scm/guile-strings.c:5742 ../intl-scm/guile-strings.c:5764
+#: ../intl-scm/guile-strings.c:5786
msgid "Cap Return"
msgstr "Kapitalverzinsung"
@@ -14146,7 +14585,7 @@
msgid "clear:autoswitch"
msgstr "clear:autoswitch"
-#: ../src/import-export/qif/qif-parse.c:660
+#: ../src/import-export/qif/qif-parse.c:666
msgid "The Date format is ambiguous. Please choose the correct format."
msgstr "Das Datumsformat ist mehrdeutig. Bitte wählen Sie das richtige Format."
@@ -14254,11 +14693,20 @@
msgid "Use bayesian matching"
msgstr "Bayes-Algorithmus verwenden"
-#: ../src/register/ledger-core/split-register.c:390
+#: ../src/register/ledger-core/split-register.c:159
+msgid ""
+"This transaction is already being edited in another register. Please finish "
+"editing it there first."
+msgstr ""
+"Diese Buchung wird bereits von einem anderen Kontofenster aus bearbeitet. "
+"Bitte beenden Sie zuerst diese Bearbeitung, indem Sie in dem anderen "
+"Kontofenster »Eingabe« oder »Abbrechen« wählen. "
+
+#: ../src/register/ledger-core/split-register.c:408
msgid "Save transaction before duplicating?"
msgstr "Buchungsänderungen vor Kopieren speichern?"
-#: ../src/register/ledger-core/split-register.c:392
+#: ../src/register/ledger-core/split-register.c:410
msgid ""
"The current transaction has been changed. Would you like to record the "
"changes before duplicating the transaction, or cancel the duplication?"
@@ -14266,7 +14714,7 @@
"Die aktuelle Buchung wurde geändert. Möchten Sie vor dem Kopieren die "
"Änderungen in der Buchung speichern, oder möchten Sie abbrechen?"
-#: ../src/register/ledger-core/split-register.c:699
+#: ../src/register/ledger-core/split-register.c:717
msgid ""
"You are about to overwrite an existing split. Are you sure you want to do "
"that?"
@@ -14274,7 +14722,7 @@
"Sie sind dabei, einen bestehenden Buchungsteil zu überschreiben. Möchten Sie "
"das wirklich?"
-#: ../src/register/ledger-core/split-register.c:728
+#: ../src/register/ledger-core/split-register.c:746
msgid ""
"You are about to overwrite an existing transaction. Are you sure you want to "
"do that?"
@@ -14282,11 +14730,11 @@
"Sie sind dabei, einen bestehenden Buchungssatz zu überschreiben. Möchten Sie "
"das wirklich?"
-#: ../src/register/ledger-core/split-register.c:1678
+#: ../src/register/ledger-core/split-register.c:1700
msgid "Recalculate Transaction"
msgstr "Buchung neu berechnen"
-#: ../src/register/ledger-core/split-register.c:1679
+#: ../src/register/ledger-core/split-register.c:1701
msgid ""
"The values entered for this transaction are inconsistent. Which value would "
"you like to have recalculated?"
@@ -14294,141 +14742,141 @@
"Die eingegebenen Werte für diese Buchung passen nicht zueinander. Welcher "
"Wert soll neu berechnet werden?"
-#: ../src/register/ledger-core/split-register.c:1686
-#: ../src/register/ledger-core/split-register.c:1688
+#: ../src/register/ledger-core/split-register.c:1708
+#: ../src/register/ledger-core/split-register.c:1710
msgid "_Shares"
msgstr "_Anteile"
-#: ../src/register/ledger-core/split-register.c:1686
-#: ../src/register/ledger-core/split-register.c:1693
-#: ../src/register/ledger-core/split-register.c:1700
+#: ../src/register/ledger-core/split-register.c:1708
+#: ../src/register/ledger-core/split-register.c:1715
+#: ../src/register/ledger-core/split-register.c:1722
msgid "Changed"
msgstr "Geändert"
-#: ../src/register/ledger-core/split-register.c:1700
-#: ../src/register/ledger-core/split-register.c:1702
+#: ../src/register/ledger-core/split-register.c:1722
+#: ../src/register/ledger-core/split-register.c:1724
msgid "_Value"
msgstr "_Wert"
-#: ../src/register/ledger-core/split-register.c:1711
+#: ../src/register/ledger-core/split-register.c:1733
msgid "_Recalculate"
msgstr "_Berechnen"
#. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:1964
-#: ../intl-scm/guile-strings.c:60
+#: ../src/register/ledger-core/split-register.c:1986
+#: ../intl-scm/guile-strings.c:108
msgid "Deposit"
msgstr "Einzahlung"
-#: ../src/register/ledger-core/split-register.c:1965
+#: ../src/register/ledger-core/split-register.c:1987
msgid "Withdraw"
msgstr "Belastung"
-#: ../src/register/ledger-core/split-register.c:1966
+#: ../src/register/ledger-core/split-register.c:1988
msgid "Check"
msgstr "Scheck"
-#: ../src/register/ledger-core/split-register.c:1967
-#: ../src/register/ledger-core/split-register.c:1995
-#: ../src/register/ledger-core/split-register.c:2003
+#: ../src/register/ledger-core/split-register.c:1989
#: ../src/register/ledger-core/split-register.c:2017
-#: ../src/register/ledger-core/split-register.c:2040
+#: ../src/register/ledger-core/split-register.c:2025
+#: ../src/register/ledger-core/split-register.c:2039
+#: ../src/register/ledger-core/split-register.c:2062
msgid "Int"
msgstr "Zins"
-#: ../src/register/ledger-core/split-register.c:1968
-#: ../src/register/ledger-core/split-register.c:1991
+#: ../src/register/ledger-core/split-register.c:1990
+#: ../src/register/ledger-core/split-register.c:2013
msgid "ATM"
msgstr "Geldautomat"
-#: ../src/register/ledger-core/split-register.c:1969
+#: ../src/register/ledger-core/split-register.c:1991
msgid "Teller"
msgstr "Bankschalter"
#. Action: Point Of Sale
-#: ../src/register/ledger-core/split-register.c:1971
+#: ../src/register/ledger-core/split-register.c:1993
msgid "POS"
msgstr "Karten-Terminal"
-#: ../src/register/ledger-core/split-register.c:1972
+#: ../src/register/ledger-core/split-register.c:1994
msgid "Phone"
msgstr "Telefon"
-#: ../src/register/ledger-core/split-register.c:1973
-#: ../src/register/ledger-core/split-register.c:1996
+#: ../src/register/ledger-core/split-register.c:1995
+#: ../src/register/ledger-core/split-register.c:2018
msgid "Online"
msgstr "Online"
#. Action: Automatic Deposit ?!?
-#: ../src/register/ledger-core/split-register.c:1975
+#: ../src/register/ledger-core/split-register.c:1997
msgid "AutoDep"
msgstr "Gutschrift"
-#: ../src/register/ledger-core/split-register.c:1976
+#: ../src/register/ledger-core/split-register.c:1998
msgid "Wire"
msgstr "Ãœberweisung"
-#: ../src/register/ledger-core/split-register.c:1978
+#: ../src/register/ledger-core/split-register.c:2000
msgid "Direct Debit"
msgstr "Lastschrift"
#. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:1982
-#: ../src/register/ledger-core/split-register.c:1986
-#: ../src/register/ledger-core/split-register.c:1992
-#: ../src/register/ledger-core/split-register.c:2000
-#: ../src/register/ledger-core/split-register.c:2015
+#: ../src/register/ledger-core/split-register.c:2004
+#: ../src/register/ledger-core/split-register.c:2008
+#: ../src/register/ledger-core/split-register.c:2014
#: ../src/register/ledger-core/split-register.c:2022
-#: ../src/register/ledger-core/split-register.c:2027
-#: ../src/register/ledger-core/split-register.c:2052
-#: ../intl-scm/guile-strings.c:70 ../intl-scm/guile-strings.c:72
-#: ../intl-scm/guile-strings.c:74
+#: ../src/register/ledger-core/split-register.c:2037
+#: ../src/register/ledger-core/split-register.c:2044
+#: ../src/register/ledger-core/split-register.c:2049
+#: ../src/register/ledger-core/split-register.c:2074
+#: ../intl-scm/guile-strings.c:118 ../intl-scm/guile-strings.c:120
+#: ../intl-scm/guile-strings.c:122
msgid "Buy"
msgstr "Kauf"
#. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:1983
-#: ../src/register/ledger-core/split-register.c:1987
-#: ../src/register/ledger-core/split-register.c:1997
-#: ../src/register/ledger-core/split-register.c:2001
-#: ../src/register/ledger-core/split-register.c:2016
+#: ../src/register/ledger-core/split-register.c:2005
+#: ../src/register/ledger-core/split-register.c:2009
+#: ../src/register/ledger-core/split-register.c:2019
#: ../src/register/ledger-core/split-register.c:2023
-#: ../src/register/ledger-core/split-register.c:2028
-#: ../src/register/ledger-core/split-register.c:2053
-#: ../intl-scm/guile-strings.c:98 ../intl-scm/guile-strings.c:100
-#: ../intl-scm/guile-strings.c:102
+#: ../src/register/ledger-core/split-register.c:2038
+#: ../src/register/ledger-core/split-register.c:2045
+#: ../src/register/ledger-core/split-register.c:2050
+#: ../src/register/ledger-core/split-register.c:2075
+#: ../intl-scm/guile-strings.c:146 ../intl-scm/guile-strings.c:148
+#: ../intl-scm/guile-strings.c:150
msgid "Sell"
msgstr "Verkauf"
-#: ../src/register/ledger-core/split-register.c:1988
-#: ../src/register/ledger-core/split-register.c:1994
-#: ../src/register/ledger-core/split-register.c:2037
+#: ../src/register/ledger-core/split-register.c:2010
+#: ../src/register/ledger-core/split-register.c:2016
+#: ../src/register/ledger-core/split-register.c:2059
msgid "Fee"
msgstr "Gebühr"
#. src/app-utils/prefs.scm
-#: ../src/register/ledger-core/split-register.c:2019
-#: ../intl-scm/guile-strings.c:106
+#: ../src/register/ledger-core/split-register.c:2041
+#: ../intl-scm/guile-strings.c:154
msgid "Rebate"
msgstr "Rabatt"
#. Action: Dividend
-#: ../src/register/ledger-core/split-register.c:2039
+#: ../src/register/ledger-core/split-register.c:2061
msgid "Div"
msgstr "Dividende"
#. Action: Long Term Capital Gains
-#: ../src/register/ledger-core/split-register.c:2042
+#: ../src/register/ledger-core/split-register.c:2064
msgid "LTCG"
msgstr "Zinsen aus langfristigen Kapitalanlagen"
#. Action: Short Term Capital Gains
-#: ../src/register/ledger-core/split-register.c:2044
+#: ../src/register/ledger-core/split-register.c:2066
msgid "STCG"
msgstr "Zinsen aus kurzfristigen Anlagen"
#. Action: Distribution
-#: ../src/register/ledger-core/split-register.c:2047
+#: ../src/register/ledger-core/split-register.c:2069
msgid "Dist"
msgstr "Ausschüttung"
@@ -14460,18 +14908,18 @@
msgid "_Rebalance"
msgstr "_Anpassen"
-#: ../src/register/ledger-core/split-register-control.c:1036
+#: ../src/register/ledger-core/split-register-control.c:1043
msgid ""
"You need to expand the transaction in order to modify its exchange rates."
msgstr ""
"Sie müssen den Buchungssatz in die »Vollständig«-Ansicht aufklappen, um die "
"Wechselkurse zu bearbeiten."
-#: ../src/register/ledger-core/split-register-control.c:1159
+#: ../src/register/ledger-core/split-register-control.c:1166
msgid "Save the changed transaction?"
msgstr "Geänderte Buchung speichern?"
-#: ../src/register/ledger-core/split-register-control.c:1161
+#: ../src/register/ledger-core/split-register-control.c:1168
msgid ""
"The current transaction has been changed. Would you like to record the "
"changes before moving to a new transaction, discard the changes, or return "
@@ -14481,19 +14929,19 @@
"abbrechen und zu der aktuellen Buchung zurückkehren, oder die Änderungen in "
"dieser Buchung speichern?"
-#: ../src/register/ledger-core/split-register-control.c:1174
+#: ../src/register/ledger-core/split-register-control.c:1181
msgid "_Discard Changes"
msgstr "Änderungen ver_werfen"
-#: ../src/register/ledger-core/split-register-control.c:1176
+#: ../src/register/ledger-core/split-register-control.c:1183
msgid "_Record Changes"
msgstr "Änderungen _speichern"
-#: ../src/register/ledger-core/split-register-control.c:1457
+#: ../src/register/ledger-core/split-register-control.c:1464
msgid "Mark split as unreconciled?"
msgstr "Buchungsteil als nicht abgeglichen markieren?"
-#: ../src/register/ledger-core/split-register-control.c:1459
+#: ../src/register/ledger-core/split-register-control.c:1466
msgid ""
"You are about to mark a reconciled split as unreconciled. Doing so might "
"make future reconciliation difficult! Continue with this change?"
@@ -14501,7 +14949,7 @@
"Wollen Sie diesen Buchungssatz wirklich als nicht abgeglichen markieren? "
"Dies kann das nächste Abgleichen erschweren. Trotzdem fortsetzen?"
-#: ../src/register/ledger-core/split-register-control.c:1476
+#: ../src/register/ledger-core/split-register-control.c:1483
msgid "_Unreconcile"
msgstr "_Nicht abgeglichen"
@@ -14581,12 +15029,6 @@
msgid "Credit Formula"
msgstr "Soll-Formel"
-#. This seems to be the one that initially gets used, the InactiveDateCell
-#. is set to, and subsequently displayed.
-#: ../src/register/ledger-core/split-register-model.c:806
-msgid "Scheduled"
-msgstr "Terminiert"
-
#: ../src/register/ledger-core/split-register-model.c:837
msgid "Enter the transaction reference, such as the invoice or check number"
msgstr ""
@@ -14681,50 +15123,68 @@
msgid "Chan_ge Split"
msgstr "Buchungs_teil ändern"
-#: ../src/register/ledger-core/split-register-model.c:1773
+#: ../src/register/ledger-core/split-register-model.c:1772
msgid "Enter debit formula for real transaction"
msgstr ""
"Geben Sie die Formel zur Haben-Berechnung der tatsächlichen Buchung ein"
-#: ../src/register/ledger-core/split-register-model.c:1803
+#: ../src/register/ledger-core/split-register-model.c:1802
msgid "Enter credit formula for real transaction"
msgstr "Geben Sie die Formel zur Soll-Berechnung der tatsächlichen Buchung ein"
-#: ../src/register/register-gnome/gnucash-item-list.c:474
+#: ../src/register/register-gnome/gnucash-item-list.c:476
msgid "List"
msgstr "Liste"
-#: ../src/report/report-gnome/dialog-column-view.c:291
+#: ../src/report/report-gnome/dialog-column-view.c:332
msgid "Contents"
msgstr "Inhalt"
-#: ../src/report/report-gnome/dialog-style-sheet.c:138
+#. src/report/report-gnome/report-gnome.scm
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../src/report/report-gnome/dialog-column-view.c:361
+#: ../intl-scm/guile-strings.c:1432 ../intl-scm/guile-strings.c:1442
+#: ../intl-scm/guile-strings.c:6204 ../intl-scm/guile-strings.c:6728
+msgid "Report"
+msgstr "Bericht"
+
+#: ../src/report/report-gnome/dialog-column-view.c:367
+msgid "Cols"
+msgstr "Spalten"
+
+#: ../src/report/report-gnome/dialog-column-view.c:373
+msgid "Rows"
+msgstr "Zeilen"
+
+#: ../src/report/report-gnome/dialog-style-sheet.c:140
#, c-format
msgid "HTML Style Sheet Properties: %s"
msgstr "Eigenschaften HTML-Stilvorlage %s"
-#: ../src/report/report-gnome/dialog-style-sheet.c:369
+#: ../src/report/report-gnome/dialog-style-sheet.c:372
msgid "Style Sheet Name"
msgstr "Name der Stilvorlage"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:276
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:277
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:273
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:274
msgid "The numeric ID of the report."
msgstr "Die Nummer des Berichts."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:932
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:942
msgid "_Print Report..."
msgstr "Bericht _drucken..."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:933
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:943
msgid "Print the current report"
msgstr "Aktuellen Bericht drucken"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:944
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:954
msgid "Add _Report"
msgstr "_Bericht hinzufügen..."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:945
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:955
msgid ""
"Add the current report to the `Custom' menu for later use. The report will "
"be saved in the file ~/.gnucash/saved-reports-2.0. It will be accessible as "
@@ -14734,82 +15194,82 @@
"Datei ~/.gnucash/saved-reports-2.0 gespeichert. Der Bericht wird beim "
"nächsten Programmstart von GnuCash im Menü verfügbar sein."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:950
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:960
msgid "Export _Report"
msgstr "_Bericht exportieren"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:951
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:961
msgid "Export HTML-formatted report to file"
msgstr "HTML-formatierten Bericht in Datei exportieren"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:953
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:963
msgid "_Report Options"
msgstr "Berichts_optionen"
#. src/report/report-system/html-utilities.scm
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:954
-#: ../intl-scm/guile-strings.c:900 ../intl-scm/guile-strings.c:906
-#: ../intl-scm/guile-strings.c:912
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:964
+#: ../intl-scm/guile-strings.c:1412 ../intl-scm/guile-strings.c:1418
+#: ../intl-scm/guile-strings.c:1424
msgid "Edit report options"
msgstr "Berichtsoptionen ändern"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:957
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:967
msgid "Back"
msgstr "Zurück"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:958
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:968
msgid "Move back one step in the history"
msgstr "Einen Schritt zurück"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:960
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:970
msgid "Forward"
msgstr "Vorwärts"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:961
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:971
msgid "Move forward one step in the history"
msgstr "Einen Schritt vorwärts"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:963
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:973
msgid "Reload"
msgstr "Erneut laden"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:964
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:974
msgid "Reload the current page"
msgstr "Aktuelle Seite neu laden"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:966
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:976
msgid "Stop"
msgstr "Abbrechen"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:967
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:977
msgid "Cancel outstanding HTML requests"
msgstr "Unbeantwortete HTML-Anfragen abbrechen "
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:974
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:984
msgid "Print"
msgstr "Drucken"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1249
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1286
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1263
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1300
msgid "HTML"
msgstr "HTML"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1252
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1266
msgid "Choose export format"
msgstr "Wählen Sie das Export-Format"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1253
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1267
msgid "Choose the export format for this report:"
msgstr "Wählen Sie das Export-Format für diesen Bericht:"
#. %s is the type of what is about to be saved, e.g. "HTML".
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1293
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1307
#, c-format
msgid "Save %s To File"
msgstr "%s in Datei speichern"
#. %s is the strerror(3) string of the error that occurred.
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1308
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1322
#, c-format
msgid ""
"You cannot save to that filename.\n"
@@ -14820,16 +15280,16 @@
"\n"
"%s"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1318
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1332
msgid "You cannot save to that file."
msgstr "Sie können nicht in diese Datei speichern."
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1399
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1413
#, c-format
msgid "Could not open the file %s. The error is: %s"
msgstr "Kann Datei %s nicht öffnen. Fehlermeldung: %s"
-#: ../src/report/report-gnome/gnc-plugin-page-report.c:1430
+#: ../src/report/report-gnome/gnc-plugin-page-report.c:1444
msgid "There are no options for this report."
msgstr "Es gibt für diesen Bericht keine Optionen."
@@ -14864,87 +15324,74 @@
msgstr "Hinzufügen >>"
#: ../src/report/report-gnome/report.glade.h:8
-msgid "Cols"
-msgstr "Spalten"
-
-#: ../src/report/report-gnome/report.glade.h:9
msgid "Enter report row/column span"
msgstr "Ausdehnung des Bericht in Tabellen-Spalten oder -Zeilen"
-#: ../src/report/report-gnome/report.glade.h:10
+#: ../src/report/report-gnome/report.glade.h:9
msgid "HTML Style Sheets"
msgstr "HTML-Stilvorlage"
-#: ../src/report/report-gnome/report.glade.h:11
+#: ../src/report/report-gnome/report.glade.h:10
msgid "Move _up"
msgstr "Nach _oben"
-#: ../src/report/report-gnome/report.glade.h:12
+#: ../src/report/report-gnome/report.glade.h:11
msgid "Move dow_n"
msgstr "Nach _unten"
-#: ../src/report/report-gnome/report.glade.h:13
+#: ../src/report/report-gnome/report.glade.h:12
msgid "New Style Sheet"
msgstr "Neue Stilvorlage"
-#. src/report/report-gnome/report-gnome.scm
-#. src/business/business-reports/owner-report.scm
-#: ../src/report/report-gnome/report.glade.h:14
-#: ../intl-scm/guile-strings.c:920 ../intl-scm/guile-strings.c:3478
-msgid "Report"
-msgstr "Bericht"
-
-#: ../src/report/report-gnome/report.glade.h:15
+#: ../src/report/report-gnome/report.glade.h:13
msgid "Report Size"
msgstr "Berichtsgröße"
-#: ../src/report/report-gnome/report.glade.h:16
-msgid "Rows"
-msgstr "Zeilen"
-
-#: ../src/report/report-gnome/report.glade.h:17
+#: ../src/report/report-gnome/report.glade.h:14
msgid "Select HTML Style Sheet"
msgstr "HTML-Stilvorlage auswählen"
-#: ../src/report/report-gnome/report.glade.h:18
+#: ../src/report/report-gnome/report.glade.h:15
msgid "Si_ze..."
msgstr "G_röße..."
-#: ../src/report/report-gnome/report.glade.h:19
+#: ../src/report/report-gnome/report.glade.h:16
msgid "_Column span:"
msgstr "_Spaltenausdehnung:"
-#: ../src/report/report-gnome/report.glade.h:22
+#: ../src/report/report-gnome/report.glade.h:19
msgid "_Row span:"
msgstr "_Zeilenausdehnung:"
-#: ../src/report/report-gnome/report.glade.h:23
+#: ../src/report/report-gnome/report.glade.h:20
msgid "_Template:"
msgstr "_Vorlage:"
-#: ../src/report/report-gnome/window-report.c:122
+#: ../src/report/report-gnome/window-report.c:101
msgid "Set the report options you want using this dialog."
msgstr "Mit diesem Dialog können Sie die Berichtsoptionen bearbeiten."
#. src/report/utility-reports/view-column.scm
-#: ../src/report/report-gnome/window-report.c:217
-#: ../intl-scm/guile-strings.c:938
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../src/report/report-gnome/window-report.c:202
+#: ../intl-scm/guile-strings.c:1460 ../intl-scm/guile-strings.c:1482
msgid "Report error"
msgstr "Fehler im Bericht"
#. src/report/utility-reports/view-column.scm
-#: ../src/report/report-gnome/window-report.c:218
-#: ../intl-scm/guile-strings.c:940
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../src/report/report-gnome/window-report.c:203
+#: ../intl-scm/guile-strings.c:1462 ../intl-scm/guile-strings.c:1484
msgid "An error occurred while running the report."
msgstr "Beim Erstellen des Berichts ist ein Fehler aufgetreten."
-#: ../src/report/report-gnome/window-report.c:250
-#: ../src/report/report-gnome/window-report.c:272
+#: ../src/report/report-gnome/window-report.c:236
+#: ../src/report/report-gnome/window-report.c:258
#, c-format
msgid "Badly formed options URL: %s"
msgstr "Fehlerhafte Optionen-URL: %s"
-#: ../src/report/report-gnome/window-report.c:260
+#: ../src/report/report-gnome/window-report.c:246
#, c-format
msgid "Badly report id: %s"
msgstr "Fehlerhafte Berichts ID: %s"
@@ -14952,17 +15399,17 @@
#. Menu Items
#: ../src/report/stylesheets/gnc-plugin-stylesheets.c:49
msgid "St_yle Sheets"
-msgstr "_Stilvorlagen"
+msgstr "Stil_vorlagen"
#: ../src/report/stylesheets/gnc-plugin-stylesheets.c:50
msgid "Edit report style sheets."
msgstr "Stilvorlagen für Berichte bearbeiten."
-#: ../lib/libqof/backend/file/qsf-backend.c:102
+#: ../lib/libqof/backend/file/qsf-backend.c:107
msgid "Level of compression to use: 0 for none, 9 for highest."
msgstr "Kompressionsaufwand: 0 für gar keinen, 9 für höchsten."
-#: ../lib/libqof/backend/file/qsf-backend.c:103
+#: ../lib/libqof/backend/file/qsf-backend.c:108
msgid ""
"QOF can compress QSF XML files using gzip. Note that compression is not used "
"when outputting to STDOUT."
@@ -14970,13 +15417,13 @@
"QOF kann die QSF XML-Dateien mit gzip komprimieren. Dies wird aber nicht "
"gemacht, wenn die Ausgabe nach STDOUT geleitet ist."
-#: ../lib/libqof/backend/file/qsf-backend.c:111
+#: ../lib/libqof/backend/file/qsf-backend.c:116
msgid "List of QSF map files to use for this session."
msgstr ""
"Liste der QSF-Zuordnungs-Dateien (Map), die in dieser Sietzung verwendet "
"werden."
-#: ../lib/libqof/backend/file/qsf-backend.c:112
+#: ../lib/libqof/backend/file/qsf-backend.c:117
msgid ""
"QOF can convert objects within QSF XML files using a map of the changes "
"required."
@@ -14984,16 +15431,16 @@
"QOF kann Objekte aus QSF XML-Dateien konvertieren, wenn eine Liste von "
"Zuordnungen (Maps) für die notwendigen Änderungen existieren."
-#: ../lib/libqof/backend/file/qsf-backend.c:120
-msgid "Encoding string to use when writing the XML file."
+#: ../lib/libqof/backend/file/qsf-backend.c:125
+msgid "String encoding to use when writing the XML file."
msgstr ""
"Wählen Sie die Zeichencodierung (Encoding), die in die XML-Datei geschrieben "
"werden soll."
-#: ../lib/libqof/backend/file/qsf-backend.c:121
+#: ../lib/libqof/backend/file/qsf-backend.c:126
msgid ""
-"QSF defaults to UTF-8. Other encodings are supported by passing the encoding "
-"string in this option."
+"QSF defaults to UTF-8. Other encodings are supported by passing the string "
+"encoding in this option."
msgstr ""
"Die voreingestellte Zeichenkodierung in QSF ist UTF-8. Andere Kodierungen "
"können verwendet werden, indem Sie den Namen der Zeichencodierung in dieser "
@@ -15020,20 +15467,27 @@
"sind."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:8 ../intl-scm/guile-strings.c:10
+#: ../intl-scm/guile-strings.c:52 ../intl-scm/guile-strings.c:54
msgid "No commodities marked for quote retrieval."
msgstr "Keine Aktien zum Börsenkurs-Abruf markiert."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:12 ../intl-scm/guile-strings.c:14
#: ../intl-scm/guile-strings.c:30 ../intl-scm/guile-strings.c:32
+#: ../intl-scm/guile-strings.c:56 ../intl-scm/guile-strings.c:58
+#: ../intl-scm/guile-strings.c:74 ../intl-scm/guile-strings.c:76
msgid "Unable to get quotes or diagnose the problem."
msgstr ""
"Abrufen der Börsenkurse fehlgeschlagen. Genauere Diagnose ebenfalls "
"fehlgeschlagen."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:16 ../intl-scm/guile-strings.c:19
+#: ../intl-scm/guile-strings.c:60 ../intl-scm/guile-strings.c:63
msgid ""
"You are missing some needed Perl libraries.\n"
"Run 'gnc-fq-update' as root to install them."
@@ -15042,731 +15496,959 @@
"Führen Sie 'gnc-fq-update' als root aus, um diese zu installieren."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:22 ../intl-scm/guile-strings.c:24
+#: ../intl-scm/guile-strings.c:66 ../intl-scm/guile-strings.c:68
msgid "There was a system error while retrieving the price quotes."
msgstr "Beim Herunterladen der Börsenkurse ist ein Systemfehler aufgetreten."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:26 ../intl-scm/guile-strings.c:28
+#: ../intl-scm/guile-strings.c:70 ../intl-scm/guile-strings.c:72
msgid "There was an unknown error while retrieving the price quotes."
msgstr ""
"Beim Herunterladen der Börsenkurse ist ein unbekannter Fehler aufgetreten."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:34 ../intl-scm/guile-strings.c:38
-#: ../intl-scm/guile-strings.c:40
+#: ../intl-scm/guile-strings.c:40 ../intl-scm/guile-strings.c:78
+#: ../intl-scm/guile-strings.c:82 ../intl-scm/guile-strings.c:84
msgid "Unable to retrieve quotes for these items:"
msgstr "Abrufen von Börsenkursen für diese Werte fehlgeschlagen:"
#. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:36
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:36 ../intl-scm/guile-strings.c:80
msgid "Continue using only the good quotes?"
msgstr "Mit den benutzbaren Kursen fortsetzen?"
#. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:42
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:42 ../intl-scm/guile-strings.c:86
msgid "Continuing with good quotes."
msgstr "Es wird mit den benutzbaren Kursen fortgesetzt."
#. src/scm/price-quotes.scm
+#. src/scm/gnucash/price-quotes.scm
#: ../intl-scm/guile-strings.c:44 ../intl-scm/guile-strings.c:48
+#: ../intl-scm/guile-strings.c:88 ../intl-scm/guile-strings.c:92
msgid "Unable to create prices for these items:"
msgstr "Preis-Eintrag für folgende Werte fehlgeschlagen:"
#. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:46
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:46 ../intl-scm/guile-strings.c:90
msgid "Add remaining good quotes?"
msgstr "Ãœbrige benutzbare Kurse eintragen?"
#. src/scm/price-quotes.scm
-#: ../intl-scm/guile-strings.c:50
+#. src/scm/gnucash/price-quotes.scm
+#: ../intl-scm/guile-strings.c:50 ../intl-scm/guile-strings.c:94
msgid "Adding remaining good quotes."
msgstr "Benutzbare Kurse werden eingetragen."
#. src/tax/us/de_DE.scm
-#: ../intl-scm/guile-strings.c:54
+#. src/tax/us/gnucash/tax/de_DE.scm
+#: ../intl-scm/guile-strings.c:98 ../intl-scm/guile-strings.c:102
msgid "Tax Number"
msgstr "Steuernummer"
#. src/tax/us/txf-de_DE.scm
-#: ../intl-scm/guile-strings.c:56
+#: ../intl-scm/guile-strings.c:104
msgid "The electronic tax number of your business"
msgstr "Die Elster-Steuernummer Ihrer Unternehmung"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:58
+#: ../intl-scm/guile-strings.c:106
msgid "Funds In"
msgstr "Gutschrift"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:62
+#: ../intl-scm/guile-strings.c:110
msgid "Receive"
msgstr "Empfangen"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:66 ../intl-scm/guile-strings.c:96
-#: ../intl-scm/guile-strings.c:112
+#: ../intl-scm/guile-strings.c:114 ../intl-scm/guile-strings.c:144
+#: ../intl-scm/guile-strings.c:160
msgid "Increase"
msgstr "Zunahme"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:68 ../intl-scm/guile-strings.c:84
-#: ../intl-scm/guile-strings.c:94
+#: ../intl-scm/guile-strings.c:116 ../intl-scm/guile-strings.c:132
+#: ../intl-scm/guile-strings.c:142
msgid "Decrease"
msgstr "Abnahme"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:86
+#: ../intl-scm/guile-strings.c:134
msgid "Funds Out"
msgstr "Belastung"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:88
+#: ../intl-scm/guile-strings.c:136
msgid "Withdrawal"
msgstr "Abhebung"
#. src/app-utils/prefs.scm
-#: ../intl-scm/guile-strings.c:90
+#: ../intl-scm/guile-strings.c:138
msgid "Spend"
msgstr "Ausgabe"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:114
+#: ../intl-scm/guile-strings.c:162
msgid "Current Year Start"
msgstr "Anfang dieses Jahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:116
+#: ../intl-scm/guile-strings.c:164
msgid "Start of the current calendar year"
msgstr "Beginn des momentanen Kalenderjahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:118
+#: ../intl-scm/guile-strings.c:166
msgid "Current Year End"
msgstr "Ende dieses Jahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:120
+#: ../intl-scm/guile-strings.c:168
msgid "End of the current calendar year"
msgstr "Ende des momentanen Kalenderjahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:122
+#: ../intl-scm/guile-strings.c:170
msgid "Previous Year Start"
msgstr "Anfang des vorherigen Jahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:124
+#: ../intl-scm/guile-strings.c:172
msgid "Beginning of the previous calendar year"
msgstr "Anfang des vorherigen Kalenderjahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:126
+#: ../intl-scm/guile-strings.c:174
msgid "Previous Year End"
msgstr "Ende des vorherigen Jahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:128
+#: ../intl-scm/guile-strings.c:176
msgid "End of the Previous Year"
msgstr "Ende des vorherigen Jahres"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:130
+#: ../intl-scm/guile-strings.c:178
msgid "Start of Financial Period"
msgstr "Start der Buchführungsperiode"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:132
+#: ../intl-scm/guile-strings.c:180
msgid "Start of the accounting period, as set in the global preferences"
msgstr ""
"Start der Buchführungsperiode, wie in den programmweiten Einstellungen "
"festgelegt"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:134
+#: ../intl-scm/guile-strings.c:182
msgid "End of Financial Period"
msgstr "Ende der Buchführungsperiode"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:136
+#: ../intl-scm/guile-strings.c:184
msgid "End of the accounting period, as set in the global preferences"
msgstr ""
"Ende der Buchführungsperiode, wie in den programmweiten Einstellungen "
"festgelegt"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:140
+#: ../intl-scm/guile-strings.c:188
msgid "Start of the current month"
msgstr "Beginn des momentanen Monats"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:144
+#: ../intl-scm/guile-strings.c:192
msgid "End of the current month"
msgstr "Ende des momentanen Monats"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:148
+#: ../intl-scm/guile-strings.c:196
msgid "The beginning of the previous month"
msgstr "Beginn des vorherigen Monats"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:152
+#: ../intl-scm/guile-strings.c:200
msgid "Last day of previous month"
msgstr "Letzter Tag des vorherigen Monats"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:154
+#: ../intl-scm/guile-strings.c:202
msgid "Start of current quarter"
msgstr "Beginn des momentanen Quartals"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:156
+#: ../intl-scm/guile-strings.c:204
msgid "The start of the latest quarterly accounting period"
msgstr "Beginn des letzten Finanzquartals"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:158
+#: ../intl-scm/guile-strings.c:206
msgid "End of current quarter"
msgstr "Ende des momentanen Quartals"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:160
+#: ../intl-scm/guile-strings.c:208
msgid "The end of the latest quarterly accounting period"
msgstr "Ende des letzten Finanzquartals"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:164
+#: ../intl-scm/guile-strings.c:212
msgid "The start of the previous quarterly accounting period"
msgstr "Beginn des vorherigen Finanzquartals"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:168
+#: ../intl-scm/guile-strings.c:216
msgid "End of previous quarterly accounting period"
msgstr "Ende des vorherigen Finanzquartals"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:172
+#: ../intl-scm/guile-strings.c:220
msgid "The current date"
msgstr "Das aktuelle Datum"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:174 ../intl-scm/guile-strings.c:176
+#: ../intl-scm/guile-strings.c:222 ../intl-scm/guile-strings.c:224
msgid "One Month Ago"
msgstr "Einen Monat zuvor"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:178 ../intl-scm/guile-strings.c:180
+#: ../intl-scm/guile-strings.c:226 ../intl-scm/guile-strings.c:228
msgid "One Week Ago"
msgstr "Eine Woche zuvor"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:182 ../intl-scm/guile-strings.c:184
+#: ../intl-scm/guile-strings.c:230 ../intl-scm/guile-strings.c:232
msgid "Three Months Ago"
msgstr "Drei Monate zuvor"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:186 ../intl-scm/guile-strings.c:188
+#: ../intl-scm/guile-strings.c:234 ../intl-scm/guile-strings.c:236
msgid "Six Months Ago"
msgstr "sechs Monate zuvor"
#. src/app-utils/date-utilities.scm
-#: ../intl-scm/guile-strings.c:190 ../intl-scm/guile-strings.c:192
+#: ../intl-scm/guile-strings.c:238 ../intl-scm/guile-strings.c:240
msgid "One Year Ago"
msgstr "Ein Jahr zuvor"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:196 ../intl-scm/guile-strings.c:322
-#: ../intl-scm/guile-strings.c:408 ../intl-scm/guile-strings.c:534
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:244 ../intl-scm/guile-strings.c:370
+#: ../intl-scm/guile-strings.c:456 ../intl-scm/guile-strings.c:582
+#: ../intl-scm/guile-strings.c:668 ../intl-scm/guile-strings.c:794
+#: ../intl-scm/guile-strings.c:880 ../intl-scm/guile-strings.c:1006
msgid "Preparer"
msgstr "Sachbearbeiter"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:198 ../intl-scm/guile-strings.c:410
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:246 ../intl-scm/guile-strings.c:458
+#: ../intl-scm/guile-strings.c:670 ../intl-scm/guile-strings.c:882
msgid "Name of person preparing the report"
msgstr "Name der Person, die den Bericht erstellt."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:202 ../intl-scm/guile-strings.c:326
-#: ../intl-scm/guile-strings.c:414 ../intl-scm/guile-strings.c:538
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:250 ../intl-scm/guile-strings.c:374
+#: ../intl-scm/guile-strings.c:462 ../intl-scm/guile-strings.c:586
+#: ../intl-scm/guile-strings.c:674 ../intl-scm/guile-strings.c:798
+#: ../intl-scm/guile-strings.c:886 ../intl-scm/guile-strings.c:1010
msgid "Prepared for"
msgstr "Erstellt für"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:204 ../intl-scm/guile-strings.c:416
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:252 ../intl-scm/guile-strings.c:464
+#: ../intl-scm/guile-strings.c:676 ../intl-scm/guile-strings.c:888
msgid "Name of organization or company prepared for"
msgstr "Name der Organisation/Firma, für die der Bericht erstellt wird."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:208 ../intl-scm/guile-strings.c:330
-#: ../intl-scm/guile-strings.c:420 ../intl-scm/guile-strings.c:542
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:256 ../intl-scm/guile-strings.c:378
+#: ../intl-scm/guile-strings.c:468 ../intl-scm/guile-strings.c:590
+#: ../intl-scm/guile-strings.c:680 ../intl-scm/guile-strings.c:802
+#: ../intl-scm/guile-strings.c:892 ../intl-scm/guile-strings.c:1014
msgid "Show preparer info"
msgstr "Personen-Information anzeigen"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:210 ../intl-scm/guile-strings.c:422
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:258 ../intl-scm/guile-strings.c:470
+#: ../intl-scm/guile-strings.c:682 ../intl-scm/guile-strings.c:894
msgid "Name of organization or company"
msgstr "Name der Organisation/Firma"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:214 ../intl-scm/guile-strings.c:334
-#: ../intl-scm/guile-strings.c:426 ../intl-scm/guile-strings.c:546
-#: ../intl-scm/guile-strings.c:632
+#: ../intl-scm/guile-strings.c:262 ../intl-scm/guile-strings.c:382
+#: ../intl-scm/guile-strings.c:474 ../intl-scm/guile-strings.c:594
+#: ../intl-scm/guile-strings.c:686 ../intl-scm/guile-strings.c:806
+#: ../intl-scm/guile-strings.c:898 ../intl-scm/guile-strings.c:1018
+#: ../intl-scm/guile-strings.c:1104 ../intl-scm/guile-strings.c:1144
msgid "Enable Links"
msgstr "Hyperlinks aktivieren"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:216 ../intl-scm/guile-strings.c:428
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:264 ../intl-scm/guile-strings.c:476
+#: ../intl-scm/guile-strings.c:688 ../intl-scm/guile-strings.c:900
msgid "Enable hyperlinks in reports"
msgstr "Klickbare Hyperlinks in Berichten aktivieren"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:218 ../intl-scm/guile-strings.c:224
-#: ../intl-scm/guile-strings.c:230 ../intl-scm/guile-strings.c:248
-#: ../intl-scm/guile-strings.c:368 ../intl-scm/guile-strings.c:372
-#: ../intl-scm/guile-strings.c:376 ../intl-scm/guile-strings.c:380
-#: ../intl-scm/guile-strings.c:430 ../intl-scm/guile-strings.c:436
-#: ../intl-scm/guile-strings.c:442 ../intl-scm/guile-strings.c:460
-#: ../intl-scm/guile-strings.c:580 ../intl-scm/guile-strings.c:584
-#: ../intl-scm/guile-strings.c:588 ../intl-scm/guile-strings.c:592
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:266 ../intl-scm/guile-strings.c:272
+#: ../intl-scm/guile-strings.c:278 ../intl-scm/guile-strings.c:296
+#: ../intl-scm/guile-strings.c:416 ../intl-scm/guile-strings.c:420
+#: ../intl-scm/guile-strings.c:424 ../intl-scm/guile-strings.c:428
+#: ../intl-scm/guile-strings.c:478 ../intl-scm/guile-strings.c:484
+#: ../intl-scm/guile-strings.c:490 ../intl-scm/guile-strings.c:508
+#: ../intl-scm/guile-strings.c:628 ../intl-scm/guile-strings.c:632
+#: ../intl-scm/guile-strings.c:636 ../intl-scm/guile-strings.c:640
+#: ../intl-scm/guile-strings.c:690 ../intl-scm/guile-strings.c:696
+#: ../intl-scm/guile-strings.c:702 ../intl-scm/guile-strings.c:720
+#: ../intl-scm/guile-strings.c:840 ../intl-scm/guile-strings.c:844
+#: ../intl-scm/guile-strings.c:848 ../intl-scm/guile-strings.c:852
+#: ../intl-scm/guile-strings.c:902 ../intl-scm/guile-strings.c:908
+#: ../intl-scm/guile-strings.c:914 ../intl-scm/guile-strings.c:932
+#: ../intl-scm/guile-strings.c:1052 ../intl-scm/guile-strings.c:1056
+#: ../intl-scm/guile-strings.c:1060 ../intl-scm/guile-strings.c:1064
msgid "Images"
msgstr "Bilder"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:220 ../intl-scm/guile-strings.c:370
-#: ../intl-scm/guile-strings.c:432 ../intl-scm/guile-strings.c:582
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:268 ../intl-scm/guile-strings.c:418
+#: ../intl-scm/guile-strings.c:480 ../intl-scm/guile-strings.c:630
+#: ../intl-scm/guile-strings.c:692 ../intl-scm/guile-strings.c:842
+#: ../intl-scm/guile-strings.c:904 ../intl-scm/guile-strings.c:1054
msgid "Background Tile"
msgstr "Hintergrundbild"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:222 ../intl-scm/guile-strings.c:434
-#: ../intl-scm/guile-strings.c:628
+#: ../intl-scm/guile-strings.c:270 ../intl-scm/guile-strings.c:482
+#: ../intl-scm/guile-strings.c:694 ../intl-scm/guile-strings.c:906
+#: ../intl-scm/guile-strings.c:1100 ../intl-scm/guile-strings.c:1140
msgid "Background tile for reports."
msgstr "Hintergrundbild für Berichte."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:226 ../intl-scm/guile-strings.c:374
-#: ../intl-scm/guile-strings.c:438 ../intl-scm/guile-strings.c:586
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:274 ../intl-scm/guile-strings.c:422
+#: ../intl-scm/guile-strings.c:486 ../intl-scm/guile-strings.c:634
+#: ../intl-scm/guile-strings.c:698 ../intl-scm/guile-strings.c:846
+#: ../intl-scm/guile-strings.c:910 ../intl-scm/guile-strings.c:1058
msgid "Heading Banner"
msgstr "Titel"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:228 ../intl-scm/guile-strings.c:234
-#: ../intl-scm/guile-strings.c:440 ../intl-scm/guile-strings.c:446
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:276 ../intl-scm/guile-strings.c:282
+#: ../intl-scm/guile-strings.c:488 ../intl-scm/guile-strings.c:494
+#: ../intl-scm/guile-strings.c:700 ../intl-scm/guile-strings.c:706
+#: ../intl-scm/guile-strings.c:912 ../intl-scm/guile-strings.c:918
msgid "Banner for top of report."
msgstr "Titel für die Titelzeile des Berichts"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:232 ../intl-scm/guile-strings.c:382
-#: ../intl-scm/guile-strings.c:444 ../intl-scm/guile-strings.c:594
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:280 ../intl-scm/guile-strings.c:430
+#: ../intl-scm/guile-strings.c:492 ../intl-scm/guile-strings.c:642
+#: ../intl-scm/guile-strings.c:704 ../intl-scm/guile-strings.c:854
+#: ../intl-scm/guile-strings.c:916 ../intl-scm/guile-strings.c:1066
msgid "Heading Alignment"
msgstr "Ausrichtung Ãœberschrift"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:236 ../intl-scm/guile-strings.c:448
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:284 ../intl-scm/guile-strings.c:496
+#: ../intl-scm/guile-strings.c:708 ../intl-scm/guile-strings.c:920
msgid "Left"
msgstr "Links"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:238 ../intl-scm/guile-strings.c:450
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:286 ../intl-scm/guile-strings.c:498
+#: ../intl-scm/guile-strings.c:710 ../intl-scm/guile-strings.c:922
msgid "Align the banner to the left"
msgstr "Logo linksbündig ausrichten"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:240 ../intl-scm/guile-strings.c:452
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:288 ../intl-scm/guile-strings.c:500
+#: ../intl-scm/guile-strings.c:712 ../intl-scm/guile-strings.c:924
msgid "Center"
msgstr "Zentriert"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:242 ../intl-scm/guile-strings.c:454
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:290 ../intl-scm/guile-strings.c:502
+#: ../intl-scm/guile-strings.c:714 ../intl-scm/guile-strings.c:926
msgid "Align the banner in the center"
msgstr "Logo zentriert ausrichten"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:244 ../intl-scm/guile-strings.c:456
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:292 ../intl-scm/guile-strings.c:504
+#: ../intl-scm/guile-strings.c:716 ../intl-scm/guile-strings.c:928
msgid "Right"
msgstr "Rechts"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:246 ../intl-scm/guile-strings.c:458
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:294 ../intl-scm/guile-strings.c:506
+#: ../intl-scm/guile-strings.c:718 ../intl-scm/guile-strings.c:930
msgid "Align the banner to the right"
msgstr "Logo rechtsbündig ausrichten"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:250 ../intl-scm/guile-strings.c:378
-#: ../intl-scm/guile-strings.c:462 ../intl-scm/guile-strings.c:590
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:298 ../intl-scm/guile-strings.c:426
+#: ../intl-scm/guile-strings.c:510 ../intl-scm/guile-strings.c:638
+#: ../intl-scm/guile-strings.c:722 ../intl-scm/guile-strings.c:850
+#: ../intl-scm/guile-strings.c:934 ../intl-scm/guile-strings.c:1062
msgid "Logo"
msgstr "Logo"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:252 ../intl-scm/guile-strings.c:464
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:300 ../intl-scm/guile-strings.c:512
+#: ../intl-scm/guile-strings.c:724 ../intl-scm/guile-strings.c:936
msgid "Company logo image."
msgstr "Bild für das Firmenlogo."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:254 ../intl-scm/guile-strings.c:260
-#: ../intl-scm/guile-strings.c:266 ../intl-scm/guile-strings.c:272
-#: ../intl-scm/guile-strings.c:278 ../intl-scm/guile-strings.c:284
-#: ../intl-scm/guile-strings.c:290 ../intl-scm/guile-strings.c:296
-#: ../intl-scm/guile-strings.c:336 ../intl-scm/guile-strings.c:340
-#: ../intl-scm/guile-strings.c:344 ../intl-scm/guile-strings.c:348
-#: ../intl-scm/guile-strings.c:352 ../intl-scm/guile-strings.c:356
-#: ../intl-scm/guile-strings.c:360 ../intl-scm/guile-strings.c:364
-#: ../intl-scm/guile-strings.c:466 ../intl-scm/guile-strings.c:472
-#: ../intl-scm/guile-strings.c:478 ../intl-scm/guile-strings.c:484
-#: ../intl-scm/guile-strings.c:490 ../intl-scm/guile-strings.c:496
-#: ../intl-scm/guile-strings.c:502 ../intl-scm/guile-strings.c:508
-#: ../intl-scm/guile-strings.c:548 ../intl-scm/guile-strings.c:552
-#: ../intl-scm/guile-strings.c:556 ../intl-scm/guile-strings.c:560
-#: ../intl-scm/guile-strings.c:564 ../intl-scm/guile-strings.c:568
-#: ../intl-scm/guile-strings.c:572 ../intl-scm/guile-strings.c:576
-#: ../intl-scm/guile-strings.c:2522 ../intl-scm/guile-strings.c:2526
-#: ../intl-scm/guile-strings.c:2530 ../intl-scm/guile-strings.c:2534
-#: ../intl-scm/guile-strings.c:2538
+#: ../intl-scm/guile-strings.c:302 ../intl-scm/guile-strings.c:308
+#: ../intl-scm/guile-strings.c:314 ../intl-scm/guile-strings.c:320
+#: ../intl-scm/guile-strings.c:326 ../intl-scm/guile-strings.c:332
+#: ../intl-scm/guile-strings.c:338 ../intl-scm/guile-strings.c:344
+#: ../intl-scm/guile-strings.c:384 ../intl-scm/guile-strings.c:388
+#: ../intl-scm/guile-strings.c:392 ../intl-scm/guile-strings.c:396
+#: ../intl-scm/guile-strings.c:400 ../intl-scm/guile-strings.c:404
+#: ../intl-scm/guile-strings.c:408 ../intl-scm/guile-strings.c:412
+#: ../intl-scm/guile-strings.c:514 ../intl-scm/guile-strings.c:520
+#: ../intl-scm/guile-strings.c:526 ../intl-scm/guile-strings.c:532
+#: ../intl-scm/guile-strings.c:538 ../intl-scm/guile-strings.c:544
+#: ../intl-scm/guile-strings.c:550 ../intl-scm/guile-strings.c:556
+#: ../intl-scm/guile-strings.c:596 ../intl-scm/guile-strings.c:600
+#: ../intl-scm/guile-strings.c:604 ../intl-scm/guile-strings.c:608
+#: ../intl-scm/guile-strings.c:612 ../intl-scm/guile-strings.c:616
+#: ../intl-scm/guile-strings.c:620 ../intl-scm/guile-strings.c:624
+#: ../intl-scm/guile-strings.c:726 ../intl-scm/guile-strings.c:732
+#: ../intl-scm/guile-strings.c:738 ../intl-scm/guile-strings.c:744
+#: ../intl-scm/guile-strings.c:750 ../intl-scm/guile-strings.c:756
+#: ../intl-scm/guile-strings.c:762 ../intl-scm/guile-strings.c:768
+#: ../intl-scm/guile-strings.c:808 ../intl-scm/guile-strings.c:812
+#: ../intl-scm/guile-strings.c:816 ../intl-scm/guile-strings.c:820
+#: ../intl-scm/guile-strings.c:824 ../intl-scm/guile-strings.c:828
+#: ../intl-scm/guile-strings.c:832 ../intl-scm/guile-strings.c:836
+#: ../intl-scm/guile-strings.c:938 ../intl-scm/guile-strings.c:944
+#: ../intl-scm/guile-strings.c:950 ../intl-scm/guile-strings.c:956
+#: ../intl-scm/guile-strings.c:962 ../intl-scm/guile-strings.c:968
+#: ../intl-scm/guile-strings.c:974 ../intl-scm/guile-strings.c:980
+#: ../intl-scm/guile-strings.c:1020 ../intl-scm/guile-strings.c:1024
+#: ../intl-scm/guile-strings.c:1028 ../intl-scm/guile-strings.c:1032
+#: ../intl-scm/guile-strings.c:1036 ../intl-scm/guile-strings.c:1040
+#: ../intl-scm/guile-strings.c:1044 ../intl-scm/guile-strings.c:1048
+#: ../intl-scm/guile-strings.c:3856 ../intl-scm/guile-strings.c:3860
+#: ../intl-scm/guile-strings.c:3864 ../intl-scm/guile-strings.c:3868
+#: ../intl-scm/guile-strings.c:3872 ../intl-scm/guile-strings.c:5006
+#: ../intl-scm/guile-strings.c:5010 ../intl-scm/guile-strings.c:5014
+#: ../intl-scm/guile-strings.c:5018 ../intl-scm/guile-strings.c:5022
msgid "Colors"
msgstr "Farben"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:256 ../intl-scm/guile-strings.c:338
-#: ../intl-scm/guile-strings.c:468 ../intl-scm/guile-strings.c:550
-#: ../intl-scm/guile-strings.c:620 ../intl-scm/guile-strings.c:1018
+#: ../intl-scm/guile-strings.c:304 ../intl-scm/guile-strings.c:386
+#: ../intl-scm/guile-strings.c:516 ../intl-scm/guile-strings.c:598
+#: ../intl-scm/guile-strings.c:728 ../intl-scm/guile-strings.c:810
+#: ../intl-scm/guile-strings.c:940 ../intl-scm/guile-strings.c:1022
+#: ../intl-scm/guile-strings.c:1092 ../intl-scm/guile-strings.c:1132
+#: ../intl-scm/guile-strings.c:1562 ../intl-scm/guile-strings.c:1730
msgid "Background Color"
msgstr "Hintergrund Farbe"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:258 ../intl-scm/guile-strings.c:470
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:306 ../intl-scm/guile-strings.c:518
+#: ../intl-scm/guile-strings.c:730 ../intl-scm/guile-strings.c:942
msgid "General background color for report."
msgstr "Standard Hintergrundfarbe für Bericht."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:262 ../intl-scm/guile-strings.c:342
-#: ../intl-scm/guile-strings.c:474 ../intl-scm/guile-strings.c:554
-#: ../intl-scm/guile-strings.c:1024
+#: ../intl-scm/guile-strings.c:310 ../intl-scm/guile-strings.c:390
+#: ../intl-scm/guile-strings.c:522 ../intl-scm/guile-strings.c:602
+#: ../intl-scm/guile-strings.c:734 ../intl-scm/guile-strings.c:814
+#: ../intl-scm/guile-strings.c:946 ../intl-scm/guile-strings.c:1026
+#: ../intl-scm/guile-strings.c:1568 ../intl-scm/guile-strings.c:1736
msgid "Text Color"
msgstr "Textfarbe"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:264 ../intl-scm/guile-strings.c:476
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:312 ../intl-scm/guile-strings.c:524
+#: ../intl-scm/guile-strings.c:736 ../intl-scm/guile-strings.c:948
msgid "Normal body text color."
msgstr "Normale Textfarbe"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:268 ../intl-scm/guile-strings.c:346
-#: ../intl-scm/guile-strings.c:480 ../intl-scm/guile-strings.c:558
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:316 ../intl-scm/guile-strings.c:394
+#: ../intl-scm/guile-strings.c:528 ../intl-scm/guile-strings.c:606
+#: ../intl-scm/guile-strings.c:740 ../intl-scm/guile-strings.c:818
+#: ../intl-scm/guile-strings.c:952 ../intl-scm/guile-strings.c:1030
msgid "Link Color"
msgstr "Link-Farbe"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:270 ../intl-scm/guile-strings.c:482
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:318 ../intl-scm/guile-strings.c:530
+#: ../intl-scm/guile-strings.c:742 ../intl-scm/guile-strings.c:954
msgid "Link text color."
msgstr "Link-Textfarbe"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:274 ../intl-scm/guile-strings.c:350
-#: ../intl-scm/guile-strings.c:486 ../intl-scm/guile-strings.c:562
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:322 ../intl-scm/guile-strings.c:398
+#: ../intl-scm/guile-strings.c:534 ../intl-scm/guile-strings.c:610
+#: ../intl-scm/guile-strings.c:746 ../intl-scm/guile-strings.c:822
+#: ../intl-scm/guile-strings.c:958 ../intl-scm/guile-strings.c:1034
msgid "Table Cell Color"
msgstr "Farbe für Tabellenzelle"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:276 ../intl-scm/guile-strings.c:488
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:324 ../intl-scm/guile-strings.c:536
+#: ../intl-scm/guile-strings.c:748 ../intl-scm/guile-strings.c:960
msgid "Default background for table cells."
msgstr "Standard Hintergrundfarbe für Tabellenzellen."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:280 ../intl-scm/guile-strings.c:354
-#: ../intl-scm/guile-strings.c:492 ../intl-scm/guile-strings.c:566
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:328 ../intl-scm/guile-strings.c:402
+#: ../intl-scm/guile-strings.c:540 ../intl-scm/guile-strings.c:614
+#: ../intl-scm/guile-strings.c:752 ../intl-scm/guile-strings.c:826
+#: ../intl-scm/guile-strings.c:964 ../intl-scm/guile-strings.c:1038
msgid "Alternate Table Cell Color"
msgstr "Zweite Farbe für Tabellenzelle"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:282 ../intl-scm/guile-strings.c:494
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:330 ../intl-scm/guile-strings.c:542
+#: ../intl-scm/guile-strings.c:754 ../intl-scm/guile-strings.c:966
msgid "Default alternate background for table cells."
msgstr "Standard Hintergrundfarbe für Tabellenzellen."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:286 ../intl-scm/guile-strings.c:358
-#: ../intl-scm/guile-strings.c:498 ../intl-scm/guile-strings.c:570
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:334 ../intl-scm/guile-strings.c:406
+#: ../intl-scm/guile-strings.c:546 ../intl-scm/guile-strings.c:618
+#: ../intl-scm/guile-strings.c:758 ../intl-scm/guile-strings.c:830
+#: ../intl-scm/guile-strings.c:970 ../intl-scm/guile-strings.c:1042
msgid "Subheading/Subtotal Cell Color"
msgstr "Farbe für Zwischenüberschrift/-summe"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:288 ../intl-scm/guile-strings.c:500
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:336 ../intl-scm/guile-strings.c:548
+#: ../intl-scm/guile-strings.c:760 ../intl-scm/guile-strings.c:972
msgid "Default color for subtotal rows."
msgstr "Standard Hintergrundfarbe für Zwischensummen."
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:292 ../intl-scm/guile-strings.c:362
-#: ../intl-scm/guile-strings.c:504 ../intl-scm/guile-strings.c:574
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:340 ../intl-scm/guile-strings.c:410
+#: ../intl-scm/guile-strings.c:552 ../intl-scm/guile-strings.c:622
+#: ../intl-scm/guile-strings.c:764 ../intl-scm/guile-strings.c:834
+#: ../intl-scm/guile-strings.c:976 ../intl-scm/guile-strings.c:1046
msgid "Sub-subheading/total Cell Color"
msgstr "Farbe für Zwischen-Zwischenüberschriften/-summen"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:294 ../intl-scm/guile-strings.c:506
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:342 ../intl-scm/guile-strings.c:554
+#: ../intl-scm/guile-strings.c:766 ../intl-scm/guile-strings.c:978
msgid "Color for subsubtotals"
msgstr "Farbe für Zwischen-Zwischensummen"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:298 ../intl-scm/guile-strings.c:366
-#: ../intl-scm/guile-strings.c:510 ../intl-scm/guile-strings.c:578
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:346 ../intl-scm/guile-strings.c:414
+#: ../intl-scm/guile-strings.c:558 ../intl-scm/guile-strings.c:626
+#: ../intl-scm/guile-strings.c:770 ../intl-scm/guile-strings.c:838
+#: ../intl-scm/guile-strings.c:982 ../intl-scm/guile-strings.c:1050
msgid "Grand Total Cell Color"
msgstr "Farbe für Gesamtsumme"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:300 ../intl-scm/guile-strings.c:512
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:348 ../intl-scm/guile-strings.c:560
+#: ../intl-scm/guile-strings.c:772 ../intl-scm/guile-strings.c:984
msgid "Color for grand totals"
msgstr "Farbe für Gesamtsummen"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:302 ../intl-scm/guile-strings.c:308
-#: ../intl-scm/guile-strings.c:314 ../intl-scm/guile-strings.c:384
-#: ../intl-scm/guile-strings.c:388 ../intl-scm/guile-strings.c:392
-#: ../intl-scm/guile-strings.c:514 ../intl-scm/guile-strings.c:520
-#: ../intl-scm/guile-strings.c:526 ../intl-scm/guile-strings.c:596
-#: ../intl-scm/guile-strings.c:600 ../intl-scm/guile-strings.c:604
-#: ../intl-scm/guile-strings.c:636 ../intl-scm/guile-strings.c:642
-#: ../intl-scm/guile-strings.c:648
+#: ../intl-scm/guile-strings.c:350 ../intl-scm/guile-strings.c:356
+#: ../intl-scm/guile-strings.c:362 ../intl-scm/guile-strings.c:432
+#: ../intl-scm/guile-strings.c:436 ../intl-scm/guile-strings.c:440
+#: ../intl-scm/guile-strings.c:562 ../intl-scm/guile-strings.c:568
+#: ../intl-scm/guile-strings.c:574 ../intl-scm/guile-strings.c:644
+#: ../intl-scm/guile-strings.c:648 ../intl-scm/guile-strings.c:652
+#: ../intl-scm/guile-strings.c:774 ../intl-scm/guile-strings.c:780
+#: ../intl-scm/guile-strings.c:786 ../intl-scm/guile-strings.c:856
+#: ../intl-scm/guile-strings.c:860 ../intl-scm/guile-strings.c:864
+#: ../intl-scm/guile-strings.c:986 ../intl-scm/guile-strings.c:992
+#: ../intl-scm/guile-strings.c:998 ../intl-scm/guile-strings.c:1068
+#: ../intl-scm/guile-strings.c:1072 ../intl-scm/guile-strings.c:1076
+#: ../intl-scm/guile-strings.c:1108 ../intl-scm/guile-strings.c:1114
+#: ../intl-scm/guile-strings.c:1120 ../intl-scm/guile-strings.c:1148
+#: ../intl-scm/guile-strings.c:1154 ../intl-scm/guile-strings.c:1160
msgid "Tables"
msgstr "Tabellen"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:304 ../intl-scm/guile-strings.c:386
-#: ../intl-scm/guile-strings.c:516 ../intl-scm/guile-strings.c:598
-#: ../intl-scm/guile-strings.c:638
+#: ../intl-scm/guile-strings.c:352 ../intl-scm/guile-strings.c:434
+#: ../intl-scm/guile-strings.c:564 ../intl-scm/guile-strings.c:646
+#: ../intl-scm/guile-strings.c:776 ../intl-scm/guile-strings.c:858
+#: ../intl-scm/guile-strings.c:988 ../intl-scm/guile-strings.c:1070
+#: ../intl-scm/guile-strings.c:1110 ../intl-scm/guile-strings.c:1150
msgid "Table cell spacing"
msgstr "Zellen-Abstand"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:306 ../intl-scm/guile-strings.c:312
-#: ../intl-scm/guile-strings.c:518 ../intl-scm/guile-strings.c:524
-#: ../intl-scm/guile-strings.c:640 ../intl-scm/guile-strings.c:646
+#: ../intl-scm/guile-strings.c:354 ../intl-scm/guile-strings.c:360
+#: ../intl-scm/guile-strings.c:566 ../intl-scm/guile-strings.c:572
+#: ../intl-scm/guile-strings.c:778 ../intl-scm/guile-strings.c:784
+#: ../intl-scm/guile-strings.c:990 ../intl-scm/guile-strings.c:996
+#: ../intl-scm/guile-strings.c:1112 ../intl-scm/guile-strings.c:1118
+#: ../intl-scm/guile-strings.c:1152 ../intl-scm/guile-strings.c:1158
msgid "Space between table cells"
msgstr "Abstand zwischen Zellen einer Tabelle"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:310 ../intl-scm/guile-strings.c:390
-#: ../intl-scm/guile-strings.c:522 ../intl-scm/guile-strings.c:602
-#: ../intl-scm/guile-strings.c:644
+#: ../intl-scm/guile-strings.c:358 ../intl-scm/guile-strings.c:438
+#: ../intl-scm/guile-strings.c:570 ../intl-scm/guile-strings.c:650
+#: ../intl-scm/guile-strings.c:782 ../intl-scm/guile-strings.c:862
+#: ../intl-scm/guile-strings.c:994 ../intl-scm/guile-strings.c:1074
+#: ../intl-scm/guile-strings.c:1116 ../intl-scm/guile-strings.c:1156
msgid "Table cell padding"
msgstr "Zellen-Füllung"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:316 ../intl-scm/guile-strings.c:394
-#: ../intl-scm/guile-strings.c:528 ../intl-scm/guile-strings.c:606
-#: ../intl-scm/guile-strings.c:650
+#: ../intl-scm/guile-strings.c:364 ../intl-scm/guile-strings.c:442
+#: ../intl-scm/guile-strings.c:576 ../intl-scm/guile-strings.c:654
+#: ../intl-scm/guile-strings.c:788 ../intl-scm/guile-strings.c:866
+#: ../intl-scm/guile-strings.c:1000 ../intl-scm/guile-strings.c:1078
+#: ../intl-scm/guile-strings.c:1122 ../intl-scm/guile-strings.c:1162
msgid "Table border width"
msgstr "Tabellen-Randbreite"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:318 ../intl-scm/guile-strings.c:530
-#: ../intl-scm/guile-strings.c:652
+#: ../intl-scm/guile-strings.c:366 ../intl-scm/guile-strings.c:578
+#: ../intl-scm/guile-strings.c:790 ../intl-scm/guile-strings.c:1002
+#: ../intl-scm/guile-strings.c:1124 ../intl-scm/guile-strings.c:1164
msgid "Bevel depth on tables"
msgstr "Breite der Tabellenkanten"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:396 ../intl-scm/guile-strings.c:608
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:444 ../intl-scm/guile-strings.c:656
+#: ../intl-scm/guile-strings.c:868 ../intl-scm/guile-strings.c:1080
msgid "Prepared by: "
msgstr "Erstellt von:"
#. src/report/stylesheets/stylesheet-fancy.scm
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:398 ../intl-scm/guile-strings.c:610
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:446 ../intl-scm/guile-strings.c:658
+#: ../intl-scm/guile-strings.c:870 ../intl-scm/guile-strings.c:1082
msgid "Prepared for: "
msgstr "Erstellt für:"
#. src/report/stylesheets/stylesheet-fancy.scm
-#: ../intl-scm/guile-strings.c:402
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#: ../intl-scm/guile-strings.c:450 ../intl-scm/guile-strings.c:874
msgid "Fancy"
msgstr "Elegant"
#. src/report/stylesheets/stylesheet-fancy.scm
-#: ../intl-scm/guile-strings.c:404
+#. src/report/stylesheets/gnucash/report/stylesheet-fancy.scm
+#: ../intl-scm/guile-strings.c:452 ../intl-scm/guile-strings.c:876
msgid "Technicolor"
msgstr "Bunt"
#. src/report/stylesheets/stylesheet-easy.scm
-#: ../intl-scm/guile-strings.c:614 ../intl-scm/guile-strings.c:616
+#. src/report/stylesheets/gnucash/report/stylesheet-easy.scm
+#: ../intl-scm/guile-strings.c:662 ../intl-scm/guile-strings.c:664
+#: ../intl-scm/guile-strings.c:1086 ../intl-scm/guile-strings.c:1088
msgid "Easy"
msgstr "Einfach"
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:622
+#: ../intl-scm/guile-strings.c:1094 ../intl-scm/guile-strings.c:1134
msgid "Background color for reports."
msgstr "Hintergrundfarbe für Berichte."
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:626
+#: ../intl-scm/guile-strings.c:1098 ../intl-scm/guile-strings.c:1138
msgid "Background Pixmap"
msgstr "Hintergrundbild"
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:634
+#: ../intl-scm/guile-strings.c:1106 ../intl-scm/guile-strings.c:1146
msgid "Enable hyperlinks in reports."
msgstr "Hyperlinks in Berichten aktivieren."
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
-#: ../intl-scm/guile-strings.c:654
+#: ../intl-scm/guile-strings.c:1126 ../intl-scm/guile-strings.c:1166
msgid "Plain"
msgstr "Einfach"
+#. src/report/stylesheets/gnucash/report/stylesheet-plain.scm
#. src/report/stylesheets/stylesheet-plain.scm
#. src/report/report-system/report.scm
#. src/report/report-system/html-style-sheet.scm
-#: ../intl-scm/guile-strings.c:656 ../intl-scm/guile-strings.c:834
-#: ../intl-scm/guile-strings.c:916
+#: ../intl-scm/guile-strings.c:1128 ../intl-scm/guile-strings.c:1168
+#: ../intl-scm/guile-strings.c:1348 ../intl-scm/guile-strings.c:1428
msgid "Default"
msgstr "Voreinstellung"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:658
+#: ../intl-scm/guile-strings.c:1170
msgid "Select a date to report on"
msgstr "Datum des Berichts"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:660
+#: ../intl-scm/guile-strings.c:1172
msgid "Start of reporting period"
msgstr "Start der Berichtsperiode"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:662
+#: ../intl-scm/guile-strings.c:1174
msgid "End of reporting period"
msgstr "Ende der Berichtsperiode"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:664
+#: ../intl-scm/guile-strings.c:1176
msgid "The amount of time between data points"
msgstr "Die Zeitspanne zwischen den Datenpunkten"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:670 ../intl-scm/guile-strings.c:672
+#: ../intl-scm/guile-strings.c:1182 ../intl-scm/guile-strings.c:1184
msgid "Week"
msgstr "Woche"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:674
+#: ../intl-scm/guile-strings.c:1186
msgid "2Week"
msgstr "2 Wochen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:676
+#: ../intl-scm/guile-strings.c:1188
msgid "Two Weeks"
msgstr "Zwei Wochen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:682 ../intl-scm/guile-strings.c:684
+#: ../intl-scm/guile-strings.c:1194 ../intl-scm/guile-strings.c:1196
msgid "Quarter"
msgstr "Quartal"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:686 ../intl-scm/guile-strings.c:688
+#: ../intl-scm/guile-strings.c:1198 ../intl-scm/guile-strings.c:1200
msgid "Half Year"
msgstr "Halbjahr"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:690 ../intl-scm/guile-strings.c:692
+#: ../intl-scm/guile-strings.c:1202 ../intl-scm/guile-strings.c:1204
msgid "Year"
msgstr "Jahr"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:694
+#: ../intl-scm/guile-strings.c:1206
msgid "All"
msgstr "Alle"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:696
+#: ../intl-scm/guile-strings.c:1208
msgid "All accounts"
msgstr "Alle Konten"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:698
+#: ../intl-scm/guile-strings.c:1210
msgid "Top-level"
msgstr "Jeweils neues Fenster"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:700
+#: ../intl-scm/guile-strings.c:1212
msgid "Second-level"
msgstr "Zweite Ebene"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:702
+#: ../intl-scm/guile-strings.c:1214
msgid "Third-level"
msgstr "Dritte Ebene"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:704 ../intl-scm/guile-strings.c:706
+#: ../intl-scm/guile-strings.c:1216 ../intl-scm/guile-strings.c:1218
msgid "Fourth-level"
msgstr "Vierte Ebene"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:708
+#: ../intl-scm/guile-strings.c:1220
msgid "Sixth-level"
msgstr "Sechste Ebene"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:710
+#: ../intl-scm/guile-strings.c:1222
msgid "Show accounts to this depth, overriding any other option."
msgstr ""
"Konten nur bis zu dieser Verschachtelungstiefe anzeigen (überstimmt alle "
"anderen Optionen)."
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:712
+#: ../intl-scm/guile-strings.c:1224
msgid ""
"Override account-selection and show sub-accounts of all selected accounts?"
msgstr ""
@@ -15775,183 +16457,205 @@
#. src/report/report-system/options-utilities.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:714 ../intl-scm/guile-strings.c:1548
-#: ../intl-scm/guile-strings.c:1762 ../intl-scm/guile-strings.c:1866
+#: ../intl-scm/guile-strings.c:1226 ../intl-scm/guile-strings.c:2258
+#: ../intl-scm/guile-strings.c:2882 ../intl-scm/guile-strings.c:3096
+#: ../intl-scm/guile-strings.c:3200 ../intl-scm/guile-strings.c:4246
+#: ../intl-scm/guile-strings.c:4350
msgid "Report on these accounts, if display depth allows."
msgstr ""
"Bericht für diese Konten erstellen, solange die Verschachtelungstiefe "
"eingehalten wird."
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:716
+#: ../intl-scm/guile-strings.c:1228
msgid "Include sub-account balances in printed balance?"
msgstr "Unterkonten zum angezeigten Kontostand addieren?"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:718
+#: ../intl-scm/guile-strings.c:1230
msgid "Group the accounts in main categories?"
msgstr "Konten in Kategorien gruppieren?"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:720
+#: ../intl-scm/guile-strings.c:1232
msgid "Select the currency to display the values of this report in."
msgstr ""
"Wählen Sie die Währung, in der die Beträge in diesem Bericht angezeigt "
"werden."
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:722
+#: ../intl-scm/guile-strings.c:1234
msgid "Display the account's foreign currency amount?"
msgstr "Kontostände zusätzlich in Fremdwährung anzeigen?"
#. src/report/report-system/options-utilities.scm
#. src/report/standard-reports/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:724 ../intl-scm/guile-strings.c:1150
-#: ../intl-scm/guile-strings.c:1980
+#: ../intl-scm/guile-strings.c:1236 ../intl-scm/guile-strings.c:1862
+#: ../intl-scm/guile-strings.c:2486 ../intl-scm/guile-strings.c:3314
+#: ../intl-scm/guile-strings.c:4464
msgid "The source of price information"
msgstr "Quelle der Preisinformationen"
#. src/report/report-system/options-utilities.scm
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:726 ../intl-scm/guile-strings.c:1152
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1238 ../intl-scm/guile-strings.c:1864
+#: ../intl-scm/guile-strings.c:2488
msgid "Weighted Average"
msgstr "Gewichteter Durchschnitt"
#. src/report/report-system/options-utilities.scm
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:728 ../intl-scm/guile-strings.c:1154
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1240 ../intl-scm/guile-strings.c:1866
+#: ../intl-scm/guile-strings.c:2490
msgid "The weighted average of all currency transactions of the past"
msgstr ""
"Der gewichtete Durchschnitt aller bisherigen Währungsbuchungen der "
"Vergangenheit"
#. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:730 ../intl-scm/guile-strings.c:1982
+#: ../intl-scm/guile-strings.c:1242 ../intl-scm/guile-strings.c:3316
+#: ../intl-scm/guile-strings.c:4466
msgid "Most recent"
msgstr "Neuester"
#. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:732 ../intl-scm/guile-strings.c:1984
+#: ../intl-scm/guile-strings.c:1244 ../intl-scm/guile-strings.c:3318
+#: ../intl-scm/guile-strings.c:4468
msgid "The most recent recorded price"
msgstr "Der neueste aufgezeichnete Preis"
#. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:734 ../intl-scm/guile-strings.c:1986
+#: ../intl-scm/guile-strings.c:1246 ../intl-scm/guile-strings.c:3320
+#: ../intl-scm/guile-strings.c:4470
msgid "Nearest in time"
msgstr "Zeitlich nächster"
#. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:736 ../intl-scm/guile-strings.c:1988
+#: ../intl-scm/guile-strings.c:1248 ../intl-scm/guile-strings.c:3322
+#: ../intl-scm/guile-strings.c:4472
msgid "The price recorded nearest in time to the report date"
msgstr "Der Preis, der dem Berichtsdatum am nächsten kommt"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:738
+#: ../intl-scm/guile-strings.c:1250
msgid "Width of plot in pixels."
msgstr "Breite der Grafik in Pixeln."
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:740
+#: ../intl-scm/guile-strings.c:1252
msgid "Height of plot in pixels."
msgstr "Höhe der Grafik in Pixeln."
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:742
+#: ../intl-scm/guile-strings.c:1254
msgid "Choose the marker for each data point."
msgstr "Wählen Sie die Markierung für jeden Datenpunkt"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:744 ../intl-scm/guile-strings.c:746
+#: ../intl-scm/guile-strings.c:1256 ../intl-scm/guile-strings.c:1258
msgid "Circle"
msgstr "Kreis"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:748 ../intl-scm/guile-strings.c:750
+#: ../intl-scm/guile-strings.c:1260 ../intl-scm/guile-strings.c:1262
msgid "Cross"
msgstr "Kreuz"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:752 ../intl-scm/guile-strings.c:754
+#: ../intl-scm/guile-strings.c:1264 ../intl-scm/guile-strings.c:1266
msgid "Square"
msgstr "Quadrat"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:756 ../intl-scm/guile-strings.c:758
+#: ../intl-scm/guile-strings.c:1268 ../intl-scm/guile-strings.c:1270
msgid "Asterisk"
msgstr "Stern"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:760
+#: ../intl-scm/guile-strings.c:1272
msgid "Filled circle"
msgstr "Ausgefüllter Kreis"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:762
+#: ../intl-scm/guile-strings.c:1274
msgid "Circle filled with color"
msgstr "Ausgefüllter Kreis"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:764
+#: ../intl-scm/guile-strings.c:1276
msgid "Filled square"
msgstr "Ausgefülltes Rechteck"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:766
+#: ../intl-scm/guile-strings.c:1278
msgid "Square filled with color"
msgstr "Ausgefülltes Rechteck"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:768
+#: ../intl-scm/guile-strings.c:1280
msgid "Choose the method for sorting accounts."
msgstr "Wählen Sie eine Sortierreihenfolge für die Konten."
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:772
+#: ../intl-scm/guile-strings.c:1284
msgid "Alphabetical by account code"
msgstr "Nach Kontocode alphabetisch sortieren"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:774
+#: ../intl-scm/guile-strings.c:1286
msgid "Alphabetical"
msgstr "Alphabetisch"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:776
+#: ../intl-scm/guile-strings.c:1288
msgid "Alphabetical by account name"
msgstr "Nach Kontonamen alphabetisch sortieren"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:780
+#: ../intl-scm/guile-strings.c:1292
msgid "By amount, largest to smallest"
msgstr "Nach Betrag sortieren, vom größten zum kleinsten"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:782
+#: ../intl-scm/guile-strings.c:1294
msgid "How to show the balances of parent accounts"
msgstr "Anzeige der Salden von Hauptkonten"
#. src/report/report-system/options-utilities.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:784 ../intl-scm/guile-strings.c:1896
+#: ../intl-scm/guile-strings.c:1296 ../intl-scm/guile-strings.c:3230
+#: ../intl-scm/guile-strings.c:4380
msgid "Account Balance"
msgstr "Kontosaldo"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:786
+#: ../intl-scm/guile-strings.c:1298
msgid "Show only the balance in the parent account, excluding any subaccounts"
msgstr ""
"Nur unmittelbare Saldo von Hauptkonten anzeigen und dabei Unterkonten "
"ignorieren"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:790
+#: ../intl-scm/guile-strings.c:1302
msgid ""
"Calculate the subtotal for this parent account and all of its subaccounts, "
"and show this as the parent account balance"
@@ -15960,42 +16664,42 @@
"und als Hauptkonto-Saldo anzeigen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:792 ../intl-scm/guile-strings.c:802
+#: ../intl-scm/guile-strings.c:1304 ../intl-scm/guile-strings.c:1314
msgid "Do not show"
msgstr "Nicht anzeigen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:794
+#: ../intl-scm/guile-strings.c:1306
msgid "Do not show any balances of parent accounts"
msgstr "Salden von Hauptkonten nicht anzeigen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:796
+#: ../intl-scm/guile-strings.c:1308
msgid "How to show account subtotals for parent accounts"
msgstr "Anzeige der Zwischensummen für Hauptkonten mit Unterkonten"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:798
+#: ../intl-scm/guile-strings.c:1310
msgid "Show subtotals"
msgstr "Zwischensummen anzeigen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:800
+#: ../intl-scm/guile-strings.c:1312
msgid "Show subtotals for selected parent accounts which have subaccounts"
msgstr "Zwischensummen für Hauptkonten anzeigen, die Unterkonten haben"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:804
+#: ../intl-scm/guile-strings.c:1316
msgid "Do not show any subtotals for parent accounts"
msgstr "Keine Zwischensummen von Hauptkonten anzeigen"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:806
+#: ../intl-scm/guile-strings.c:1318
msgid "Text book style (experimental)"
msgstr "Rechnungswesen-Stil (experimentell)"
#. src/report/report-system/options-utilities.scm
-#: ../intl-scm/guile-strings.c:808
+#: ../intl-scm/guile-strings.c:1320
msgid ""
"Show parent account subtotals, indented per accounting text book practice "
"(experimental)"
@@ -16004,234 +16708,301 @@
"Stil (experimentell)"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:810
+#: ../intl-scm/guile-strings.c:1322
msgid "_Assets & Liabilities"
msgstr "_Aktiva & Passiva"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:812
+#: ../intl-scm/guile-strings.c:1324
msgid "_Income & Expense"
msgstr "_Erträge & Aufwendungen"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:814
+#: ../intl-scm/guile-strings.c:1326
msgid "_Taxes"
msgstr "_Steuern"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:816
+#: ../intl-scm/guile-strings.c:1328
msgid "_Sample & Custom"
msgstr "Bei_spiel & Benutzerdefiniert"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:818
+#: ../intl-scm/guile-strings.c:1330
msgid "_Custom"
msgstr "Benutzer_definiert"
#. src/report/report-system/report.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:824 ../intl-scm/guile-strings.c:2172
-#: ../intl-scm/guile-strings.c:2176 ../intl-scm/guile-strings.c:2180
-#: ../intl-scm/guile-strings.c:2184 ../intl-scm/guile-strings.c:2188
-#: ../intl-scm/guile-strings.c:2192 ../intl-scm/guile-strings.c:2196
-#: ../intl-scm/guile-strings.c:2200 ../intl-scm/guile-strings.c:2204
-#: ../intl-scm/guile-strings.c:2208 ../intl-scm/guile-strings.c:2212
-#: ../intl-scm/guile-strings.c:2216 ../intl-scm/guile-strings.c:2220
-#: ../intl-scm/guile-strings.c:2224 ../intl-scm/guile-strings.c:2228
-#: ../intl-scm/guile-strings.c:2542 ../intl-scm/guile-strings.c:2584
-#: ../intl-scm/guile-strings.c:2590 ../intl-scm/guile-strings.c:2596
-#: ../intl-scm/guile-strings.c:2602 ../intl-scm/guile-strings.c:2608
-#: ../intl-scm/guile-strings.c:2614 ../intl-scm/guile-strings.c:2620
-#: ../intl-scm/guile-strings.c:2634 ../intl-scm/guile-strings.c:2640
-#: ../intl-scm/guile-strings.c:3264 ../intl-scm/guile-strings.c:3270
-#: ../intl-scm/guile-strings.c:3276 ../intl-scm/guile-strings.c:3282
-#: ../intl-scm/guile-strings.c:3288 ../intl-scm/guile-strings.c:3294
-#: ../intl-scm/guile-strings.c:3300 ../intl-scm/guile-strings.c:3306
-#: ../intl-scm/guile-strings.c:3312 ../intl-scm/guile-strings.c:3318
-#: ../intl-scm/guile-strings.c:3324 ../intl-scm/guile-strings.c:3332
-#: ../intl-scm/guile-strings.c:3338 ../intl-scm/guile-strings.c:3582
-#: ../intl-scm/guile-strings.c:3588 ../intl-scm/guile-strings.c:3594
-#: ../intl-scm/guile-strings.c:3600 ../intl-scm/guile-strings.c:3606
-#: ../intl-scm/guile-strings.c:3612 ../intl-scm/guile-strings.c:3618
-#: ../intl-scm/guile-strings.c:3624 ../intl-scm/guile-strings.c:3630
-#: ../intl-scm/guile-strings.c:3636 ../intl-scm/guile-strings.c:3642
-#: ../intl-scm/guile-strings.c:3648 ../intl-scm/guile-strings.c:3840
-#: ../intl-scm/guile-strings.c:3846 ../intl-scm/guile-strings.c:3852
-#: ../intl-scm/guile-strings.c:3858 ../intl-scm/guile-strings.c:3864
-#: ../intl-scm/guile-strings.c:3870 ../intl-scm/guile-strings.c:3876
-#: ../intl-scm/guile-strings.c:3882 ../intl-scm/guile-strings.c:3890
+#: ../intl-scm/guile-strings.c:1336 ../intl-scm/guile-strings.c:3506
+#: ../intl-scm/guile-strings.c:3510 ../intl-scm/guile-strings.c:3514
+#: ../intl-scm/guile-strings.c:3518 ../intl-scm/guile-strings.c:3522
+#: ../intl-scm/guile-strings.c:3526 ../intl-scm/guile-strings.c:3530
+#: ../intl-scm/guile-strings.c:3534 ../intl-scm/guile-strings.c:3538
+#: ../intl-scm/guile-strings.c:3542 ../intl-scm/guile-strings.c:3546
+#: ../intl-scm/guile-strings.c:3550 ../intl-scm/guile-strings.c:3554
+#: ../intl-scm/guile-strings.c:3558 ../intl-scm/guile-strings.c:3562
+#: ../intl-scm/guile-strings.c:3876 ../intl-scm/guile-strings.c:3918
+#: ../intl-scm/guile-strings.c:3924 ../intl-scm/guile-strings.c:3930
+#: ../intl-scm/guile-strings.c:3936 ../intl-scm/guile-strings.c:3942
+#: ../intl-scm/guile-strings.c:3948 ../intl-scm/guile-strings.c:3954
+#: ../intl-scm/guile-strings.c:3968 ../intl-scm/guile-strings.c:3974
+#: ../intl-scm/guile-strings.c:4656 ../intl-scm/guile-strings.c:4660
+#: ../intl-scm/guile-strings.c:4664 ../intl-scm/guile-strings.c:4668
+#: ../intl-scm/guile-strings.c:4672 ../intl-scm/guile-strings.c:4676
+#: ../intl-scm/guile-strings.c:4680 ../intl-scm/guile-strings.c:4684
+#: ../intl-scm/guile-strings.c:4688 ../intl-scm/guile-strings.c:4692
+#: ../intl-scm/guile-strings.c:4696 ../intl-scm/guile-strings.c:4700
+#: ../intl-scm/guile-strings.c:4704 ../intl-scm/guile-strings.c:4708
+#: ../intl-scm/guile-strings.c:4712 ../intl-scm/guile-strings.c:5026
+#: ../intl-scm/guile-strings.c:5068 ../intl-scm/guile-strings.c:5074
+#: ../intl-scm/guile-strings.c:5080 ../intl-scm/guile-strings.c:5086
+#: ../intl-scm/guile-strings.c:5092 ../intl-scm/guile-strings.c:5098
+#: ../intl-scm/guile-strings.c:5104 ../intl-scm/guile-strings.c:5118
+#: ../intl-scm/guile-strings.c:5124 ../intl-scm/guile-strings.c:5990
+#: ../intl-scm/guile-strings.c:5996 ../intl-scm/guile-strings.c:6002
+#: ../intl-scm/guile-strings.c:6008 ../intl-scm/guile-strings.c:6014
+#: ../intl-scm/guile-strings.c:6020 ../intl-scm/guile-strings.c:6026
+#: ../intl-scm/guile-strings.c:6032 ../intl-scm/guile-strings.c:6038
+#: ../intl-scm/guile-strings.c:6044 ../intl-scm/guile-strings.c:6050
+#: ../intl-scm/guile-strings.c:6058 ../intl-scm/guile-strings.c:6064
+#: ../intl-scm/guile-strings.c:6308 ../intl-scm/guile-strings.c:6314
+#: ../intl-scm/guile-strings.c:6320 ../intl-scm/guile-strings.c:6326
+#: ../intl-scm/guile-strings.c:6332 ../intl-scm/guile-strings.c:6338
+#: ../intl-scm/guile-strings.c:6344 ../intl-scm/guile-strings.c:6350
+#: ../intl-scm/guile-strings.c:6356 ../intl-scm/guile-strings.c:6362
+#: ../intl-scm/guile-strings.c:6368 ../intl-scm/guile-strings.c:6374
+#: ../intl-scm/guile-strings.c:6514 ../intl-scm/guile-strings.c:6520
+#: ../intl-scm/guile-strings.c:6526 ../intl-scm/guile-strings.c:6532
+#: ../intl-scm/guile-strings.c:6538 ../intl-scm/guile-strings.c:6544
+#: ../intl-scm/guile-strings.c:6550 ../intl-scm/guile-strings.c:6556
+#: ../intl-scm/guile-strings.c:6562 ../intl-scm/guile-strings.c:6568
+#: ../intl-scm/guile-strings.c:6574 ../intl-scm/guile-strings.c:6582
+#: ../intl-scm/guile-strings.c:6588 ../intl-scm/guile-strings.c:6832
+#: ../intl-scm/guile-strings.c:6838 ../intl-scm/guile-strings.c:6844
+#: ../intl-scm/guile-strings.c:6850 ../intl-scm/guile-strings.c:6856
+#: ../intl-scm/guile-strings.c:6862 ../intl-scm/guile-strings.c:6868
+#: ../intl-scm/guile-strings.c:6874 ../intl-scm/guile-strings.c:6880
+#: ../intl-scm/guile-strings.c:6886 ../intl-scm/guile-strings.c:6892
+#: ../intl-scm/guile-strings.c:6898 ../intl-scm/guile-strings.c:7092
+#: ../intl-scm/guile-strings.c:7098 ../intl-scm/guile-strings.c:7104
+#: ../intl-scm/guile-strings.c:7110 ../intl-scm/guile-strings.c:7116
+#: ../intl-scm/guile-strings.c:7122 ../intl-scm/guile-strings.c:7128
+#: ../intl-scm/guile-strings.c:7134 ../intl-scm/guile-strings.c:7142
+#: ../intl-scm/guile-strings.c:7332 ../intl-scm/guile-strings.c:7338
+#: ../intl-scm/guile-strings.c:7344 ../intl-scm/guile-strings.c:7350
+#: ../intl-scm/guile-strings.c:7356 ../intl-scm/guile-strings.c:7362
+#: ../intl-scm/guile-strings.c:7368 ../intl-scm/guile-strings.c:7374
+#: ../intl-scm/guile-strings.c:7382
msgid "Display"
msgstr "Anzeige"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:826
+#: ../intl-scm/guile-strings.c:1338
msgid "Report name"
msgstr "Berichtsname"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:828
+#: ../intl-scm/guile-strings.c:1340
+msgid ""
+"A custom report with this name already exists. Either rename the report to "
+"store it with a different name, or edit your saved-reports file and delete "
+"the section with the following name: "
+msgstr ""
+"Ein benutzerdefinierter Bericht mit diesem Namen existiert bereit. Entweder "
+"Sie benennen diesen Bericht um, oder Sie editieren die Datei ~/.gnucash/"
+"saved-reports-2.0 und entfernen den Abschnitt mit folgenden Namen: "
+
+#. src/report/report-system/report.scm
+#: ../intl-scm/guile-strings.c:1342
msgid "Enter a descriptive name for this report"
msgstr "Geben Sie einen beschreibenden Namen für diesen Bericht an"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:830 ../intl-scm/guile-strings.c:838
-#: ../intl-scm/guile-strings.c:840
+#: ../intl-scm/guile-strings.c:1344 ../intl-scm/guile-strings.c:1352
+#: ../intl-scm/guile-strings.c:1354
msgid "Stylesheet"
msgstr "Stilvorlage"
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:832
+#: ../intl-scm/guile-strings.c:1346
msgid "Select a stylesheet for the report."
msgstr "Wählen Sie einen Stil für diesen Bericht."
#. src/report/report-system/report.scm
-#: ../intl-scm/guile-strings.c:836
+#: ../intl-scm/guile-strings.c:1350
msgid " Stylesheet"
msgstr " Stilvorlage"
#. src/report/report-system/html-acct-table.scm
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:842 ../intl-scm/guile-strings.c:1438
-#: ../intl-scm/guile-strings.c:1622 ../intl-scm/guile-strings.c:2114
+#: ../intl-scm/guile-strings.c:1356 ../intl-scm/guile-strings.c:2148
+#: ../intl-scm/guile-strings.c:2332 ../intl-scm/guile-strings.c:2772
+#: ../intl-scm/guile-strings.c:2956 ../intl-scm/guile-strings.c:3448
+#: ../intl-scm/guile-strings.c:4598
msgid "Closing Entries"
msgstr "Abschlussbuchungen"
#. src/report/report-system/html-acct-table.scm
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:844 ../intl-scm/guile-strings.c:1436
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:1358 ../intl-scm/guile-strings.c:2146
+#: ../intl-scm/guile-strings.c:2770
msgid "Adjusting Entries"
msgstr "Anpassungsbuchungen"
#. src/report/report-system/report-utilities.scm
#. src/report/standard-reports/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:854 ../intl-scm/guile-strings.c:1244
-#: ../intl-scm/guile-strings.c:1830 ../intl-scm/guile-strings.c:2844
+#: ../intl-scm/guile-strings.c:1368 ../intl-scm/guile-strings.c:1956
+#: ../intl-scm/guile-strings.c:2580 ../intl-scm/guile-strings.c:3164
+#: ../intl-scm/guile-strings.c:4182 ../intl-scm/guile-strings.c:4314
+#: ../intl-scm/guile-strings.c:5332
msgid "Assets"
msgstr "Aktiva"
#. src/report/report-system/report-utilities.scm
#. src/report/standard-reports/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:856 ../intl-scm/guile-strings.c:1246
-#: ../intl-scm/guile-strings.c:1834 ../intl-scm/guile-strings.c:2846
+#: ../intl-scm/guile-strings.c:1370 ../intl-scm/guile-strings.c:1958
+#: ../intl-scm/guile-strings.c:2582 ../intl-scm/guile-strings.c:3168
+#: ../intl-scm/guile-strings.c:4184 ../intl-scm/guile-strings.c:4318
+#: ../intl-scm/guile-strings.c:5334
msgid "Liabilities"
msgstr "Passiva"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:858
+#: ../intl-scm/guile-strings.c:1372
msgid "Stocks"
msgstr "Aktienkonten"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:860
+#: ../intl-scm/guile-strings.c:1374
msgid "Mutual Funds"
msgstr "Investmentfonds"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:862
+#: ../intl-scm/guile-strings.c:1376
msgid "Currencies"
msgstr "Währungen"
#. src/report/report-system/report-utilities.scm
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:866 ../intl-scm/guile-strings.c:1634
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:1380 ../intl-scm/guile-strings.c:2344
+#: ../intl-scm/guile-strings.c:2968
msgid "Expenses"
msgstr "Aufwendungen"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:868
+#: ../intl-scm/guile-strings.c:1382
msgid "Equities"
msgstr "Eigenkapital"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:870
+#: ../intl-scm/guile-strings.c:1384
msgid "Checking"
msgstr "Girokonto"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:872
+#: ../intl-scm/guile-strings.c:1386
msgid "Savings"
msgstr "Sparkonten"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:874
+#: ../intl-scm/guile-strings.c:1388
msgid "Money Market"
msgstr "Geldmarktfond"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:876
+#: ../intl-scm/guile-strings.c:1390
msgid "Accounts Receivable"
msgstr "Forderungen Konten"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:878
+#: ../intl-scm/guile-strings.c:1392
msgid "Accounts Payable"
msgstr "Verbindlichkeiten Konten"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:880
+#: ../intl-scm/guile-strings.c:1394
msgid "Credit Lines"
msgstr "Kreditrahmen"
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:882
+#: ../intl-scm/guile-strings.c:1396
#, c-format
msgid "Building '%s' report ..."
msgstr "Bericht '%s' berechnen..."
#. src/report/report-system/report-utilities.scm
-#: ../intl-scm/guile-strings.c:884
+#: ../intl-scm/guile-strings.c:1398
#, c-format
msgid "Rendering '%s' report ..."
msgstr "Bericht '%s' erstellen..."
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:888
+#: ../intl-scm/guile-strings.c:1402
msgid "Account name"
msgstr "Kontobezeichnung"
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:892
+#: ../intl-scm/guile-strings.c:1406
msgid "Exchange rate"
msgstr "Wechselkurs"
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:894
+#: ../intl-scm/guile-strings.c:1408
msgid "Exchange rates"
msgstr "Wechselkurse"
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:898
+#: ../intl-scm/guile-strings.c:1410
msgid "This report requires you to specify certain report options."
msgstr "Für diesen Bericht müssen einige Optionen ausgewählt werden."
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:902
+#: ../intl-scm/guile-strings.c:1414
msgid "No accounts selected"
msgstr "Keine Konten ausgewählt"
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:904
+#: ../intl-scm/guile-strings.c:1416
msgid "This report requires accounts to be selected."
msgstr "Für diesen Bericht müssen Konten ausgewählt werden."
#. src/report/report-system/html-utilities.scm
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:908 ../intl-scm/guile-strings.c:1190
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1420 ../intl-scm/guile-strings.c:1902
+#: ../intl-scm/guile-strings.c:2526
msgid "No data"
msgstr "Keine Daten gefunden"
#. src/report/report-system/html-utilities.scm
-#: ../intl-scm/guile-strings.c:910
+#: ../intl-scm/guile-strings.c:1422
msgid ""
"The selected accounts contain no data/transactions (or only zeroes) for the "
"selected time period"
@@ -16240,276 +17011,337 @@
"Nullen) für die gewählte Zeitspanne."
#. src/report/report-system/html-style-sheet.scm
-#: ../intl-scm/guile-strings.c:914
+#: ../intl-scm/guile-strings.c:1426
msgid "Can't save style sheet"
msgstr "Stilvorlage kann nicht gespeichert werden"
#. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:918
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1430 ../intl-scm/guile-strings.c:1440
msgid "This report has no options."
msgstr "Dieser Bericht hat keine Optionen."
#. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:922
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1434 ../intl-scm/guile-strings.c:1444
#, c-format
msgid "Display the %s report"
msgstr "%s-Bericht anzeigen"
#. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:924
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1436 ../intl-scm/guile-strings.c:1446
msgid "Welcome Sample Report"
msgstr "Einführungs-Beispielbericht"
#. src/report/report-gnome/report-gnome.scm
-#: ../intl-scm/guile-strings.c:926
+#. src/report/report-gnome/gnucash/report/report-gnome.scm
+#: ../intl-scm/guile-strings.c:1438 ../intl-scm/guile-strings.c:1448
msgid "Welcome-to-GnuCash report screen"
msgstr "Eine Demonstration verschiedener Berichte als Begrüßung"
#. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:930 ../intl-scm/guile-strings.c:936
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1452 ../intl-scm/guile-strings.c:1458
+#: ../intl-scm/guile-strings.c:1474 ../intl-scm/guile-strings.c:1480
msgid "Number of columns"
msgstr "Anzahl der Spalten"
#. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:932
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1454 ../intl-scm/guile-strings.c:1476
msgid "Number of columns before wrapping to a new row"
msgstr "Anzahl Spalten, bevor eine neue Zeile begonnen wird"
#. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:942
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1464 ../intl-scm/guile-strings.c:1486
msgid "Edit Options"
msgstr "Optionen"
#. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:944
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1466 ../intl-scm/guile-strings.c:1488
msgid "Single Report"
msgstr "Einzelner Bericht"
#. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:946
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1468 ../intl-scm/guile-strings.c:1490
msgid "Multicolumn View"
msgstr "Mehrspaltige Anzeige"
#. src/report/utility-reports/view-column.scm
-#: ../intl-scm/guile-strings.c:948
+#. src/report/utility-reports/gnucash/report/view-column.scm
+#: ../intl-scm/guile-strings.c:1470 ../intl-scm/guile-strings.c:1492
msgid "Custom Multicolumn Report"
msgstr "Benutzerdefiniert Mehrspaltig"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:950 ../intl-scm/guile-strings.c:956
-#: ../intl-scm/guile-strings.c:978 ../intl-scm/guile-strings.c:986
-#: ../intl-scm/guile-strings.c:992 ../intl-scm/guile-strings.c:998
-#: ../intl-scm/guile-strings.c:1004 ../intl-scm/guile-strings.c:1010
-#: ../intl-scm/guile-strings.c:1016 ../intl-scm/guile-strings.c:1022
+#: ../intl-scm/guile-strings.c:1494 ../intl-scm/guile-strings.c:1500
+#: ../intl-scm/guile-strings.c:1522 ../intl-scm/guile-strings.c:1530
+#: ../intl-scm/guile-strings.c:1536 ../intl-scm/guile-strings.c:1542
+#: ../intl-scm/guile-strings.c:1548 ../intl-scm/guile-strings.c:1554
+#: ../intl-scm/guile-strings.c:1560 ../intl-scm/guile-strings.c:1566
+#: ../intl-scm/guile-strings.c:1662 ../intl-scm/guile-strings.c:1668
+#: ../intl-scm/guile-strings.c:1690 ../intl-scm/guile-strings.c:1698
+#: ../intl-scm/guile-strings.c:1704 ../intl-scm/guile-strings.c:1710
+#: ../intl-scm/guile-strings.c:1716 ../intl-scm/guile-strings.c:1722
+#: ../intl-scm/guile-strings.c:1728 ../intl-scm/guile-strings.c:1734
msgid "Hello, World!"
msgstr "Hallo Welt!"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:952
+#: ../intl-scm/guile-strings.c:1496 ../intl-scm/guile-strings.c:1664
msgid "Boolean Option"
msgstr "Boolsche Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:954
+#: ../intl-scm/guile-strings.c:1498 ../intl-scm/guile-strings.c:1666
msgid "This is a boolean option."
msgstr "Dies ist eine boolsche Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:958
+#: ../intl-scm/guile-strings.c:1502 ../intl-scm/guile-strings.c:1670
msgid "Multi Choice Option"
msgstr "Multi-Auswahl"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:960
+#: ../intl-scm/guile-strings.c:1504 ../intl-scm/guile-strings.c:1672
msgid "This is a multi choice option."
msgstr "Dies ist eine Multi-Auswahl"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:962
+#: ../intl-scm/guile-strings.c:1506 ../intl-scm/guile-strings.c:1674
msgid "First Option"
msgstr "Erste Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:964
+#: ../intl-scm/guile-strings.c:1508 ../intl-scm/guile-strings.c:1676
msgid "Help for first option"
msgstr "Hilfe für die erste Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:966
+#: ../intl-scm/guile-strings.c:1510 ../intl-scm/guile-strings.c:1678
msgid "Second Option"
msgstr "Zweite Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:968
+#: ../intl-scm/guile-strings.c:1512 ../intl-scm/guile-strings.c:1680
msgid "Help for second option"
msgstr "Hilfe für die zweite Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:970
+#: ../intl-scm/guile-strings.c:1514 ../intl-scm/guile-strings.c:1682
msgid "Third Option"
msgstr "Dritte Sortier-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:972
+#: ../intl-scm/guile-strings.c:1516 ../intl-scm/guile-strings.c:1684
msgid "Help for third option"
msgstr "Hilfe für die dritte Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:974
+#: ../intl-scm/guile-strings.c:1518 ../intl-scm/guile-strings.c:1686
msgid "Fourth Options"
msgstr "Vierte Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:976
+#: ../intl-scm/guile-strings.c:1520 ../intl-scm/guile-strings.c:1688
msgid "The fourth option rules!"
msgstr "Die vierte Option übertrifft alle!"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:980
+#: ../intl-scm/guile-strings.c:1524 ../intl-scm/guile-strings.c:1692
msgid "String Option"
msgstr "String Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:982
+#: ../intl-scm/guile-strings.c:1526 ../intl-scm/guile-strings.c:1694
msgid "This is a string option"
msgstr "Dies ist eine String-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:984 ../intl-scm/guile-strings.c:1058
-#: ../intl-scm/guile-strings.c:1104
+#: ../intl-scm/guile-strings.c:1528 ../intl-scm/guile-strings.c:1602
+#: ../intl-scm/guile-strings.c:1648 ../intl-scm/guile-strings.c:1696
+#: ../intl-scm/guile-strings.c:1770 ../intl-scm/guile-strings.c:1816
msgid "Hello, World"
msgstr "Hallo Welt"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:988
+#: ../intl-scm/guile-strings.c:1532 ../intl-scm/guile-strings.c:1700
msgid "Just a Date Option"
msgstr "Nur eine Datums-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:990
+#: ../intl-scm/guile-strings.c:1534 ../intl-scm/guile-strings.c:1702
msgid "This is a date option"
msgstr "Dies ist eine Datums-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:994
+#: ../intl-scm/guile-strings.c:1538 ../intl-scm/guile-strings.c:1706
msgid "Time and Date Option"
msgstr "Zeit und Datums Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:996
+#: ../intl-scm/guile-strings.c:1540 ../intl-scm/guile-strings.c:1708
msgid "This is a date option with time"
msgstr "Das ist eine Datums-Option mit Einbeziehung der Zeit"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1000
+#: ../intl-scm/guile-strings.c:1544 ../intl-scm/guile-strings.c:1712
msgid "Combo Date Option"
msgstr "Kombo-Datums Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1002
+#: ../intl-scm/guile-strings.c:1546 ../intl-scm/guile-strings.c:1714
msgid "This is a combination date option"
msgstr "Dies ist eine Kombinations-Datums-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1006
+#: ../intl-scm/guile-strings.c:1550 ../intl-scm/guile-strings.c:1718
msgid "Relative Date Option"
msgstr "Relative Datums Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1008
+#: ../intl-scm/guile-strings.c:1552 ../intl-scm/guile-strings.c:1720
msgid "This is a relative date option"
msgstr "Dies ist eine relative Datums-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1012
+#: ../intl-scm/guile-strings.c:1556 ../intl-scm/guile-strings.c:1724
msgid "Number Option"
msgstr "Zahlenoptionen"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1014
+#: ../intl-scm/guile-strings.c:1558 ../intl-scm/guile-strings.c:1726
msgid "This is a number option."
msgstr "Dies ist eine Zahlen Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1020 ../intl-scm/guile-strings.c:1026
+#: ../intl-scm/guile-strings.c:1564 ../intl-scm/guile-strings.c:1570
+#: ../intl-scm/guile-strings.c:1732 ../intl-scm/guile-strings.c:1738
msgid "This is a color option"
msgstr "Farbauswahl"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1028 ../intl-scm/guile-strings.c:1034
+#: ../intl-scm/guile-strings.c:1572 ../intl-scm/guile-strings.c:1578
+#: ../intl-scm/guile-strings.c:1740 ../intl-scm/guile-strings.c:1746
msgid "Hello Again"
msgstr "Hallo mal wieder.."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1030
+#: ../intl-scm/guile-strings.c:1574 ../intl-scm/guile-strings.c:1742
msgid "An account list option"
msgstr "Eine Kontenlisten-Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1032
+#: ../intl-scm/guile-strings.c:1576 ../intl-scm/guile-strings.c:1744
msgid "This is an account list option"
msgstr "Dies ist eine Kontoaufzählungsoption"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1036
+#: ../intl-scm/guile-strings.c:1580 ../intl-scm/guile-strings.c:1748
msgid "A list option"
msgstr "Eine Auflistungsoption"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1038
+#: ../intl-scm/guile-strings.c:1582 ../intl-scm/guile-strings.c:1750
msgid "This is a list option"
msgstr "Dies ist eine Aufzählungsoption"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1040
+#: ../intl-scm/guile-strings.c:1584 ../intl-scm/guile-strings.c:1752
msgid "The Good"
msgstr "Das Gute"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1042
+#: ../intl-scm/guile-strings.c:1586 ../intl-scm/guile-strings.c:1754
msgid "Good option"
msgstr "Gute Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1044
+#: ../intl-scm/guile-strings.c:1588 ../intl-scm/guile-strings.c:1756
msgid "The Bad"
msgstr "Das Schlechte"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1046
+#: ../intl-scm/guile-strings.c:1590 ../intl-scm/guile-strings.c:1758
msgid "Bad option"
msgstr "Falsche Auswahl"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1048
+#: ../intl-scm/guile-strings.c:1592 ../intl-scm/guile-strings.c:1760
msgid "The Ugly"
msgstr "Das Hässliche"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1050
+#: ../intl-scm/guile-strings.c:1594 ../intl-scm/guile-strings.c:1762
msgid "Ugly option"
msgstr "Hässliche Option"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1052
+#: ../intl-scm/guile-strings.c:1596 ../intl-scm/guile-strings.c:1764
msgid "Testing"
msgstr "Test"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1054
+#: ../intl-scm/guile-strings.c:1598 ../intl-scm/guile-strings.c:1766
msgid "Crash the report"
msgstr "Verwerfe den Bericht"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1056
+#: ../intl-scm/guile-strings.c:1600 ../intl-scm/guile-strings.c:1768
msgid ""
"This is for testing. Your reports probably shouldn't have an option like "
"this."
msgstr ""
"Diese Option ist nur zum Testen, Ihre Berichte sollten sowas nicht haben.."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1060
+#: ../intl-scm/guile-strings.c:1604 ../intl-scm/guile-strings.c:1772
msgid ""
"This is a sample GnuCash report. See the guile (scheme) source code in the "
"scm/report directory for details on writing your own reports, or extending "
@@ -16519,8 +17351,9 @@
"Quelltext im scm/report Verzeichnis ansehen, um mehr darüber zu erfahren, "
"wie Sie ihre eigenen Berichte verfassen oder die bestehenden abändern können."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1062
+#: ../intl-scm/guile-strings.c:1606 ../intl-scm/guile-strings.c:1774
#, c-format
msgid ""
"For help on writing reports, or to contribute your brand new, totally cool "
@@ -16529,140 +17362,166 @@
"Um Hilfe beim Schreiben von Berichten zu bekommen oder Ihren eigenen, "
"brandneuen Bericht uns zu senden, wenden Sie sich an die Mailingliste %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1064
+#: ../intl-scm/guile-strings.c:1608 ../intl-scm/guile-strings.c:1776
#, c-format
msgid "For details on subscribing to that list, see %s."
msgstr "Einzelheiten zum Abonnieren der Liste siehe %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1066
+#: ../intl-scm/guile-strings.c:1610 ../intl-scm/guile-strings.c:1778
#, c-format
msgid "You can learn more about writing scheme using this %s."
msgstr "Mehr über die Programmiersprache Scheme unter %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1068
+#: ../intl-scm/guile-strings.c:1612 ../intl-scm/guile-strings.c:1780
msgid "online book"
msgstr "Onlinebuch"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1070
+#: ../intl-scm/guile-strings.c:1614 ../intl-scm/guile-strings.c:1782
#, c-format
msgid "The current time is %s."
msgstr "Es ist jetzt %s Uhr."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1072
+#: ../intl-scm/guile-strings.c:1616 ../intl-scm/guile-strings.c:1784
#, c-format
msgid "The boolean option is %s."
msgstr "Diese boolsche Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1074
+#: ../intl-scm/guile-strings.c:1618 ../intl-scm/guile-strings.c:1786
msgid "true"
msgstr "wahr"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1076
+#: ../intl-scm/guile-strings.c:1620 ../intl-scm/guile-strings.c:1788
msgid "false"
msgstr "falsch"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1078
+#: ../intl-scm/guile-strings.c:1622 ../intl-scm/guile-strings.c:1790
#, c-format
msgid "The multi-choice option is %s."
msgstr "Die Multi-Auswahl ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1080
+#: ../intl-scm/guile-strings.c:1624 ../intl-scm/guile-strings.c:1792
#, c-format
msgid "The string option is %s."
msgstr "Die String-Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1082
+#: ../intl-scm/guile-strings.c:1626 ../intl-scm/guile-strings.c:1794
#, c-format
msgid "The date option is %s."
msgstr "Die Datums-Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1084
+#: ../intl-scm/guile-strings.c:1628 ../intl-scm/guile-strings.c:1796
#, c-format
msgid "The date and time option is %s."
msgstr "Die Datums und Zeit-Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1086
+#: ../intl-scm/guile-strings.c:1630 ../intl-scm/guile-strings.c:1798
#, c-format
msgid "The relative date option is %s."
msgstr "Die relative Datums-Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1088
+#: ../intl-scm/guile-strings.c:1632 ../intl-scm/guile-strings.c:1800
#, c-format
msgid "The combination date option is %s."
msgstr "Die Kombinations-Datums-Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1090
+#: ../intl-scm/guile-strings.c:1634 ../intl-scm/guile-strings.c:1802
#, c-format
msgid "The number option is %s."
msgstr "Die Zahlen-Option ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1092
+#: ../intl-scm/guile-strings.c:1636 ../intl-scm/guile-strings.c:1804
#, c-format
msgid "The number option formatted as currency is %s."
msgstr "Die Nummernoption, die als Währung formatiert ist, ist %s."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1094
+#: ../intl-scm/guile-strings.c:1638 ../intl-scm/guile-strings.c:1806
msgid "Items you selected:"
msgstr "Ausgewählte Punkte:"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1096
+#: ../intl-scm/guile-strings.c:1640 ../intl-scm/guile-strings.c:1808
msgid "List items selected"
msgstr "Ausgewählte Listeneinträge:"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1098
+#: ../intl-scm/guile-strings.c:1642 ../intl-scm/guile-strings.c:1810
msgid "(You selected no list items.)"
msgstr "Sie haben keine Werte aus der Liste gewählt."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1100
+#: ../intl-scm/guile-strings.c:1644 ../intl-scm/guile-strings.c:1812
msgid "You have selected no accounts."
msgstr "Sie haben kein Konto ausgewählt"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1102
+#: ../intl-scm/guile-strings.c:1646 ../intl-scm/guile-strings.c:1814
msgid "Have a nice day!"
msgstr "Einen schönen Tag noch."
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1106
+#: ../intl-scm/guile-strings.c:1650 ../intl-scm/guile-strings.c:1818
msgid "Sample Report with Examples"
msgstr "Beispielbericht"
+#. src/report/utility-reports/gnucash/report/hello-world.scm
#. src/report/utility-reports/hello-world.scm
-#: ../intl-scm/guile-strings.c:1108
+#: ../intl-scm/guile-strings.c:1652 ../intl-scm/guile-strings.c:1820
msgid "A sample report with examples."
msgstr "Ein Beispielbericht."
+#. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
#. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1110 ../intl-scm/guile-strings.c:1116
+#: ../intl-scm/guile-strings.c:1654 ../intl-scm/guile-strings.c:1660
+#: ../intl-scm/guile-strings.c:1822 ../intl-scm/guile-strings.c:1828
msgid "Welcome to GnuCash"
msgstr "Willkommen zu GnuCash"
+#. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
#. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1112
+#: ../intl-scm/guile-strings.c:1656 ../intl-scm/guile-strings.c:1824
msgid "Welcome to GnuCash 2.0!"
msgstr "Willkommen zu GnuCash 2.0"
+#. src/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
#. src/report/utility-reports/welcome-to-gnucash.scm
-#: ../intl-scm/guile-strings.c:1114
+#: ../intl-scm/guile-strings.c:1658 ../intl-scm/guile-strings.c:1826
msgid "GnuCash 2.0 has lots of nice features. Here are a few."
msgstr ""
"GnuCash 2.0 hat viele neue Funktionen. Hier werden einige Beispiele gegeben."
@@ -16671,19 +17530,36 @@
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/cash-flow.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:1118 ../intl-scm/guile-strings.c:1204
-#: ../intl-scm/guile-strings.c:1296 ../intl-scm/guile-strings.c:1666
-#: ../intl-scm/guile-strings.c:2266 ../intl-scm/guile-strings.c:2688
-#: ../intl-scm/guile-strings.c:2774 ../intl-scm/guile-strings.c:2848
-#: ../intl-scm/guile-strings.c:2892 ../intl-scm/guile-strings.c:2982
-#: ../intl-scm/guile-strings.c:3432 ../intl-scm/guile-strings.c:3468
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:1830 ../intl-scm/guile-strings.c:1916
+#: ../intl-scm/guile-strings.c:2006 ../intl-scm/guile-strings.c:2376
+#: ../intl-scm/guile-strings.c:2454 ../intl-scm/guile-strings.c:2540
+#: ../intl-scm/guile-strings.c:2630 ../intl-scm/guile-strings.c:3000
+#: ../intl-scm/guile-strings.c:3600 ../intl-scm/guile-strings.c:4026
+#: ../intl-scm/guile-strings.c:4112 ../intl-scm/guile-strings.c:4186
+#: ../intl-scm/guile-strings.c:4750 ../intl-scm/guile-strings.c:5176
+#: ../intl-scm/guile-strings.c:5262 ../intl-scm/guile-strings.c:5336
+#: ../intl-scm/guile-strings.c:5380 ../intl-scm/guile-strings.c:5470
+#: ../intl-scm/guile-strings.c:5560 ../intl-scm/guile-strings.c:5650
+#: ../intl-scm/guile-strings.c:6158 ../intl-scm/guile-strings.c:6194
+#: ../intl-scm/guile-strings.c:6682 ../intl-scm/guile-strings.c:6718
msgid "From"
msgstr "Von"
@@ -16691,30 +17567,55 @@
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/cash-flow.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1120 ../intl-scm/guile-strings.c:1206
-#: ../intl-scm/guile-strings.c:1298 ../intl-scm/guile-strings.c:1668
-#: ../intl-scm/guile-strings.c:2268 ../intl-scm/guile-strings.c:2690
-#: ../intl-scm/guile-strings.c:2776 ../intl-scm/guile-strings.c:2850
-#: ../intl-scm/guile-strings.c:2894 ../intl-scm/guile-strings.c:2984
-#: ../intl-scm/guile-strings.c:3434 ../intl-scm/guile-strings.c:3470
-#: ../intl-scm/guile-strings.c:3702 ../intl-scm/guile-strings.c:3758
+#: ../intl-scm/guile-strings.c:1832 ../intl-scm/guile-strings.c:1918
+#: ../intl-scm/guile-strings.c:2008 ../intl-scm/guile-strings.c:2378
+#: ../intl-scm/guile-strings.c:2456 ../intl-scm/guile-strings.c:2542
+#: ../intl-scm/guile-strings.c:2632 ../intl-scm/guile-strings.c:3002
+#: ../intl-scm/guile-strings.c:3602 ../intl-scm/guile-strings.c:4028
+#: ../intl-scm/guile-strings.c:4114 ../intl-scm/guile-strings.c:4188
+#: ../intl-scm/guile-strings.c:4752 ../intl-scm/guile-strings.c:5178
+#: ../intl-scm/guile-strings.c:5264 ../intl-scm/guile-strings.c:5338
+#: ../intl-scm/guile-strings.c:5382 ../intl-scm/guile-strings.c:5472
+#: ../intl-scm/guile-strings.c:5562 ../intl-scm/guile-strings.c:5652
+#: ../intl-scm/guile-strings.c:6160 ../intl-scm/guile-strings.c:6196
+#: ../intl-scm/guile-strings.c:6684 ../intl-scm/guile-strings.c:6720
+#: ../intl-scm/guile-strings.c:6952 ../intl-scm/guile-strings.c:7008
+#: ../intl-scm/guile-strings.c:7192 ../intl-scm/guile-strings.c:7248
msgid "To"
msgstr "Bis"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:1122 ../intl-scm/guile-strings.c:1208
-#: ../intl-scm/guile-strings.c:1670 ../intl-scm/guile-strings.c:2692
+#: ../intl-scm/guile-strings.c:1834 ../intl-scm/guile-strings.c:1920
+#: ../intl-scm/guile-strings.c:2380 ../intl-scm/guile-strings.c:2458
+#: ../intl-scm/guile-strings.c:2544 ../intl-scm/guile-strings.c:3004
+#: ../intl-scm/guile-strings.c:4030 ../intl-scm/guile-strings.c:5180
msgid "Step Size"
msgstr "Schrittgrösse"
@@ -16724,25 +17625,45 @@
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1126 ../intl-scm/guile-strings.c:1210
-#: ../intl-scm/guile-strings.c:1306 ../intl-scm/guile-strings.c:1408
-#: ../intl-scm/guile-strings.c:1596 ../intl-scm/guile-strings.c:1672
-#: ../intl-scm/guile-strings.c:1818 ../intl-scm/guile-strings.c:1918
-#: ../intl-scm/guile-strings.c:2084 ../intl-scm/guile-strings.c:2694
-#: ../intl-scm/guile-strings.c:2778 ../intl-scm/guile-strings.c:2852
-#: ../intl-scm/guile-strings.c:3708
+#: ../intl-scm/guile-strings.c:1838 ../intl-scm/guile-strings.c:1922
+#: ../intl-scm/guile-strings.c:2016 ../intl-scm/guile-strings.c:2118
+#: ../intl-scm/guile-strings.c:2306 ../intl-scm/guile-strings.c:2382
+#: ../intl-scm/guile-strings.c:2462 ../intl-scm/guile-strings.c:2546
+#: ../intl-scm/guile-strings.c:2640 ../intl-scm/guile-strings.c:2742
+#: ../intl-scm/guile-strings.c:2930 ../intl-scm/guile-strings.c:3006
+#: ../intl-scm/guile-strings.c:3152 ../intl-scm/guile-strings.c:3252
+#: ../intl-scm/guile-strings.c:3418 ../intl-scm/guile-strings.c:4032
+#: ../intl-scm/guile-strings.c:4116 ../intl-scm/guile-strings.c:4190
+#: ../intl-scm/guile-strings.c:4302 ../intl-scm/guile-strings.c:4402
+#: ../intl-scm/guile-strings.c:4568 ../intl-scm/guile-strings.c:5182
+#: ../intl-scm/guile-strings.c:5266 ../intl-scm/guile-strings.c:5340
+#: ../intl-scm/guile-strings.c:6958 ../intl-scm/guile-strings.c:7198
msgid "Report's currency"
msgstr "Währung des Berichts"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1128
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1840 ../intl-scm/guile-strings.c:2464
msgid "Price of Commodity"
msgstr "Preis der Währung/Aktie"
@@ -16753,6 +17674,21 @@
#. src/report/standard-reports/income-statement.scm
#. src/report/standard-reports/category-barchart.scm
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/advanced-portfolio.scm
@@ -16761,102 +17697,146 @@
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:1130 ../intl-scm/guile-strings.c:1212
-#: ../intl-scm/guile-strings.c:1308 ../intl-scm/guile-strings.c:1410
-#: ../intl-scm/guile-strings.c:1598 ../intl-scm/guile-strings.c:1674
-#: ../intl-scm/guile-strings.c:1712 ../intl-scm/guile-strings.c:1820
-#: ../intl-scm/guile-strings.c:1920 ../intl-scm/guile-strings.c:1956
-#: ../intl-scm/guile-strings.c:2086 ../intl-scm/guile-strings.c:2672
-#: ../intl-scm/guile-strings.c:2696 ../intl-scm/guile-strings.c:2780
-#: ../intl-scm/guile-strings.c:2854 ../intl-scm/guile-strings.c:3710
+#: ../intl-scm/guile-strings.c:1842 ../intl-scm/guile-strings.c:1924
+#: ../intl-scm/guile-strings.c:2018 ../intl-scm/guile-strings.c:2120
+#: ../intl-scm/guile-strings.c:2308 ../intl-scm/guile-strings.c:2384
+#: ../intl-scm/guile-strings.c:2422 ../intl-scm/guile-strings.c:2466
+#: ../intl-scm/guile-strings.c:2548 ../intl-scm/guile-strings.c:2642
+#: ../intl-scm/guile-strings.c:2744 ../intl-scm/guile-strings.c:2932
+#: ../intl-scm/guile-strings.c:3008 ../intl-scm/guile-strings.c:3046
+#: ../intl-scm/guile-strings.c:3154 ../intl-scm/guile-strings.c:3254
+#: ../intl-scm/guile-strings.c:3290 ../intl-scm/guile-strings.c:3420
+#: ../intl-scm/guile-strings.c:4006 ../intl-scm/guile-strings.c:4034
+#: ../intl-scm/guile-strings.c:4118 ../intl-scm/guile-strings.c:4192
+#: ../intl-scm/guile-strings.c:4304 ../intl-scm/guile-strings.c:4404
+#: ../intl-scm/guile-strings.c:4440 ../intl-scm/guile-strings.c:4570
+#: ../intl-scm/guile-strings.c:5156 ../intl-scm/guile-strings.c:5184
+#: ../intl-scm/guile-strings.c:5268 ../intl-scm/guile-strings.c:5342
+#: ../intl-scm/guile-strings.c:6960 ../intl-scm/guile-strings.c:7200
msgid "Price Source"
msgstr "Preisberechnungsquelle"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1134 ../intl-scm/guile-strings.c:1218
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1846 ../intl-scm/guile-strings.c:1930
+#: ../intl-scm/guile-strings.c:2470 ../intl-scm/guile-strings.c:2554
msgid "Show Net Profit"
msgstr "Reingewinn anzeigen"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1136 ../intl-scm/guile-strings.c:1220
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1848 ../intl-scm/guile-strings.c:1932
+#: ../intl-scm/guile-strings.c:2472 ../intl-scm/guile-strings.c:2556
msgid "Show Asset & Liability bars"
msgstr "Aktiva und Passiva Balken anzeigen"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1138 ../intl-scm/guile-strings.c:1222
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1850 ../intl-scm/guile-strings.c:1934
+#: ../intl-scm/guile-strings.c:2474 ../intl-scm/guile-strings.c:2558
msgid "Show Net Worth bars"
msgstr "Reinvermögen-Balken anzeigen"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1140
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1852 ../intl-scm/guile-strings.c:2476
msgid "Marker"
msgstr "Markierung"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1142
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1854 ../intl-scm/guile-strings.c:2478
msgid "Marker Color"
msgstr "Markierungsfarbe"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1144 ../intl-scm/guile-strings.c:1224
-#: ../intl-scm/guile-strings.c:1686 ../intl-scm/guile-strings.c:2730
-#: ../intl-scm/guile-strings.c:2758 ../intl-scm/guile-strings.c:2794
-#: ../intl-scm/guile-strings.c:2866
+#: ../intl-scm/guile-strings.c:1856 ../intl-scm/guile-strings.c:1936
+#: ../intl-scm/guile-strings.c:2396 ../intl-scm/guile-strings.c:2480
+#: ../intl-scm/guile-strings.c:2560 ../intl-scm/guile-strings.c:3020
+#: ../intl-scm/guile-strings.c:4068 ../intl-scm/guile-strings.c:4096
+#: ../intl-scm/guile-strings.c:4132 ../intl-scm/guile-strings.c:4204
+#: ../intl-scm/guile-strings.c:5218 ../intl-scm/guile-strings.c:5246
+#: ../intl-scm/guile-strings.c:5282 ../intl-scm/guile-strings.c:5354
msgid "Plot Width"
msgstr "Diagrammbreite"
#. src/report/standard-reports/price-scatter.scm
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1146 ../intl-scm/guile-strings.c:1226
-#: ../intl-scm/guile-strings.c:1688 ../intl-scm/guile-strings.c:2732
-#: ../intl-scm/guile-strings.c:2760 ../intl-scm/guile-strings.c:2796
-#: ../intl-scm/guile-strings.c:2868
+#: ../intl-scm/guile-strings.c:1858 ../intl-scm/guile-strings.c:1938
+#: ../intl-scm/guile-strings.c:2398 ../intl-scm/guile-strings.c:2482
+#: ../intl-scm/guile-strings.c:2562 ../intl-scm/guile-strings.c:3022
+#: ../intl-scm/guile-strings.c:4070 ../intl-scm/guile-strings.c:4098
+#: ../intl-scm/guile-strings.c:4134 ../intl-scm/guile-strings.c:4206
+#: ../intl-scm/guile-strings.c:5220 ../intl-scm/guile-strings.c:5248
+#: ../intl-scm/guile-strings.c:5284 ../intl-scm/guile-strings.c:5356
msgid "Plot Height"
msgstr "Diagrammhöhe"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1148
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1860 ../intl-scm/guile-strings.c:2484
msgid "Calculate the price of this commodity."
msgstr ""
"Die Währung/Aktie, für die der Preis in diesem Bericht dargestellt werden "
"soll."
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1156
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1868 ../intl-scm/guile-strings.c:2492
msgid "Actual Transactions"
msgstr "Tatsächliche Buchungen"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1158
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1870 ../intl-scm/guile-strings.c:2494
msgid "The instantaneous price of actual currency transactions in the past"
msgstr ""
"Der aufgezeichnete Preis von tatsächlichen Buchungen in der Vergangenheit"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1160
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1872 ../intl-scm/guile-strings.c:2496
msgid "Price Database"
msgstr "Preis-Editor"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1162
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1874 ../intl-scm/guile-strings.c:2498
msgid "The recorded prices"
msgstr "Die explizit eingetragenen Preise"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1164
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1876 ../intl-scm/guile-strings.c:2500
msgid "Color of the marker"
msgstr "Farbe der Markierung"
@@ -16865,29 +17845,44 @@
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/equity-statement.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1166 ../intl-scm/guile-strings.c:1238
-#: ../intl-scm/guile-strings.c:1442 ../intl-scm/guile-strings.c:1628
-#: ../intl-scm/guile-strings.c:1702 ../intl-scm/guile-strings.c:2120
-#: ../intl-scm/guile-strings.c:2822 ../intl-scm/guile-strings.c:2884
+#: ../intl-scm/guile-strings.c:1878 ../intl-scm/guile-strings.c:1950
+#: ../intl-scm/guile-strings.c:2152 ../intl-scm/guile-strings.c:2338
+#: ../intl-scm/guile-strings.c:2412 ../intl-scm/guile-strings.c:2502
+#: ../intl-scm/guile-strings.c:2574 ../intl-scm/guile-strings.c:2776
+#: ../intl-scm/guile-strings.c:2962 ../intl-scm/guile-strings.c:3036
+#: ../intl-scm/guile-strings.c:3454 ../intl-scm/guile-strings.c:4160
+#: ../intl-scm/guile-strings.c:4222 ../intl-scm/guile-strings.c:4604
+#: ../intl-scm/guile-strings.c:5310 ../intl-scm/guile-strings.c:5372
#, c-format
msgid "%s to %s"
msgstr "%s bis %s"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1172
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1884 ../intl-scm/guile-strings.c:2508
msgid "Double-Weeks"
msgstr "Zweiwöchentlich"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1178
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1890 ../intl-scm/guile-strings.c:2514
msgid "All Prices equal"
msgstr "Alle Preise gleich"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1180
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1892 ../intl-scm/guile-strings.c:2516
msgid ""
"All the prices found are equal. This would result in a plot with one "
"straight line. Unfortunately, the plotting tool can't handle that."
@@ -16897,12 +17892,14 @@
"nicht anzeigen."
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1182
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1894 ../intl-scm/guile-strings.c:2518
msgid "All Prices at the same date"
msgstr "Alle Preise mit gleichem Datum"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1184
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1896 ../intl-scm/guile-strings.c:2520
msgid ""
"All the prices found are from the same date. This would result in a plot "
"with one straight line. Unfortunately, the plotting tool can't handle that."
@@ -16912,12 +17909,14 @@
"etwas nicht anzeigen."
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1186
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1898 ../intl-scm/guile-strings.c:2522
msgid "Only one price"
msgstr "Nur ein Preis gefunden"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1188
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1900 ../intl-scm/guile-strings.c:2524
msgid ""
"There was only one single price found for the selected commodities in the "
"selected time period. This doesn't give a useful plot."
@@ -16926,7 +17925,8 @@
"Zeitraum gefunden. Dies ergibt kein sinnvolles Diagramm."
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1192
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1904 ../intl-scm/guile-strings.c:2528
msgid ""
"There is no price information available for the selected commodities in the "
"selected time period."
@@ -16935,12 +17935,14 @@
"Zeitraum vorhanden."
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1194
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1906 ../intl-scm/guile-strings.c:2530
msgid "Identical commodities"
msgstr "Identische Währungen/Aktien"
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1196
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1908 ../intl-scm/guile-strings.c:2532
msgid ""
"Your selected commodity and the currency of the report are identical. It "
"doesn't make sense to show prices for identical commodities."
@@ -16950,330 +17952,470 @@
"identische Währungen/Aktien anzuzeigen."
#. src/report/standard-reports/price-scatter.scm
-#: ../intl-scm/guile-strings.c:1200
+#. src/report/standard-reports/gnucash/report/price-scatter.scm
+#: ../intl-scm/guile-strings.c:1912 ../intl-scm/guile-strings.c:2536
msgid "Price Scatterplot"
msgstr "Preisdiagramm"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1202
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1914 ../intl-scm/guile-strings.c:2538
msgid "Income/Expense Chart"
msgstr "Erträge/Aufwendungen Diagramm"
#. src/report/standard-reports/net-barchart.scm
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1228 ../intl-scm/guile-strings.c:1692
-#: ../intl-scm/guile-strings.c:2802 ../intl-scm/guile-strings.c:2872
+#: ../intl-scm/guile-strings.c:1940 ../intl-scm/guile-strings.c:2402
+#: ../intl-scm/guile-strings.c:2564 ../intl-scm/guile-strings.c:3026
+#: ../intl-scm/guile-strings.c:4140 ../intl-scm/guile-strings.c:4210
+#: ../intl-scm/guile-strings.c:5290 ../intl-scm/guile-strings.c:5360
msgid "Report on these accounts, if chosen account level allows."
msgstr ""
"Diese Konten anzeigen, solange die Verschachtelungstiefe eingehalten wird."
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1230
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1942 ../intl-scm/guile-strings.c:2566
msgid "Show Income and Expenses?"
msgstr "Erträge/Aufwendungen anzeigen"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1232
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1944 ../intl-scm/guile-strings.c:2568
msgid "Show the Asset and the Liability bars?"
msgstr "Balken für Aktiva und Passiva anzeigen?"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1234
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1946 ../intl-scm/guile-strings.c:2570
msgid "Show the net profit?"
msgstr "Den Reingewinn anzeigen?"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1236
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1948 ../intl-scm/guile-strings.c:2572
msgid "Show a Net Worth bar?"
msgstr "Reinvermögen anzeigen?"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1248
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1960 ../intl-scm/guile-strings.c:2584
msgid "Net Profit"
msgstr "Reingewinn"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1250
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1962 ../intl-scm/guile-strings.c:2586
msgid "Net Worth"
msgstr "Reinvermögen"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1252
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1964 ../intl-scm/guile-strings.c:2588
msgid "Income Chart"
msgstr "Erträge Diagramm"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1254
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1966 ../intl-scm/guile-strings.c:2590
msgid "Asset Chart"
msgstr "Aktiva Diagramm"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1256
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1968 ../intl-scm/guile-strings.c:2592
msgid "Expense Chart"
msgstr "Aufwendungen Diagramm"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1258
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1970 ../intl-scm/guile-strings.c:2594
msgid "Liability Chart"
msgstr "Passiva Diagramm"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1260
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1972 ../intl-scm/guile-strings.c:2596
msgid "Net Worth Barchart"
msgstr "Reinvermögen Balkendiagramm"
#. src/report/standard-reports/net-barchart.scm
-#: ../intl-scm/guile-strings.c:1262
+#. src/report/standard-reports/gnucash/report/net-barchart.scm
+#: ../intl-scm/guile-strings.c:1974 ../intl-scm/guile-strings.c:2598
msgid "Income & Expense Chart"
msgstr "Erträge/Aufwendungen Diagramm"
#. src/report/standard-reports/general-journal.scm
-#: ../intl-scm/guile-strings.c:1264 ../intl-scm/guile-strings.c:1274
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#: ../intl-scm/guile-strings.c:1976 ../intl-scm/guile-strings.c:2600
msgid "General Journal"
msgstr "Hauptbuch Journal"
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:1290 ../intl-scm/guile-strings.c:1504
-#: ../intl-scm/guile-strings.c:2210 ../intl-scm/guile-strings.c:2480
-#: ../intl-scm/guile-strings.c:2636
+#: ../intl-scm/guile-strings.c:2000 ../intl-scm/guile-strings.c:2214
+#: ../intl-scm/guile-strings.c:2624 ../intl-scm/guile-strings.c:2838
+#: ../intl-scm/guile-strings.c:3544 ../intl-scm/guile-strings.c:3814
+#: ../intl-scm/guile-strings.c:3970 ../intl-scm/guile-strings.c:4694
+#: ../intl-scm/guile-strings.c:4964 ../intl-scm/guile-strings.c:5120
msgid "Running Balance"
msgstr "Laufender Saldo"
#. src/report/standard-reports/general-journal.scm
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-journal.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:1292 ../intl-scm/guile-strings.c:1506
-#: ../intl-scm/guile-strings.c:2484 ../intl-scm/guile-strings.c:2642
-#: ../intl-scm/guile-strings.c:3272 ../intl-scm/guile-strings.c:3608
-#: ../intl-scm/guile-strings.c:3848
+#: ../intl-scm/guile-strings.c:2002 ../intl-scm/guile-strings.c:2216
+#: ../intl-scm/guile-strings.c:2626 ../intl-scm/guile-strings.c:2840
+#: ../intl-scm/guile-strings.c:3818 ../intl-scm/guile-strings.c:3976
+#: ../intl-scm/guile-strings.c:4968 ../intl-scm/guile-strings.c:5126
+#: ../intl-scm/guile-strings.c:5998 ../intl-scm/guile-strings.c:6334
+#: ../intl-scm/guile-strings.c:6522 ../intl-scm/guile-strings.c:6858
+#: ../intl-scm/guile-strings.c:7100 ../intl-scm/guile-strings.c:7340
msgid "Totals"
msgstr "Beträge"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1294
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2004 ../intl-scm/guile-strings.c:2628
msgid "Cash Flow"
msgstr "Cash Flow"
#. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1300 ../intl-scm/guile-strings.c:2666
+#: ../intl-scm/guile-strings.c:2010 ../intl-scm/guile-strings.c:2634
+#: ../intl-scm/guile-strings.c:4000 ../intl-scm/guile-strings.c:5150
msgid "Account Display Depth"
msgstr "Verschachtelungstiefe der Konten"
#. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1302 ../intl-scm/guile-strings.c:2668
+#: ../intl-scm/guile-strings.c:2012 ../intl-scm/guile-strings.c:2636
+#: ../intl-scm/guile-strings.c:4002 ../intl-scm/guile-strings.c:5152
msgid "Always show sub-accounts"
msgstr "Unterkonten immer anzeigen"
#. src/report/standard-reports/cash-flow.scm
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1310 ../intl-scm/guile-strings.c:1416
-#: ../intl-scm/guile-strings.c:1604 ../intl-scm/guile-strings.c:1826
-#: ../intl-scm/guile-strings.c:1926 ../intl-scm/guile-strings.c:2092
-#: ../intl-scm/guile-strings.c:2674
+#: ../intl-scm/guile-strings.c:2020 ../intl-scm/guile-strings.c:2126
+#: ../intl-scm/guile-strings.c:2314 ../intl-scm/guile-strings.c:2644
+#: ../intl-scm/guile-strings.c:2750 ../intl-scm/guile-strings.c:2938
+#: ../intl-scm/guile-strings.c:3160 ../intl-scm/guile-strings.c:3260
+#: ../intl-scm/guile-strings.c:3426 ../intl-scm/guile-strings.c:4008
+#: ../intl-scm/guile-strings.c:4310 ../intl-scm/guile-strings.c:4410
+#: ../intl-scm/guile-strings.c:4576 ../intl-scm/guile-strings.c:5158
msgid "Show Exchange Rates"
msgstr "Wechselkurse anzeigen"
#. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1312 ../intl-scm/guile-strings.c:2676
+#: ../intl-scm/guile-strings.c:2022 ../intl-scm/guile-strings.c:2646
+#: ../intl-scm/guile-strings.c:4010 ../intl-scm/guile-strings.c:5160
msgid "Show Full Account Names"
msgstr "Lange Kontobezeichnung anzeigen"
#. src/report/standard-reports/cash-flow.scm
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1314 ../intl-scm/guile-strings.c:1418
-#: ../intl-scm/guile-strings.c:1606 ../intl-scm/guile-strings.c:1828
-#: ../intl-scm/guile-strings.c:1928 ../intl-scm/guile-strings.c:2094
+#: ../intl-scm/guile-strings.c:2024 ../intl-scm/guile-strings.c:2128
+#: ../intl-scm/guile-strings.c:2316 ../intl-scm/guile-strings.c:2648
+#: ../intl-scm/guile-strings.c:2752 ../intl-scm/guile-strings.c:2940
+#: ../intl-scm/guile-strings.c:3162 ../intl-scm/guile-strings.c:3262
+#: ../intl-scm/guile-strings.c:3428 ../intl-scm/guile-strings.c:4312
+#: ../intl-scm/guile-strings.c:4412 ../intl-scm/guile-strings.c:4578
msgid "Show the exchange rates used"
msgstr "Aktuelle Wechselkurse anzeigen"
#. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:1316 ../intl-scm/guile-strings.c:2682
+#: ../intl-scm/guile-strings.c:2026 ../intl-scm/guile-strings.c:2650
+#: ../intl-scm/guile-strings.c:4016 ../intl-scm/guile-strings.c:5166
msgid "Show full account names (including parent accounts)"
msgstr "Lange Kontenbezeichung (einschließlich Hauptkonten) anzeigen"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1318
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2028 ../intl-scm/guile-strings.c:2652
#, c-format
msgid "%s - %s to %s for"
msgstr "%s - %s bis %s für"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1320
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2030 ../intl-scm/guile-strings.c:2654
#, c-format
msgid "%s and subaccounts"
msgstr "%s und Unterkonten"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1322
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2032 ../intl-scm/guile-strings.c:2656
#, c-format
msgid "%s and selected subaccounts"
msgstr "%s und ausgewählte Unterkonten"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1326
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2036 ../intl-scm/guile-strings.c:2660
msgid "Money into selected accounts comes from"
msgstr "Zahlung in gewählte Konten kommen aus"
#. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1328 ../intl-scm/guile-strings.c:2044
+#: ../intl-scm/guile-strings.c:2038 ../intl-scm/guile-strings.c:2662
+#: ../intl-scm/guile-strings.c:3378 ../intl-scm/guile-strings.c:4528
msgid "Money In"
msgstr "Einzahlung"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1330
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2040 ../intl-scm/guile-strings.c:2664
msgid "Money out of selected accounts goes to"
msgstr "Zahlung von gewählten Konten gehen nach"
#. src/report/standard-reports/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1332 ../intl-scm/guile-strings.c:2046
+#: ../intl-scm/guile-strings.c:2042 ../intl-scm/guile-strings.c:2666
+#: ../intl-scm/guile-strings.c:3380 ../intl-scm/guile-strings.c:4530
msgid "Money Out"
msgstr "Auszahlung"
#. src/report/standard-reports/cash-flow.scm
-#: ../intl-scm/guile-strings.c:1334
+#. src/report/standard-reports/gnucash/report/cash-flow.scm
+#: ../intl-scm/guile-strings.c:2044 ../intl-scm/guile-strings.c:2668
msgid "Difference"
msgstr "Differenz"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1336 ../intl-scm/guile-strings.c:1446
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2046 ../intl-scm/guile-strings.c:2156
+#: ../intl-scm/guile-strings.c:2670 ../intl-scm/guile-strings.c:2780
msgid "Trial Balance"
msgstr "Rohbilanz"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1338 ../intl-scm/guile-strings.c:1534
-#: ../intl-scm/guile-strings.c:1746 ../intl-scm/guile-strings.c:1854
-#: ../intl-scm/guile-strings.c:2062
+#: ../intl-scm/guile-strings.c:2048 ../intl-scm/guile-strings.c:2244
+#: ../intl-scm/guile-strings.c:2672 ../intl-scm/guile-strings.c:2868
+#: ../intl-scm/guile-strings.c:3080 ../intl-scm/guile-strings.c:3188
+#: ../intl-scm/guile-strings.c:3396 ../intl-scm/guile-strings.c:4230
+#: ../intl-scm/guile-strings.c:4338 ../intl-scm/guile-strings.c:4546
msgid "Report Title"
msgstr "Berichtstitel"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1340 ../intl-scm/guile-strings.c:1536
-#: ../intl-scm/guile-strings.c:1748 ../intl-scm/guile-strings.c:1856
-#: ../intl-scm/guile-strings.c:2064
+#: ../intl-scm/guile-strings.c:2050 ../intl-scm/guile-strings.c:2246
+#: ../intl-scm/guile-strings.c:2674 ../intl-scm/guile-strings.c:2870
+#: ../intl-scm/guile-strings.c:3082 ../intl-scm/guile-strings.c:3190
+#: ../intl-scm/guile-strings.c:3398 ../intl-scm/guile-strings.c:4232
+#: ../intl-scm/guile-strings.c:4340 ../intl-scm/guile-strings.c:4548
msgid "Title for this report"
msgstr "Titel des Berichts"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1342 ../intl-scm/guile-strings.c:1538
-#: ../intl-scm/guile-strings.c:1750 ../intl-scm/guile-strings.c:1858
-#: ../intl-scm/guile-strings.c:2066
+#: ../intl-scm/guile-strings.c:2052 ../intl-scm/guile-strings.c:2248
+#: ../intl-scm/guile-strings.c:2676 ../intl-scm/guile-strings.c:2872
+#: ../intl-scm/guile-strings.c:3084 ../intl-scm/guile-strings.c:3192
+#: ../intl-scm/guile-strings.c:3400 ../intl-scm/guile-strings.c:4234
+#: ../intl-scm/guile-strings.c:4342 ../intl-scm/guile-strings.c:4550
msgid "Company name"
msgstr "Firmenname"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1344 ../intl-scm/guile-strings.c:1540
-#: ../intl-scm/guile-strings.c:1752 ../intl-scm/guile-strings.c:1860
-#: ../intl-scm/guile-strings.c:2068
+#: ../intl-scm/guile-strings.c:2054 ../intl-scm/guile-strings.c:2250
+#: ../intl-scm/guile-strings.c:2678 ../intl-scm/guile-strings.c:2874
+#: ../intl-scm/guile-strings.c:3086 ../intl-scm/guile-strings.c:3194
+#: ../intl-scm/guile-strings.c:3402 ../intl-scm/guile-strings.c:4236
+#: ../intl-scm/guile-strings.c:4344 ../intl-scm/guile-strings.c:4552
msgid "Name of company/individual"
msgstr "Name der Organisation/Firma"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1346
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2056 ../intl-scm/guile-strings.c:2680
msgid "Start of Adjusting/Closing"
msgstr "Anfangsdatum Anpassung/Abschluss"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1348
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2058 ../intl-scm/guile-strings.c:2682
msgid "Date of Report"
msgstr "Berichtsdatum"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1350
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2060 ../intl-scm/guile-strings.c:2684
msgid "Report variation"
msgstr "Berichtsart"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1352
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2062 ../intl-scm/guile-strings.c:2686
msgid "Kind of trial balance to generate"
msgstr "Art der Rohbilanz, die berechnet werden soll"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1354 ../intl-scm/guile-strings.c:1546
-#: ../intl-scm/guile-strings.c:1760 ../intl-scm/guile-strings.c:1864
-#: ../intl-scm/guile-strings.c:2074
+#: ../intl-scm/guile-strings.c:2064 ../intl-scm/guile-strings.c:2256
+#: ../intl-scm/guile-strings.c:2688 ../intl-scm/guile-strings.c:2880
+#: ../intl-scm/guile-strings.c:3094 ../intl-scm/guile-strings.c:3198
+#: ../intl-scm/guile-strings.c:3408 ../intl-scm/guile-strings.c:4244
+#: ../intl-scm/guile-strings.c:4348 ../intl-scm/guile-strings.c:4558
msgid "Accounts to include"
msgstr "Einbezogene Konten"
#. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1356 ../intl-scm/guile-strings.c:2288
+#: ../intl-scm/guile-strings.c:2066 ../intl-scm/guile-strings.c:2690
+#: ../intl-scm/guile-strings.c:3622 ../intl-scm/guile-strings.c:4772
msgid "Report on these accounts"
msgstr "Den Buchungsbericht für diese Konten erstellen"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1358 ../intl-scm/guile-strings.c:1550
-#: ../intl-scm/guile-strings.c:1764 ../intl-scm/guile-strings.c:1868
+#: ../intl-scm/guile-strings.c:2068 ../intl-scm/guile-strings.c:2260
+#: ../intl-scm/guile-strings.c:2692 ../intl-scm/guile-strings.c:2884
+#: ../intl-scm/guile-strings.c:3098 ../intl-scm/guile-strings.c:3202
+#: ../intl-scm/guile-strings.c:4248 ../intl-scm/guile-strings.c:4352
msgid "Levels of Subaccounts"
msgstr "Verschachtelungstiefe Unterkonten"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1360 ../intl-scm/guile-strings.c:1552
-#: ../intl-scm/guile-strings.c:1766 ../intl-scm/guile-strings.c:1870
+#: ../intl-scm/guile-strings.c:2070 ../intl-scm/guile-strings.c:2262
+#: ../intl-scm/guile-strings.c:2694 ../intl-scm/guile-strings.c:2886
+#: ../intl-scm/guile-strings.c:3100 ../intl-scm/guile-strings.c:3204
+#: ../intl-scm/guile-strings.c:4250 ../intl-scm/guile-strings.c:4354
msgid "Maximum number of levels in the account tree displayed"
msgstr "Maximale Verschachtelungstiefe in der Kontenhierarchie"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1362
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2072 ../intl-scm/guile-strings.c:2696
msgid "Merchandising"
msgstr "Handel"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1364
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2074 ../intl-scm/guile-strings.c:2698
msgid "Gross adjustment accounts"
msgstr "Gesamte Anpassungskonten"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1366
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2076 ../intl-scm/guile-strings.c:2700
msgid ""
"Do not net, but show gross debit/credit adjustments to these accounts. "
"Merchandising businesses will normally select their inventory accounts here."
@@ -17283,12 +18425,14 @@
"werden hier normalerweise ihre Sachanlagen-Konten wählen."
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1368
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2078 ../intl-scm/guile-strings.c:2702
msgid "Income summary accounts"
msgstr "Ãœbersicht Ertragskonten"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1370
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2080 ../intl-scm/guile-strings.c:2704
msgid ""
"Adjustments made to these accounts are gross adjusted (see above) in the "
"Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly "
@@ -17300,76 +18444,102 @@
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1372 ../intl-scm/guile-strings.c:1608
-#: ../intl-scm/guile-strings.c:2096
+#: ../intl-scm/guile-strings.c:2082 ../intl-scm/guile-strings.c:2318
+#: ../intl-scm/guile-strings.c:2706 ../intl-scm/guile-strings.c:2942
+#: ../intl-scm/guile-strings.c:3430 ../intl-scm/guile-strings.c:4580
msgid "Entries"
msgstr "Einträge"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1374
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2084 ../intl-scm/guile-strings.c:2708
msgid "Adjusting Entries pattern"
msgstr "Muster für Anpassungseinträge"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1376
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2086 ../intl-scm/guile-strings.c:2710
msgid "Any text in the Description column which identifies adjusting entries"
msgstr ""
"Textmuster in der Buchungsbeschreibung, das Anpassungseinträge identifiziert"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1378
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2088 ../intl-scm/guile-strings.c:2712
msgid "Adjusting Entries pattern is case-sensitive"
msgstr "Muster für Anpassungseinträge unterscheidet Groß-/Kleinschreibung"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1380
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2090 ../intl-scm/guile-strings.c:2714
msgid "Causes the Adjusting Entries Pattern match to be case-sensitive"
msgstr ""
"Lässt das Muster für Anpassungseinträge nach Groß-/Kleinschreibung "
"unterscheiden"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1382
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2092 ../intl-scm/guile-strings.c:2716
msgid "Adjusting Entries Pattern is regular expression"
msgstr "Muster für Anpassungseinträge ist ein regulärer Ausdruck"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1384
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2094 ../intl-scm/guile-strings.c:2718
msgid ""
"Causes the Adjusting Entries Pattern to be treated as a regular expression"
msgstr "Lässt das Muster für Anpassungseinträge ein regulärer Ausdruck sein"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1386 ../intl-scm/guile-strings.c:1610
-#: ../intl-scm/guile-strings.c:2098
+#: ../intl-scm/guile-strings.c:2096 ../intl-scm/guile-strings.c:2320
+#: ../intl-scm/guile-strings.c:2720 ../intl-scm/guile-strings.c:2944
+#: ../intl-scm/guile-strings.c:3432 ../intl-scm/guile-strings.c:4582
msgid "Closing Entries pattern"
msgstr "Muster für Abschlussbuchungen"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1388 ../intl-scm/guile-strings.c:1612
-#: ../intl-scm/guile-strings.c:2100
+#: ../intl-scm/guile-strings.c:2098 ../intl-scm/guile-strings.c:2322
+#: ../intl-scm/guile-strings.c:2722 ../intl-scm/guile-strings.c:2946
+#: ../intl-scm/guile-strings.c:3434 ../intl-scm/guile-strings.c:4584
msgid "Any text in the Description column which identifies closing entries"
msgstr ""
"Textmuster in der Buchungsbeschreibung, das Abschlussbuchungen identifiziert"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1390 ../intl-scm/guile-strings.c:1614
-#: ../intl-scm/guile-strings.c:2102
+#: ../intl-scm/guile-strings.c:2100 ../intl-scm/guile-strings.c:2324
+#: ../intl-scm/guile-strings.c:2724 ../intl-scm/guile-strings.c:2948
+#: ../intl-scm/guile-strings.c:3436 ../intl-scm/guile-strings.c:4586
msgid "Closing Entries pattern is case-sensitive"
msgstr "Muster für Abschlussbuchungen unterscheidet Groß-/Kleinschreibung"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1392 ../intl-scm/guile-strings.c:1616
-#: ../intl-scm/guile-strings.c:2104
+#: ../intl-scm/guile-strings.c:2102 ../intl-scm/guile-strings.c:2326
+#: ../intl-scm/guile-strings.c:2726 ../intl-scm/guile-strings.c:2950
+#: ../intl-scm/guile-strings.c:3438 ../intl-scm/guile-strings.c:4588
msgid "Causes the Closing Entries Pattern match to be case-sensitive"
msgstr ""
"Lässt das Muster für Abschlussbuchungen nach Groß-/Kleinschreibung "
@@ -17377,54 +18547,86 @@
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1394 ../intl-scm/guile-strings.c:1618
-#: ../intl-scm/guile-strings.c:2106
+#: ../intl-scm/guile-strings.c:2104 ../intl-scm/guile-strings.c:2328
+#: ../intl-scm/guile-strings.c:2728 ../intl-scm/guile-strings.c:2952
+#: ../intl-scm/guile-strings.c:3440 ../intl-scm/guile-strings.c:4590
msgid "Closing Entries Pattern is regular expression"
msgstr "Muster für Abschlussbuchungen ist ein regulärer Ausdruck"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1396 ../intl-scm/guile-strings.c:1620
-#: ../intl-scm/guile-strings.c:2108
+#: ../intl-scm/guile-strings.c:2106 ../intl-scm/guile-strings.c:2330
+#: ../intl-scm/guile-strings.c:2730 ../intl-scm/guile-strings.c:2954
+#: ../intl-scm/guile-strings.c:3442 ../intl-scm/guile-strings.c:4592
msgid ""
"Causes the Closing Entries Pattern to be treated as a regular expression"
msgstr "Lässt das Muster für Abschlussbuchungen ein regulärer Ausdruck sein"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1398 ../intl-scm/guile-strings.c:1562
-#: ../intl-scm/guile-strings.c:1776 ../intl-scm/guile-strings.c:1880
+#: ../intl-scm/guile-strings.c:2108 ../intl-scm/guile-strings.c:2272
+#: ../intl-scm/guile-strings.c:2732 ../intl-scm/guile-strings.c:2896
+#: ../intl-scm/guile-strings.c:3110 ../intl-scm/guile-strings.c:3214
+#: ../intl-scm/guile-strings.c:4260 ../intl-scm/guile-strings.c:4364
msgid "Include accounts with zero total balances"
msgstr "Unterkonten, die Kontostand Null haben, mit einbeziehen."
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1400 ../intl-scm/guile-strings.c:1564
-#: ../intl-scm/guile-strings.c:1778 ../intl-scm/guile-strings.c:1882
+#: ../intl-scm/guile-strings.c:2110 ../intl-scm/guile-strings.c:2274
+#: ../intl-scm/guile-strings.c:2734 ../intl-scm/guile-strings.c:2898
+#: ../intl-scm/guile-strings.c:3112 ../intl-scm/guile-strings.c:3216
+#: ../intl-scm/guile-strings.c:4262 ../intl-scm/guile-strings.c:4366
msgid "Include accounts with zero total (recursive) balances in this report"
msgstr "Unterkonten, die Kontostand Null haben, mit einbeziehen."
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1402 ../intl-scm/guile-strings.c:1574
-#: ../intl-scm/guile-strings.c:1788 ../intl-scm/guile-strings.c:1892
+#: ../intl-scm/guile-strings.c:2112 ../intl-scm/guile-strings.c:2284
+#: ../intl-scm/guile-strings.c:2736 ../intl-scm/guile-strings.c:2908
+#: ../intl-scm/guile-strings.c:3122 ../intl-scm/guile-strings.c:3226
+#: ../intl-scm/guile-strings.c:4272 ../intl-scm/guile-strings.c:4376
msgid "Display accounts as hyperlinks"
msgstr "Kontonamen anklickbar anzeigen"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1404 ../intl-scm/guile-strings.c:1576
-#: ../intl-scm/guile-strings.c:1790 ../intl-scm/guile-strings.c:1894
+#: ../intl-scm/guile-strings.c:2114 ../intl-scm/guile-strings.c:2286
+#: ../intl-scm/guile-strings.c:2738 ../intl-scm/guile-strings.c:2910
+#: ../intl-scm/guile-strings.c:3124 ../intl-scm/guile-strings.c:3228
+#: ../intl-scm/guile-strings.c:4274 ../intl-scm/guile-strings.c:4378
msgid "Shows each account in the table as a hyperlink to its register window"
msgstr ""
"Konto als klickbaren Hyperlink anzeigen, der beim Anklicken das Kontofenster "
@@ -17432,754 +18634,1022 @@
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1406 ../intl-scm/guile-strings.c:1594
-#: ../intl-scm/guile-strings.c:1816 ../intl-scm/guile-strings.c:1916
-#: ../intl-scm/guile-strings.c:2082
+#: ../intl-scm/guile-strings.c:2116 ../intl-scm/guile-strings.c:2304
+#: ../intl-scm/guile-strings.c:2740 ../intl-scm/guile-strings.c:2928
+#: ../intl-scm/guile-strings.c:3150 ../intl-scm/guile-strings.c:3250
+#: ../intl-scm/guile-strings.c:3416 ../intl-scm/guile-strings.c:4300
+#: ../intl-scm/guile-strings.c:4400 ../intl-scm/guile-strings.c:4566
msgid "Commodities"
msgstr "Währungen/Aktien"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1412 ../intl-scm/guile-strings.c:1600
-#: ../intl-scm/guile-strings.c:1822 ../intl-scm/guile-strings.c:1922
-#: ../intl-scm/guile-strings.c:2088
+#: ../intl-scm/guile-strings.c:2122 ../intl-scm/guile-strings.c:2310
+#: ../intl-scm/guile-strings.c:2746 ../intl-scm/guile-strings.c:2934
+#: ../intl-scm/guile-strings.c:3156 ../intl-scm/guile-strings.c:3256
+#: ../intl-scm/guile-strings.c:3422 ../intl-scm/guile-strings.c:4306
+#: ../intl-scm/guile-strings.c:4406 ../intl-scm/guile-strings.c:4572
msgid "Show Foreign Currencies"
msgstr "Fremdwährungen anzeigen"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1414 ../intl-scm/guile-strings.c:1602
-#: ../intl-scm/guile-strings.c:1824 ../intl-scm/guile-strings.c:1924
-#: ../intl-scm/guile-strings.c:2090
+#: ../intl-scm/guile-strings.c:2124 ../intl-scm/guile-strings.c:2312
+#: ../intl-scm/guile-strings.c:2748 ../intl-scm/guile-strings.c:2936
+#: ../intl-scm/guile-strings.c:3158 ../intl-scm/guile-strings.c:3258
+#: ../intl-scm/guile-strings.c:3424 ../intl-scm/guile-strings.c:4308
+#: ../intl-scm/guile-strings.c:4408 ../intl-scm/guile-strings.c:4574
msgid "Display any foreign currency amount in an account"
msgstr "Fremdwährungen in Konten anzeigen"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1424
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2134 ../intl-scm/guile-strings.c:2758
msgid "Current Trial Balance"
msgstr "Aktuelle Rohbilanz"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1426
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2136 ../intl-scm/guile-strings.c:2760
msgid "Uses the exact balances in the general ledger"
msgstr "Exakte Salden aus Hauptbuch verwenden"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1428
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2138 ../intl-scm/guile-strings.c:2762
msgid "Pre-adjustment Trial Balance"
msgstr "Angepasste Rohbilanz"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1430
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2140 ../intl-scm/guile-strings.c:2764
msgid "Ignores Adjusting/Closing entries"
msgstr "Anpassungsbuchungen / Abschlussbuchungen ignorieren"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1432
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2142 ../intl-scm/guile-strings.c:2766
msgid "Work Sheet"
msgstr "Arbeitsblatt"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1434
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2144 ../intl-scm/guile-strings.c:2768
msgid "Creates a complete end-of-period work sheet"
msgstr "Vollständiges Periodenende-Arbeitsblatt"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1440 ../intl-scm/guile-strings.c:1626
-#: ../intl-scm/guile-strings.c:2118
+#: ../intl-scm/guile-strings.c:2150 ../intl-scm/guile-strings.c:2336
+#: ../intl-scm/guile-strings.c:2774 ../intl-scm/guile-strings.c:2960
+#: ../intl-scm/guile-strings.c:3452 ../intl-scm/guile-strings.c:4602
msgid "for Period"
msgstr "für Buchungszeitraum"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1444 ../intl-scm/guile-strings.c:1624
-#: ../intl-scm/guile-strings.c:2116
+#: ../intl-scm/guile-strings.c:2154 ../intl-scm/guile-strings.c:2334
+#: ../intl-scm/guile-strings.c:2778 ../intl-scm/guile-strings.c:2958
+#: ../intl-scm/guile-strings.c:3450 ../intl-scm/guile-strings.c:4600
#, c-format
msgid "For Period Covering %s to %s"
-msgstr "Für Periode %s bis %s"
+msgstr "für Periode %s bis %s"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1448
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2158 ../intl-scm/guile-strings.c:2782
msgid "Adjustments"
msgstr "Anpassungsbuchungen"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1450
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2160 ../intl-scm/guile-strings.c:2784
msgid "Adjusted Trial Balance"
msgstr "Angepasste Rohbilanz"
#. src/report/standard-reports/trial-balance.scm
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1452 ../intl-scm/guile-strings.c:1532
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2162 ../intl-scm/guile-strings.c:2242
+#: ../intl-scm/guile-strings.c:2786 ../intl-scm/guile-strings.c:2866
msgid "Income Statement"
msgstr "Einnahmeüberschussrechnung"
#. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1454 ../intl-scm/guile-strings.c:1744
+#: ../intl-scm/guile-strings.c:2164 ../intl-scm/guile-strings.c:2788
+#: ../intl-scm/guile-strings.c:3078 ../intl-scm/guile-strings.c:4228
msgid "Balance Sheet"
msgstr "Bilanz"
#. src/report/standard-reports/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1462 ../intl-scm/guile-strings.c:1844
-#: ../intl-scm/guile-strings.c:2132
+#: ../intl-scm/guile-strings.c:2172 ../intl-scm/guile-strings.c:2796
+#: ../intl-scm/guile-strings.c:3178 ../intl-scm/guile-strings.c:3466
+#: ../intl-scm/guile-strings.c:4328 ../intl-scm/guile-strings.c:4616
msgid "Unrealized Gains"
msgstr "Noch nicht erzielter Gewinn/Verlust"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1464
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2174 ../intl-scm/guile-strings.c:2798
msgid "Net Income"
msgstr "Netto Erträge"
#. src/report/standard-reports/trial-balance.scm
-#: ../intl-scm/guile-strings.c:1466
+#. src/report/standard-reports/gnucash/report/trial-balance.scm
+#: ../intl-scm/guile-strings.c:2176 ../intl-scm/guile-strings.c:2800
msgid "Net Loss"
msgstr "Netto Verlust"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1470 ../intl-scm/guile-strings.c:2144
-#: ../intl-scm/guile-strings.c:2232 ../intl-scm/guile-strings.c:2236
+#: ../intl-scm/guile-strings.c:2180 ../intl-scm/guile-strings.c:2804
+#: ../intl-scm/guile-strings.c:3478 ../intl-scm/guile-strings.c:3566
+#: ../intl-scm/guile-strings.c:3570 ../intl-scm/guile-strings.c:4628
+#: ../intl-scm/guile-strings.c:4716 ../intl-scm/guile-strings.c:4720
msgid "Sorting"
msgstr "Sortieren"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1472 ../intl-scm/guile-strings.c:2294
+#: ../intl-scm/guile-strings.c:2182 ../intl-scm/guile-strings.c:2806
+#: ../intl-scm/guile-strings.c:3628 ../intl-scm/guile-strings.c:4778
msgid "Filter Type"
msgstr "Filtertyp"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1474 ../intl-scm/guile-strings.c:2158
+#: ../intl-scm/guile-strings.c:2184 ../intl-scm/guile-strings.c:2808
+#: ../intl-scm/guile-strings.c:3492 ../intl-scm/guile-strings.c:4642
msgid "Void Transactions?"
msgstr "Stornierte Buchungssätze?"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1478 ../intl-scm/guile-strings.c:2178
-#: ../intl-scm/guile-strings.c:2242 ../intl-scm/guile-strings.c:2344
-#: ../intl-scm/guile-strings.c:2432
+#: ../intl-scm/guile-strings.c:2188 ../intl-scm/guile-strings.c:2812
+#: ../intl-scm/guile-strings.c:3512 ../intl-scm/guile-strings.c:3576
+#: ../intl-scm/guile-strings.c:3678 ../intl-scm/guile-strings.c:3766
+#: ../intl-scm/guile-strings.c:4662 ../intl-scm/guile-strings.c:4726
+#: ../intl-scm/guile-strings.c:4828 ../intl-scm/guile-strings.c:4916
msgid "Reconciled Date"
msgstr "Datum Abgeglichen"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1488 ../intl-scm/guile-strings.c:2214
-#: ../intl-scm/guile-strings.c:2452
+#: ../intl-scm/guile-strings.c:2198 ../intl-scm/guile-strings.c:2822
+#: ../intl-scm/guile-strings.c:3548 ../intl-scm/guile-strings.c:3786
+#: ../intl-scm/guile-strings.c:4698 ../intl-scm/guile-strings.c:4936
msgid "Use Full Account Name?"
msgstr "Volle Kontobezeichnung benutzen?"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1492 ../intl-scm/guile-strings.c:2194
-#: ../intl-scm/guile-strings.c:2352 ../intl-scm/guile-strings.c:2460
+#: ../intl-scm/guile-strings.c:2202 ../intl-scm/guile-strings.c:2826
+#: ../intl-scm/guile-strings.c:3528 ../intl-scm/guile-strings.c:3686
+#: ../intl-scm/guile-strings.c:3794 ../intl-scm/guile-strings.c:4678
+#: ../intl-scm/guile-strings.c:4836 ../intl-scm/guile-strings.c:4944
msgid "Other Account Name"
msgstr "Name des Gegenkontos"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1494 ../intl-scm/guile-strings.c:2230
-#: ../intl-scm/guile-strings.c:2464
+#: ../intl-scm/guile-strings.c:2204 ../intl-scm/guile-strings.c:2828
+#: ../intl-scm/guile-strings.c:3564 ../intl-scm/guile-strings.c:3798
+#: ../intl-scm/guile-strings.c:4714 ../intl-scm/guile-strings.c:4948
msgid "Use Full Other Account Name?"
msgstr "Volle Kontobezeichnung des Gegenkontos benutzen?"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1496 ../intl-scm/guile-strings.c:2226
-#: ../intl-scm/guile-strings.c:2356 ../intl-scm/guile-strings.c:2468
+#: ../intl-scm/guile-strings.c:2206 ../intl-scm/guile-strings.c:2830
+#: ../intl-scm/guile-strings.c:3560 ../intl-scm/guile-strings.c:3690
+#: ../intl-scm/guile-strings.c:3802 ../intl-scm/guile-strings.c:4710
+#: ../intl-scm/guile-strings.c:4840 ../intl-scm/guile-strings.c:4952
msgid "Other Account Code"
msgstr "Nummer des Gegenkontos"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1508 ../intl-scm/guile-strings.c:2504
-#: ../intl-scm/guile-strings.c:2544
+#: ../intl-scm/guile-strings.c:2218 ../intl-scm/guile-strings.c:2842
+#: ../intl-scm/guile-strings.c:3838 ../intl-scm/guile-strings.c:3878
+#: ../intl-scm/guile-strings.c:4988 ../intl-scm/guile-strings.c:5028
msgid "Sign Reverses?"
msgstr "Vorzeichenumkehr?"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1510 ../intl-scm/guile-strings.c:2270
-#: ../intl-scm/guile-strings.c:2546
+#: ../intl-scm/guile-strings.c:2220 ../intl-scm/guile-strings.c:2844
+#: ../intl-scm/guile-strings.c:3604 ../intl-scm/guile-strings.c:3880
+#: ../intl-scm/guile-strings.c:4754 ../intl-scm/guile-strings.c:5030
msgid "Style"
msgstr "Buchung"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1512 ../intl-scm/guile-strings.c:2146
+#: ../intl-scm/guile-strings.c:2222 ../intl-scm/guile-strings.c:2846
+#: ../intl-scm/guile-strings.c:3480 ../intl-scm/guile-strings.c:4630
msgid "Primary Key"
msgstr "Primärschlüssel"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1514 ../intl-scm/guile-strings.c:2238
-#: ../intl-scm/guile-strings.c:2402
+#: ../intl-scm/guile-strings.c:2224 ../intl-scm/guile-strings.c:2848
+#: ../intl-scm/guile-strings.c:3572 ../intl-scm/guile-strings.c:3736
+#: ../intl-scm/guile-strings.c:4722 ../intl-scm/guile-strings.c:4886
msgid "Show Full Account Name?"
msgstr "Lange Kontobezeichnung anzeigen?"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1516 ../intl-scm/guile-strings.c:2234
-#: ../intl-scm/guile-strings.c:2406
+#: ../intl-scm/guile-strings.c:2226 ../intl-scm/guile-strings.c:2850
+#: ../intl-scm/guile-strings.c:3568 ../intl-scm/guile-strings.c:3740
+#: ../intl-scm/guile-strings.c:4718 ../intl-scm/guile-strings.c:4890
msgid "Show Account Code?"
msgstr "Kontonummer anzeigen?"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1518 ../intl-scm/guile-strings.c:2148
+#: ../intl-scm/guile-strings.c:2228 ../intl-scm/guile-strings.c:2852
+#: ../intl-scm/guile-strings.c:3482 ../intl-scm/guile-strings.c:4632
msgid "Primary Subtotal"
msgstr "Primärschlüssel mit Zwischensumme"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1520 ../intl-scm/guile-strings.c:2150
+#: ../intl-scm/guile-strings.c:2230 ../intl-scm/guile-strings.c:2854
+#: ../intl-scm/guile-strings.c:3484 ../intl-scm/guile-strings.c:4634
msgid "Primary Subtotal for Date Key"
msgstr "Primäre Zwischensumme für Datumsschlüssel"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1522 ../intl-scm/guile-strings.c:2414
+#: ../intl-scm/guile-strings.c:2232 ../intl-scm/guile-strings.c:2856
+#: ../intl-scm/guile-strings.c:3748 ../intl-scm/guile-strings.c:4898
msgid "Primary Sort Order"
msgstr "Hauptsortier-Reihenfolge"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1524 ../intl-scm/guile-strings.c:2152
+#: ../intl-scm/guile-strings.c:2234 ../intl-scm/guile-strings.c:2858
+#: ../intl-scm/guile-strings.c:3486 ../intl-scm/guile-strings.c:4636
msgid "Secondary Key"
msgstr "Sekundärschlüssel"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1526 ../intl-scm/guile-strings.c:2154
+#: ../intl-scm/guile-strings.c:2236 ../intl-scm/guile-strings.c:2860
+#: ../intl-scm/guile-strings.c:3488 ../intl-scm/guile-strings.c:4638
msgid "Secondary Subtotal"
msgstr "Sekundärschlüssel mit Zwischensumme"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1528 ../intl-scm/guile-strings.c:2156
+#: ../intl-scm/guile-strings.c:2238 ../intl-scm/guile-strings.c:2862
+#: ../intl-scm/guile-strings.c:3490 ../intl-scm/guile-strings.c:4640
msgid "Secondary Subtotal for Date Key"
msgstr "Sekundäre Zwischensumme für Datumsschlüssel"
#. src/report/standard-reports/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/general-ledger.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1530 ../intl-scm/guile-strings.c:2424
+#: ../intl-scm/guile-strings.c:2240 ../intl-scm/guile-strings.c:2864
+#: ../intl-scm/guile-strings.c:3758 ../intl-scm/guile-strings.c:4908
msgid "Secondary Sort Order"
msgstr "Sekundäre Sortierreihenfolge"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1542 ../intl-scm/guile-strings.c:2070
+#: ../intl-scm/guile-strings.c:2252 ../intl-scm/guile-strings.c:2876
+#: ../intl-scm/guile-strings.c:3404 ../intl-scm/guile-strings.c:4554
msgid "Start Date"
msgstr "Anfangsdatum"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1544 ../intl-scm/guile-strings.c:2072
+#: ../intl-scm/guile-strings.c:2254 ../intl-scm/guile-strings.c:2878
+#: ../intl-scm/guile-strings.c:3406 ../intl-scm/guile-strings.c:4556
msgid "End Date"
msgstr "Enddatum"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1554 ../intl-scm/guile-strings.c:1768
+#: ../intl-scm/guile-strings.c:2264 ../intl-scm/guile-strings.c:2888
+#: ../intl-scm/guile-strings.c:3102 ../intl-scm/guile-strings.c:4252
msgid "Flatten list to depth limit"
msgstr "Baumstruktur ab Tiefenlimit flach darstellen"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1556 ../intl-scm/guile-strings.c:1770
+#: ../intl-scm/guile-strings.c:2266 ../intl-scm/guile-strings.c:2890
+#: ../intl-scm/guile-strings.c:3104 ../intl-scm/guile-strings.c:4254
msgid "Displays accounts which exceed the depth limit at the depth limit"
msgstr ""
"Konten, die tiefer als das gegebene Tiefenlimit in der Baumstruktur stehen, "
"am Tiefenlimit darstellen"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1558 ../intl-scm/guile-strings.c:1772
-#: ../intl-scm/guile-strings.c:1876
+#: ../intl-scm/guile-strings.c:2268 ../intl-scm/guile-strings.c:2892
+#: ../intl-scm/guile-strings.c:3106 ../intl-scm/guile-strings.c:3210
+#: ../intl-scm/guile-strings.c:4256 ../intl-scm/guile-strings.c:4360
msgid "Parent account balances"
msgstr "Salden Hauptkonto"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1560 ../intl-scm/guile-strings.c:1774
-#: ../intl-scm/guile-strings.c:1878
+#: ../intl-scm/guile-strings.c:2270 ../intl-scm/guile-strings.c:2894
+#: ../intl-scm/guile-strings.c:3108 ../intl-scm/guile-strings.c:3212
+#: ../intl-scm/guile-strings.c:4258 ../intl-scm/guile-strings.c:4362
msgid "Parent account subtotals"
msgstr "Zwischensummen für Hauptkonten"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1566 ../intl-scm/guile-strings.c:1780
-#: ../intl-scm/guile-strings.c:1884
+#: ../intl-scm/guile-strings.c:2276 ../intl-scm/guile-strings.c:2900
+#: ../intl-scm/guile-strings.c:3114 ../intl-scm/guile-strings.c:3218
+#: ../intl-scm/guile-strings.c:4264 ../intl-scm/guile-strings.c:4368
msgid "Omit zero balance figures"
msgstr "Salden ignorieren, die Null betragen"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1568 ../intl-scm/guile-strings.c:1782
-#: ../intl-scm/guile-strings.c:1886
+#: ../intl-scm/guile-strings.c:2278 ../intl-scm/guile-strings.c:2902
+#: ../intl-scm/guile-strings.c:3116 ../intl-scm/guile-strings.c:3220
+#: ../intl-scm/guile-strings.c:4266 ../intl-scm/guile-strings.c:4370
msgid "Show blank space in place of any zero balances which would be shown"
msgstr "Leerstellen anstatt Nullen bei Null-Salden anzeigen"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1570 ../intl-scm/guile-strings.c:1784
-#: ../intl-scm/guile-strings.c:1888 ../intl-scm/guile-strings.c:2078
+#: ../intl-scm/guile-strings.c:2280 ../intl-scm/guile-strings.c:2904
+#: ../intl-scm/guile-strings.c:3118 ../intl-scm/guile-strings.c:3222
+#: ../intl-scm/guile-strings.c:3412 ../intl-scm/guile-strings.c:4268
+#: ../intl-scm/guile-strings.c:4372 ../intl-scm/guile-strings.c:4562
msgid "Show accounting-style rules"
msgstr "Linien aus Rechnungswesen anzeigen"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/account-summary.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/account-summary.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1572 ../intl-scm/guile-strings.c:1786
-#: ../intl-scm/guile-strings.c:1890 ../intl-scm/guile-strings.c:2080
+#: ../intl-scm/guile-strings.c:2282 ../intl-scm/guile-strings.c:2906
+#: ../intl-scm/guile-strings.c:3120 ../intl-scm/guile-strings.c:3224
+#: ../intl-scm/guile-strings.c:3414 ../intl-scm/guile-strings.c:4270
+#: ../intl-scm/guile-strings.c:4374 ../intl-scm/guile-strings.c:4564
msgid "Use rules beneath columns of added numbers like accountants do"
msgstr "Linien neben Spalten mit Salden anzeigen, wie im Rechnungswesen üblich"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1578
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2288 ../intl-scm/guile-strings.c:2912
msgid "Label the revenue section"
msgstr "Abschnitt Erträge beschriften"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1580
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2290 ../intl-scm/guile-strings.c:2914
msgid "Whether or not to include a label for the revenue section"
msgstr "Beschriftung für Abschnitt mit Ertragskonten anzeigen"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1582
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2292 ../intl-scm/guile-strings.c:2916
msgid "Include revenue total"
msgstr "Summe Erträge anzeigen"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1584
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2294 ../intl-scm/guile-strings.c:2918
msgid "Whether or not to include a line indicating total revenue"
msgstr "Eine Zeile für die Summe Erträge anzeigen"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1586
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2296 ../intl-scm/guile-strings.c:2920
msgid "Label the expense section"
msgstr "Aufwendungsabschnitt beschriften"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1588
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2298 ../intl-scm/guile-strings.c:2922
msgid "Whether or not to include a label for the expense section"
msgstr ""
"Ob eine Beschriftung für den Abschnitt mit Aufwandskonten angezeigt wird"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1590
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2300 ../intl-scm/guile-strings.c:2924
msgid "Include expense total"
msgstr "Summe Aufwendungen anzeigen"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1592
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2302 ../intl-scm/guile-strings.c:2926
msgid "Whether or not to include a line indicating total expense"
msgstr "Eine Zeile für die Summe Aufwendungen anzeigen"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1630
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2340 ../intl-scm/guile-strings.c:2964
msgid "Revenues"
msgstr "Gewinn"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1632
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2342 ../intl-scm/guile-strings.c:2966
msgid "Total Revenue"
msgstr "Gesamtgewinn"
#. src/report/standard-reports/income-statement.scm
-#: ../intl-scm/guile-strings.c:1636
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#: ../intl-scm/guile-strings.c:2346 ../intl-scm/guile-strings.c:2970
msgid "Total Expenses"
msgstr "Gesamt Aufwendungen"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1638 ../intl-scm/guile-strings.c:2124
+#: ../intl-scm/guile-strings.c:2348 ../intl-scm/guile-strings.c:2972
+#: ../intl-scm/guile-strings.c:3458 ../intl-scm/guile-strings.c:4608
msgid "Net income"
msgstr "Netto Ertrag"
#. src/report/standard-reports/income-statement.scm
+#. src/report/standard-reports/gnucash/report/income-statement.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1640 ../intl-scm/guile-strings.c:2126
+#: ../intl-scm/guile-strings.c:2350 ../intl-scm/guile-strings.c:2974
+#: ../intl-scm/guile-strings.c:3460 ../intl-scm/guile-strings.c:4610
msgid "Net loss"
msgstr "Netto Verlust"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1642
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2352 ../intl-scm/guile-strings.c:2976
msgid "Income Barchart"
msgstr "Erträge Balkendiagramm"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1644
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2354 ../intl-scm/guile-strings.c:2978
msgid "Expense Barchart"
msgstr "Aufwendungen Balkendiagramm"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1646
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2356 ../intl-scm/guile-strings.c:2980
msgid "Asset Barchart"
msgstr "Aktiva Balkendiagramm"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1648
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2358 ../intl-scm/guile-strings.c:2982
msgid "Liability Barchart"
msgstr "Passiva Balkendiagramm"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1650
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2360 ../intl-scm/guile-strings.c:2984
msgid "Shows a barchart with the Income per interval developing over time"
msgstr "Balkendiagramm der Erträge pro Zeit anzeigen"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1652
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2362 ../intl-scm/guile-strings.c:2986
msgid "Shows a barchart with the Expenses per interval developing over time"
msgstr "Balkendiagramm der Aufwendungen pro Zeit anzeigen"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1654
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2364 ../intl-scm/guile-strings.c:2988
msgid "Shows a barchart with the Assets developing over time"
msgstr "Balkendiagramm der Aktiva pro Zeit anzeigen"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1656
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2366 ../intl-scm/guile-strings.c:2990
msgid "Shows a barchart with the Liabilities developing over time"
msgstr "Balkendiagramm der Passiva pro Zeit anzeigen"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1658
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2368 ../intl-scm/guile-strings.c:2992
msgid "Income Over Time"
msgstr "Ertragsentwicklung"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1660
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2370 ../intl-scm/guile-strings.c:2994
msgid "Expense Over Time"
msgstr "Aufwendungen pro Zeit"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1662
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2372 ../intl-scm/guile-strings.c:2996
msgid "Assets Over Time"
msgstr "Aktiva Entwicklung"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1664
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2374 ../intl-scm/guile-strings.c:2998
msgid "Liabilities Over Time"
msgstr "Passiva Entwicklung"
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1678 ../intl-scm/guile-strings.c:2784
-#: ../intl-scm/guile-strings.c:2858
+#: ../intl-scm/guile-strings.c:2388 ../intl-scm/guile-strings.c:3012
+#: ../intl-scm/guile-strings.c:4122 ../intl-scm/guile-strings.c:4196
+#: ../intl-scm/guile-strings.c:5272 ../intl-scm/guile-strings.c:5346
msgid "Show Accounts until level"
msgstr "Verschachtelungstiefe der angezeigten Konten"
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1680 ../intl-scm/guile-strings.c:2788
-#: ../intl-scm/guile-strings.c:2860
+#: ../intl-scm/guile-strings.c:2390 ../intl-scm/guile-strings.c:3014
+#: ../intl-scm/guile-strings.c:4126 ../intl-scm/guile-strings.c:4198
+#: ../intl-scm/guile-strings.c:5276 ../intl-scm/guile-strings.c:5348
msgid "Show long account names"
msgstr "Lange Kontennamen anzeigen"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1682
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2392 ../intl-scm/guile-strings.c:3016
msgid "Use Stacked Bars"
msgstr "Gestapelte Balken"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1684
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2394 ../intl-scm/guile-strings.c:3018
msgid "Maximum Bars"
msgstr "Maximale Anzahl Segmente"
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1690 ../intl-scm/guile-strings.c:2798
-#: ../intl-scm/guile-strings.c:2870
+#: ../intl-scm/guile-strings.c:2400 ../intl-scm/guile-strings.c:3024
+#: ../intl-scm/guile-strings.c:4136 ../intl-scm/guile-strings.c:4208
+#: ../intl-scm/guile-strings.c:5286 ../intl-scm/guile-strings.c:5358
msgid "Sort Method"
msgstr "Sortierreihenfolge"
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1694 ../intl-scm/guile-strings.c:2804
-#: ../intl-scm/guile-strings.c:2874
+#: ../intl-scm/guile-strings.c:2404 ../intl-scm/guile-strings.c:3028
+#: ../intl-scm/guile-strings.c:4142 ../intl-scm/guile-strings.c:4212
+#: ../intl-scm/guile-strings.c:5292 ../intl-scm/guile-strings.c:5362
msgid "Show accounts to this depth and not further"
msgstr ""
"Konten nur bis zu dieser Verschachtelungstiefe anzeigen (überstimmt alle "
"anderen Optionen)."
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1696 ../intl-scm/guile-strings.c:2876
+#: ../intl-scm/guile-strings.c:2406 ../intl-scm/guile-strings.c:3030
+#: ../intl-scm/guile-strings.c:4214 ../intl-scm/guile-strings.c:5364
msgid "Show the full account name in legend?"
msgstr "Lange Kontenbezeichung in der Legende anzeigen?"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1698
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2408 ../intl-scm/guile-strings.c:3032
msgid "Show barchart as stacked barchart? (Guppi>=0.35.4 required)"
msgstr ""
"Balkendiagram mit gestapelten Balken anzeigen? (Benötigt Guppi >=0.35.4)"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1700
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2410 ../intl-scm/guile-strings.c:3034
msgid "Maximum number of bars in the chart"
msgstr "Maximale Anzahl Segmente im Diagramm"
#. src/report/standard-reports/category-barchart.scm
-#: ../intl-scm/guile-strings.c:1704
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#: ../intl-scm/guile-strings.c:2414 ../intl-scm/guile-strings.c:3038
#, c-format
msgid "Balances %s to %s"
msgstr "Salden %s bis %s"
#. src/report/standard-reports/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/category-barchart.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:1708 ../intl-scm/guile-strings.c:2888
+#: ../intl-scm/guile-strings.c:2418 ../intl-scm/guile-strings.c:3042
+#: ../intl-scm/guile-strings.c:4226 ../intl-scm/guile-strings.c:5376
msgid "and"
msgstr "und"
#. src/report/standard-reports/portfolio.scm
-#: ../intl-scm/guile-strings.c:1710
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#: ../intl-scm/guile-strings.c:2420 ../intl-scm/guile-strings.c:3044
msgid "Investment Portfolio"
msgstr "Portfolio"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1714 ../intl-scm/guile-strings.c:1958
+#: ../intl-scm/guile-strings.c:2424 ../intl-scm/guile-strings.c:3048
+#: ../intl-scm/guile-strings.c:3292 ../intl-scm/guile-strings.c:4442
msgid "Share decimal places"
msgstr "Dezimalstellen für Aktien"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1716 ../intl-scm/guile-strings.c:1960
+#: ../intl-scm/guile-strings.c:2426 ../intl-scm/guile-strings.c:3050
+#: ../intl-scm/guile-strings.c:3294 ../intl-scm/guile-strings.c:4444
msgid "Include accounts with no shares"
msgstr "Unterkonten ohne Anteile mit einschließen"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:1720 ../intl-scm/guile-strings.c:1978
-#: ../intl-scm/guile-strings.c:2164
+#: ../intl-scm/guile-strings.c:2430 ../intl-scm/guile-strings.c:3054
+#: ../intl-scm/guile-strings.c:3312 ../intl-scm/guile-strings.c:3498
+#: ../intl-scm/guile-strings.c:4462 ../intl-scm/guile-strings.c:4648
msgid "Report Currency"
msgstr "Währung des Berichts"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1722 ../intl-scm/guile-strings.c:2018
+#: ../intl-scm/guile-strings.c:2432 ../intl-scm/guile-strings.c:3056
+#: ../intl-scm/guile-strings.c:3352 ../intl-scm/guile-strings.c:4502
msgid "The number of decimal places to use for share numbers"
msgstr "Anzahl Dezimalstellen, die im Aktiensaldo angezeigt werden"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1726 ../intl-scm/guile-strings.c:2024
+#: ../intl-scm/guile-strings.c:2436 ../intl-scm/guile-strings.c:3060
+#: ../intl-scm/guile-strings.c:3358 ../intl-scm/guile-strings.c:4508
msgid "Stock Accounts to report on"
msgstr "Bericht über diese Aktiendepots erstellen"
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1728 ../intl-scm/guile-strings.c:2026
+#: ../intl-scm/guile-strings.c:2438 ../intl-scm/guile-strings.c:3062
+#: ../intl-scm/guile-strings.c:3360 ../intl-scm/guile-strings.c:4510
msgid "Include accounts that have a zero share balances."
msgstr "Unterkonten, die Kontostand Null haben, mit einbeziehen."
#. src/report/standard-reports/portfolio.scm
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1734 ../intl-scm/guile-strings.c:2034
+#: ../intl-scm/guile-strings.c:2444 ../intl-scm/guile-strings.c:3068
+#: ../intl-scm/guile-strings.c:3368 ../intl-scm/guile-strings.c:4518
msgid "Listing"
msgstr "Börsenplatzkürzel"
#. src/report/standard-reports/portfolio.scm
-#: ../intl-scm/guile-strings.c:1736
+#. src/report/standard-reports/gnucash/report/portfolio.scm
+#: ../intl-scm/guile-strings.c:2446 ../intl-scm/guile-strings.c:3070
msgid "Units"
msgstr "Maßeinheiten"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1754
+#: ../intl-scm/guile-strings.c:3088 ../intl-scm/guile-strings.c:4238
msgid "Balance Sheet Date"
msgstr "Bilanzdatum"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1756
+#: ../intl-scm/guile-strings.c:3090 ../intl-scm/guile-strings.c:4240
msgid "Single column Balance Sheet"
msgstr "Einspaltige Bilanz"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1758
+#: ../intl-scm/guile-strings.c:3092 ../intl-scm/guile-strings.c:4242
msgid ""
"Print liability/equity section in the same column under the assets section "
"as opposed to a second column right of the assets section"
msgstr ""
"Passiva unterhalb der Aktiva anzeigen anstelle einer zweispaltigen Anzeige"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1792
+#: ../intl-scm/guile-strings.c:3126 ../intl-scm/guile-strings.c:4276
msgid "Label the assets section"
msgstr "Abschnitt Aktiva beschriften"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1794
+#: ../intl-scm/guile-strings.c:3128 ../intl-scm/guile-strings.c:4278
msgid "Whether or not to include a label for the assets section"
msgstr "Beschriftung für den Abschnitt mit Aktivakonten anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1796
+#: ../intl-scm/guile-strings.c:3130 ../intl-scm/guile-strings.c:4280
msgid "Include assets total"
msgstr "Summe Aktiva anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1798
+#: ../intl-scm/guile-strings.c:3132 ../intl-scm/guile-strings.c:4282
msgid "Whether or not to include a line indicating total assets"
msgstr "Eine Zeile für die Summe Aktiva anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1800
+#: ../intl-scm/guile-strings.c:3134 ../intl-scm/guile-strings.c:4284
msgid "Label the liabilities section"
msgstr "Abschnitt Passiva beschriften"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1802
+#: ../intl-scm/guile-strings.c:3136 ../intl-scm/guile-strings.c:4286
msgid "Whether or not to include a label for the liabilities section"
msgstr "Beschriftung für den Abschnitt mit Passivakonten anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1804
+#: ../intl-scm/guile-strings.c:3138 ../intl-scm/guile-strings.c:4288
msgid "Include liabilities total"
msgstr "Summe Passiva anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1806
+#: ../intl-scm/guile-strings.c:3140 ../intl-scm/guile-strings.c:4290
msgid "Whether or not to include a line indicating total liabilities"
msgstr "Eine Zeile für die Summe Passiva anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1808
+#: ../intl-scm/guile-strings.c:3142 ../intl-scm/guile-strings.c:4292
msgid "Label the equity section"
msgstr "Abschnitt Eigenkapital beschriften"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1810
+#: ../intl-scm/guile-strings.c:3144 ../intl-scm/guile-strings.c:4294
msgid "Whether or not to include a label for the equity section"
msgstr "Beschriftung für den Abschnitt mit Eigenkapitalkonten anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1812
+#: ../intl-scm/guile-strings.c:3146 ../intl-scm/guile-strings.c:4296
msgid "Include equity total"
msgstr "Summe Eigenkapital anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1814
+#: ../intl-scm/guile-strings.c:3148 ../intl-scm/guile-strings.c:4298
msgid "Whether or not to include a line indicating total equity"
msgstr "Eine Zeile für die Summe Eigenkapital anzeigen"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1832
+#: ../intl-scm/guile-strings.c:3166 ../intl-scm/guile-strings.c:4316
msgid "Total Assets"
msgstr "Gesamt Aktiva"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1836
+#: ../intl-scm/guile-strings.c:3170 ../intl-scm/guile-strings.c:4320
msgid "Total Liabilities"
msgstr "Gesamt Passiva"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1842
+#: ../intl-scm/guile-strings.c:3176 ../intl-scm/guile-strings.c:4326
msgid "Retained Losses"
msgstr "Zurückbehaltene Verluste"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/balance-sheet.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:1846 ../intl-scm/guile-strings.c:2134
+#: ../intl-scm/guile-strings.c:3180 ../intl-scm/guile-strings.c:3468
+#: ../intl-scm/guile-strings.c:4330 ../intl-scm/guile-strings.c:4618
msgid "Unrealized Losses"
msgstr "Noch nicht erzielter Verlust"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1848
+#: ../intl-scm/guile-strings.c:3182 ../intl-scm/guile-strings.c:4332
msgid "Total Equity"
msgstr "Gesamt Eigenkapital"
+#. src/report/standard-reports/gnucash/report/balance-sheet.scm
#. src/report/standard-reports/balance-sheet.scm
-#: ../intl-scm/guile-strings.c:1850
+#: ../intl-scm/guile-strings.c:3184 ../intl-scm/guile-strings.c:4334
msgid "Total Liabilities & Equity"
msgstr "Gesamt Passiva & Eigenkapital"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1852
+#: ../intl-scm/guile-strings.c:3186 ../intl-scm/guile-strings.c:4336
msgid "Account Summary"
msgstr "Kontenübersicht"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1872
+#: ../intl-scm/guile-strings.c:3206 ../intl-scm/guile-strings.c:4356
msgid "Depth limit behavior"
msgstr "Tiefenlimit Verwendung"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1874
+#: ../intl-scm/guile-strings.c:3208 ../intl-scm/guile-strings.c:4358
msgid "How to treat accounts which exceed the specified depth limit (if any)"
msgstr ""
"Festlegen, wie das Tiefenlimit für Konten in der Baumstruktur verwendet "
"werden soll"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1898
+#: ../intl-scm/guile-strings.c:3232 ../intl-scm/guile-strings.c:4382
msgid "Show an account's balance"
msgstr "Kontensaldo anzeigen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1902
+#: ../intl-scm/guile-strings.c:3236 ../intl-scm/guile-strings.c:4386
msgid "Show an account's account code"
msgstr "Kontonummer anzeigen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1906
+#: ../intl-scm/guile-strings.c:3240 ../intl-scm/guile-strings.c:4390
msgid "Show an account's account type"
msgstr "Kontoart anzeigen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1908
+#: ../intl-scm/guile-strings.c:3242 ../intl-scm/guile-strings.c:4392
msgid "Account Description"
msgstr "Kontenbeschreibung"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1910
+#: ../intl-scm/guile-strings.c:3244 ../intl-scm/guile-strings.c:4394
msgid "Show an account's description"
msgstr "Kontenbeschreibung anzeigen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1912
+#: ../intl-scm/guile-strings.c:3246 ../intl-scm/guile-strings.c:4396
msgid "Account Notes"
msgstr "Kontennotizen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1914
+#: ../intl-scm/guile-strings.c:3248 ../intl-scm/guile-strings.c:4398
msgid "Show an account's notes"
msgstr "Kontennotizen anzeigen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1930
+#: ../intl-scm/guile-strings.c:3264 ../intl-scm/guile-strings.c:4414
msgid "Recursive Balance"
msgstr "Rekursiver Saldo"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1932
+#: ../intl-scm/guile-strings.c:3266 ../intl-scm/guile-strings.c:4416
msgid ""
"Show the total balance, including balances in subaccounts, of any account at "
"the depth limit"
@@ -18187,181 +19657,218 @@
"Gesamten Saldo von allen Konten und allen Unterkonten anzeigen, unabhängig "
"vom Tiefenlimit"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1934
+#: ../intl-scm/guile-strings.c:3268 ../intl-scm/guile-strings.c:4418
msgid "Raise Accounts"
msgstr "Konten höher anzeigen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1936
+#: ../intl-scm/guile-strings.c:3270 ../intl-scm/guile-strings.c:4420
msgid "Shows accounts deeper than the depth limit at the depth limit"
msgstr ""
"Konten anzeigen, die in der Baumstruktur tiefer als das Tiefenlimit liegen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1938
+#: ../intl-scm/guile-strings.c:3272 ../intl-scm/guile-strings.c:4422
msgid "Omit Accounts"
msgstr "Konten überspringen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1940
+#: ../intl-scm/guile-strings.c:3274 ../intl-scm/guile-strings.c:4424
msgid "Disregard completely any accounts deeper than the depth limit"
msgstr ""
"Konten ignorieren, die in der Baumstruktur tiefer als das Tiefenlimit liegen"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1942
+#: ../intl-scm/guile-strings.c:3276 ../intl-scm/guile-strings.c:4426
msgid "Code"
msgstr "Code"
+#. src/report/standard-reports/gnucash/report/account-summary.scm
#. src/report/standard-reports/account-summary.scm
-#: ../intl-scm/guile-strings.c:1948
+#: ../intl-scm/guile-strings.c:3282 ../intl-scm/guile-strings.c:4432
msgid "Account title"
msgstr "Kontobezeichnung"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1954
+#: ../intl-scm/guile-strings.c:3288 ../intl-scm/guile-strings.c:4438
msgid "Advanced Portfolio"
msgstr "Erweitertes Portfolio"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1962
+#: ../intl-scm/guile-strings.c:3296 ../intl-scm/guile-strings.c:4446
msgid "Include gains and losses"
msgstr "Gewinne und Verluste mit einberechnen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1964
+#: ../intl-scm/guile-strings.c:3298 ../intl-scm/guile-strings.c:4448
msgid "Show ticker symbols"
msgstr "Tickersymbole anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1966
+#: ../intl-scm/guile-strings.c:3300 ../intl-scm/guile-strings.c:4450
msgid "Show listings"
msgstr "Listing anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1968
+#: ../intl-scm/guile-strings.c:3302 ../intl-scm/guile-strings.c:4452
msgid "Show prices"
msgstr "Preise anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1970
+#: ../intl-scm/guile-strings.c:3304 ../intl-scm/guile-strings.c:4454
msgid "Show number of shares"
msgstr "Anzahl von Anteilen anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1972 ../intl-scm/guile-strings.c:1994
+#: ../intl-scm/guile-strings.c:3306 ../intl-scm/guile-strings.c:3328
+#: ../intl-scm/guile-strings.c:4456 ../intl-scm/guile-strings.c:4478
msgid "Basis calculation method"
msgstr "Berechnung der Basis"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1974
+#: ../intl-scm/guile-strings.c:3308 ../intl-scm/guile-strings.c:4458
msgid "Set preference for price list data"
msgstr "Auswahl für Kurslisten treffen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1990
+#: ../intl-scm/guile-strings.c:3324 ../intl-scm/guile-strings.c:4474
msgid "Most recent to report"
msgstr "Neuester vor Berichtsdatum"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1992
+#: ../intl-scm/guile-strings.c:3326 ../intl-scm/guile-strings.c:4476
msgid "The most recent recorded price before report date"
msgstr "Der neueste aufgezeichnete Preis vor dem Datum des Berichts"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/advanced-portfolio.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:1996 ../intl-scm/guile-strings.c:2718
-#: ../intl-scm/guile-strings.c:2738
+#: ../intl-scm/guile-strings.c:3330 ../intl-scm/guile-strings.c:4056
+#: ../intl-scm/guile-strings.c:4076 ../intl-scm/guile-strings.c:4480
+#: ../intl-scm/guile-strings.c:5206 ../intl-scm/guile-strings.c:5226
msgid "Average"
msgstr "Durchschnitt"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:1998
+#: ../intl-scm/guile-strings.c:3332 ../intl-scm/guile-strings.c:4482
msgid "Use average cost of all shares for basis"
msgstr "Durchschnittliche Aktienkurse als Basis verwenden"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2000
+#: ../intl-scm/guile-strings.c:3334 ../intl-scm/guile-strings.c:4484
msgid "FIFO"
msgstr "FIFO"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2002
+#: ../intl-scm/guile-strings.c:3336 ../intl-scm/guile-strings.c:4486
msgid "Use first-in first-out method for basis"
msgstr "Methode First-In First-Out (zuerst erworbene werden zuerst verkauft)"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2004
+#: ../intl-scm/guile-strings.c:3338 ../intl-scm/guile-strings.c:4488
msgid "FILO"
msgstr "FILO"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2006
+#: ../intl-scm/guile-strings.c:3340 ../intl-scm/guile-strings.c:4490
msgid "Use first-in last-out method for basis"
msgstr "Methode First-In Last-Out (zuerst erworbene werden zuletzt verkauft)"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2008
+#: ../intl-scm/guile-strings.c:3342 ../intl-scm/guile-strings.c:4492
msgid "Prefer use of price editor pricing over transactions, where applicable."
msgstr ""
"Kurse aus dem Preiseditor gegenüber Kursen aus Buchungen bevorzugen, falls "
"möglich."
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2010
+#: ../intl-scm/guile-strings.c:3344 ../intl-scm/guile-strings.c:4494
msgid "Include splits with no shares for calculating money-in and money-out"
msgstr ""
"Buchungsteile ohne Aktien-Anteile trotzdem für Wertzuwachs und -abnahme mit "
"einbeziehen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2012
+#: ../intl-scm/guile-strings.c:3346 ../intl-scm/guile-strings.c:4496
msgid "Display the ticker symbols"
msgstr "Das Tickersymbol anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2014
+#: ../intl-scm/guile-strings.c:3348 ../intl-scm/guile-strings.c:4498
msgid "Display exchange listings"
msgstr "Die Börsen-Listings anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2016
+#: ../intl-scm/guile-strings.c:3350 ../intl-scm/guile-strings.c:4500
msgid "Display numbers of shares in accounts"
msgstr "Anzahl von Anteilen in diesem Konto anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2020
+#: ../intl-scm/guile-strings.c:3354 ../intl-scm/guile-strings.c:4504
msgid "Display share prices"
msgstr "Anteilspreis anzeigen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2040
+#: ../intl-scm/guile-strings.c:3374 ../intl-scm/guile-strings.c:4524
msgid "Basis"
msgstr "Basis"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2048
+#: ../intl-scm/guile-strings.c:3382 ../intl-scm/guile-strings.c:4532
msgid "Realized Gain"
msgstr "Realisierter Gewinn"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2050
+#: ../intl-scm/guile-strings.c:3384 ../intl-scm/guile-strings.c:4534
msgid "Unrealized Gain"
msgstr "Noch nicht erzielter Gewinn"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2052
+#: ../intl-scm/guile-strings.c:3386 ../intl-scm/guile-strings.c:4536
msgid "Total Gain"
msgstr "Gesamtgewinn"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2054
+#: ../intl-scm/guile-strings.c:3388 ../intl-scm/guile-strings.c:4538
msgid "Total Return"
msgstr "Gesamter Ertrag"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2056
+#: ../intl-scm/guile-strings.c:3390 ../intl-scm/guile-strings.c:4540
msgid ""
"* this commodity data was built using transaction pricing instead of the "
"price list."
@@ -18369,373 +19876,463 @@
"* Diese Kurse wurden aus Buchungen berechnet statt aus gespeicherten "
"Kursinformationen"
+#. src/report/standard-reports/gnucash/report/advanced-portfolio.scm
#. src/report/standard-reports/advanced-portfolio.scm
-#: ../intl-scm/guile-strings.c:2058
+#: ../intl-scm/guile-strings.c:3392 ../intl-scm/guile-strings.c:4542
msgid ""
"If you are in a multi-currency situation, the exchanges may not be correct."
msgstr ""
"Bei vielen unterschiedlichen Währungen können diese Kurs unter Umständen "
"nicht korrekt sein."
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2060
+#: ../intl-scm/guile-strings.c:3394 ../intl-scm/guile-strings.c:4544
msgid "Equity Statement"
msgstr "Eigenkapitalbilanz"
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2076
+#: ../intl-scm/guile-strings.c:3410 ../intl-scm/guile-strings.c:4560
msgid "Report only on these accounts"
msgstr "Den Buchungsbericht für diese Konten erstellen"
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2122 ../intl-scm/guile-strings.c:2140
+#: ../intl-scm/guile-strings.c:3456 ../intl-scm/guile-strings.c:3474
+#: ../intl-scm/guile-strings.c:4606 ../intl-scm/guile-strings.c:4624
msgid "Capital"
msgstr "Kapital"
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2128
+#: ../intl-scm/guile-strings.c:3462 ../intl-scm/guile-strings.c:4612
msgid "Investments"
msgstr "Investments"
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2130
+#: ../intl-scm/guile-strings.c:3464 ../intl-scm/guile-strings.c:4614
msgid "Withdrawals"
msgstr "Abhebungen"
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2136
+#: ../intl-scm/guile-strings.c:3470 ../intl-scm/guile-strings.c:4620
msgid "Increase in capital"
msgstr "Kapitalerhöhung"
+#. src/report/standard-reports/gnucash/report/equity-statement.scm
#. src/report/standard-reports/equity-statement.scm
-#: ../intl-scm/guile-strings.c:2138
+#: ../intl-scm/guile-strings.c:3472 ../intl-scm/guile-strings.c:4622
msgid "Decrease in capital"
msgstr "Kapitalreduzierung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2142
+#: ../intl-scm/guile-strings.c:3476 ../intl-scm/guile-strings.c:4626
msgid "Transaction Report"
msgstr "Buchungsbericht"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2160
+#: ../intl-scm/guile-strings.c:3494 ../intl-scm/guile-strings.c:4644
msgid "Table for Exporting"
msgstr "Tabelle zum Exportieren"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2162
+#: ../intl-scm/guile-strings.c:3496 ../intl-scm/guile-strings.c:4646
msgid "Common Currency"
msgstr "Gemeinsame Währung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2168
+#: ../intl-scm/guile-strings.c:3502 ../intl-scm/guile-strings.c:4652
msgid "Total For "
msgstr "Gesamtsumme für "
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2170 ../intl-scm/guile-strings.c:2532
+#: ../intl-scm/guile-strings.c:3504 ../intl-scm/guile-strings.c:3866
+#: ../intl-scm/guile-strings.c:4654 ../intl-scm/guile-strings.c:5016
msgid "Grand Total"
msgstr "Gesamtbetrag"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2252
+#: ../intl-scm/guile-strings.c:3586 ../intl-scm/guile-strings.c:4736
msgid "Transfer from/to"
msgstr "Umbuchen von/nach"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2272
+#: ../intl-scm/guile-strings.c:3606 ../intl-scm/guile-strings.c:4756
msgid "Report style"
msgstr "Berichtsstil"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2274
+#: ../intl-scm/guile-strings.c:3608 ../intl-scm/guile-strings.c:4758
msgid "Multi-Line"
msgstr "Multizeilen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2276
+#: ../intl-scm/guile-strings.c:3610 ../intl-scm/guile-strings.c:4760
msgid "Display N lines"
msgstr "Viele Zeilen anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2278 ../intl-scm/guile-strings.c:2496
-#: ../intl-scm/guile-strings.c:2626
+#: ../intl-scm/guile-strings.c:3612 ../intl-scm/guile-strings.c:3830
+#: ../intl-scm/guile-strings.c:3960 ../intl-scm/guile-strings.c:4762
+#: ../intl-scm/guile-strings.c:4980 ../intl-scm/guile-strings.c:5110
msgid "Single"
msgstr "Einzel"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2280
+#: ../intl-scm/guile-strings.c:3614 ../intl-scm/guile-strings.c:4764
msgid "Display 1 line"
msgstr "Eine Zeile anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2282
+#: ../intl-scm/guile-strings.c:3616 ../intl-scm/guile-strings.c:4766
msgid "Convert all transactions into a common currency"
msgstr "Alle Buchungen in eine gemeinsame Währung umrechnen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2284
+#: ../intl-scm/guile-strings.c:3618 ../intl-scm/guile-strings.c:4768
msgid "Formats the table suitable for cut & paste exporting with extra cells"
msgstr ""
"Formatiert die Tabelle passend zum Kopieren/Einfügen mit zusätzlichen "
"Tabellenzellen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2286
+#: ../intl-scm/guile-strings.c:3620 ../intl-scm/guile-strings.c:4770
msgid "Report Accounts"
msgstr "Konten im Bericht"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2290
+#: ../intl-scm/guile-strings.c:3624 ../intl-scm/guile-strings.c:4774
msgid "Filter Accounts"
msgstr "Filterkonten"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2292
+#: ../intl-scm/guile-strings.c:3626 ../intl-scm/guile-strings.c:4776
msgid "Filter on these accounts"
msgstr "Mit jenen Konten filtern"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2296
+#: ../intl-scm/guile-strings.c:3630 ../intl-scm/guile-strings.c:4780
msgid "Filter account"
msgstr "Konto filtern"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2300
+#: ../intl-scm/guile-strings.c:3634 ../intl-scm/guile-strings.c:4784
msgid "Do not do any filtering"
msgstr "Nichts filtern"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2302
+#: ../intl-scm/guile-strings.c:3636 ../intl-scm/guile-strings.c:4786
msgid "Include Transactions to/from Filter Accounts"
msgstr "Buchungen von/nach Filter-Konten einschließen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2304
+#: ../intl-scm/guile-strings.c:3638 ../intl-scm/guile-strings.c:4788
msgid "Include transactions to/from filter accounts only"
msgstr "Nur Buchungen von/nach Filter-Konten einschließen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2306
+#: ../intl-scm/guile-strings.c:3640 ../intl-scm/guile-strings.c:4790
msgid "Exclude Transactions to/from Filter Accounts"
msgstr "Buchungen von/nach Filter-Konten ausschließen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2308
+#: ../intl-scm/guile-strings.c:3642 ../intl-scm/guile-strings.c:4792
msgid "Exclude transactions to/from all filter accounts"
msgstr "Buchungen von/nach allen Filter-Konten ausschließen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2310
+#: ../intl-scm/guile-strings.c:3644 ../intl-scm/guile-strings.c:4794
msgid "How to handle void transactions"
msgstr "Behandlung von stornierten Buchungssätzen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2312
+#: ../intl-scm/guile-strings.c:3646 ../intl-scm/guile-strings.c:4796
msgid "Non-void only"
msgstr "Nur nicht-stornierte"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2314
+#: ../intl-scm/guile-strings.c:3648 ../intl-scm/guile-strings.c:4798
msgid "Show only non-voided transactions"
msgstr "Nur nicht-stornierte Buchungssätze anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2316
+#: ../intl-scm/guile-strings.c:3650 ../intl-scm/guile-strings.c:4800
msgid "Void only"
msgstr "Nur stornierte"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2318
+#: ../intl-scm/guile-strings.c:3652 ../intl-scm/guile-strings.c:4802
msgid "Show only voided transactions"
msgstr "Nur stornierte Buchungssätze anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2320
+#: ../intl-scm/guile-strings.c:3654 ../intl-scm/guile-strings.c:4804
msgid "Both"
msgstr "Beides"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2322
+#: ../intl-scm/guile-strings.c:3656 ../intl-scm/guile-strings.c:4806
msgid "Show both (and include void transactions in totals)"
msgstr "Beides anzeigen (und stornierte Buchungssätze im Saldo miteinbeziehen)"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2326
+#: ../intl-scm/guile-strings.c:3660 ../intl-scm/guile-strings.c:4810
msgid "Do not sort"
msgstr "Nicht sortieren"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2330
+#: ../intl-scm/guile-strings.c:3664 ../intl-scm/guile-strings.c:4814
msgid "Sort & subtotal by account name"
msgstr "Sortiere nach Kontonamen und bilde die Summe"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2334
+#: ../intl-scm/guile-strings.c:3668 ../intl-scm/guile-strings.c:4818
msgid "Sort & subtotal by account code"
msgstr "Sortiere nach Kontonummer und bilde die Summe"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2340
+#: ../intl-scm/guile-strings.c:3674 ../intl-scm/guile-strings.c:4824
msgid "Exact Time"
msgstr "Tageszeit"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2342
+#: ../intl-scm/guile-strings.c:3676 ../intl-scm/guile-strings.c:4826
msgid "Sort by exact time"
msgstr "Nach Tageszeit sortieren"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2346
+#: ../intl-scm/guile-strings.c:3680 ../intl-scm/guile-strings.c:4830
msgid "Sort by the Reconciled Date"
msgstr "Sortiere nach Abgleich-Datum"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2348
+#: ../intl-scm/guile-strings.c:3682 ../intl-scm/guile-strings.c:4832
msgid "Register Order"
msgstr "Wie Kontobuch"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2350
+#: ../intl-scm/guile-strings.c:3684 ../intl-scm/guile-strings.c:4834
msgid "Sort as with the register"
msgstr "Die Sortierung, die im Kontobuch benutzt wird"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2354
+#: ../intl-scm/guile-strings.c:3688 ../intl-scm/guile-strings.c:4838
msgid "Sort by account transferred from/to's name"
msgstr "Sortiere nach Namen des Kontos, zu dem gebucht wurde"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2358
+#: ../intl-scm/guile-strings.c:3692 ../intl-scm/guile-strings.c:4842
msgid "Sort by account transferred from/to's code"
msgstr "Sortiere nach Nummer des Kontos, zu dem gebucht wurde"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2370
+#: ../intl-scm/guile-strings.c:3704 ../intl-scm/guile-strings.c:4854
msgid "Sort by check/transaction number"
msgstr "Sortieren nach Scheck-/Buchungsnr."
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2376
+#: ../intl-scm/guile-strings.c:3710 ../intl-scm/guile-strings.c:4860
msgid "Ascending"
msgstr "Aufsteigend"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2378
+#: ../intl-scm/guile-strings.c:3712 ../intl-scm/guile-strings.c:4862
msgid "smallest to largest, earliest to latest"
msgstr "kleinster zu grösstem, ältester zu jüngstem"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2380
+#: ../intl-scm/guile-strings.c:3714 ../intl-scm/guile-strings.c:4864
msgid "Descending"
msgstr "Absteigend"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2382
+#: ../intl-scm/guile-strings.c:3716 ../intl-scm/guile-strings.c:4866
msgid "largest to smallest, latest to earliest"
msgstr "Grösster zu kleinstem, jüngster zu ältestem"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2400
+#: ../intl-scm/guile-strings.c:3734 ../intl-scm/guile-strings.c:4884
msgid "Sort by this criterion first"
msgstr "Sortiere zuerst nach diesem Kriteriums"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2404
+#: ../intl-scm/guile-strings.c:3738 ../intl-scm/guile-strings.c:4888
msgid "Show the full account name for subtotals and subtitles?"
msgstr "Lange Kontenbezeichung in den Zwischenzummen anzeigen?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2408
+#: ../intl-scm/guile-strings.c:3742 ../intl-scm/guile-strings.c:4892
msgid "Show the account code for subtotals and subtitles?"
msgstr "Kontonummer für Zwischensummen anzeigen?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2410
+#: ../intl-scm/guile-strings.c:3744 ../intl-scm/guile-strings.c:4894
msgid "Subtotal according to the primary key?"
msgstr "Zwischensummen für Primärschlüssel?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2412 ../intl-scm/guile-strings.c:2422
+#: ../intl-scm/guile-strings.c:3746 ../intl-scm/guile-strings.c:3756
+#: ../intl-scm/guile-strings.c:4896 ../intl-scm/guile-strings.c:4906
msgid "Do a date subtotal"
msgstr "Datum-Zwischensumme"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2416
+#: ../intl-scm/guile-strings.c:3750 ../intl-scm/guile-strings.c:4900
msgid "Order of primary sorting"
msgstr "Reihenfolge des primären Sortierens"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2418
+#: ../intl-scm/guile-strings.c:3752 ../intl-scm/guile-strings.c:4902
msgid "Sort by this criterion second"
msgstr "Sortiere als zweites nach diesem Kriterium"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2420
+#: ../intl-scm/guile-strings.c:3754 ../intl-scm/guile-strings.c:4904
msgid "Subtotal according to the secondary key?"
msgstr "Zwischensummen für Sekundärschlüssel?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2426
+#: ../intl-scm/guile-strings.c:3760 ../intl-scm/guile-strings.c:4910
msgid "Order of Secondary sorting"
msgstr "Reihenfolge der zweiten Sortierung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:2430 ../intl-scm/guile-strings.c:2588
-#: ../intl-scm/guile-strings.c:3214 ../intl-scm/guile-strings.c:3532
-#: ../intl-scm/guile-strings.c:3790
+#: ../intl-scm/guile-strings.c:3764 ../intl-scm/guile-strings.c:3922
+#: ../intl-scm/guile-strings.c:4914 ../intl-scm/guile-strings.c:5072
+#: ../intl-scm/guile-strings.c:5940 ../intl-scm/guile-strings.c:6258
+#: ../intl-scm/guile-strings.c:6464 ../intl-scm/guile-strings.c:6782
+#: ../intl-scm/guile-strings.c:7042 ../intl-scm/guile-strings.c:7282
msgid "Display the date?"
msgstr "Anzeigen des Datums?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2434
+#: ../intl-scm/guile-strings.c:3768 ../intl-scm/guile-strings.c:4918
msgid "Display the reconciled date?"
msgstr "Anzeigen des Abgleich-Datums?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2438 ../intl-scm/guile-strings.c:2594
+#: ../intl-scm/guile-strings.c:3772 ../intl-scm/guile-strings.c:3928
+#: ../intl-scm/guile-strings.c:4922 ../intl-scm/guile-strings.c:5078
msgid "Display the check number?"
msgstr "Anzeigen der Schecknummer?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:2442 ../intl-scm/guile-strings.c:2600
-#: ../intl-scm/guile-strings.c:3220 ../intl-scm/guile-strings.c:3538
-#: ../intl-scm/guile-strings.c:3796
+#: ../intl-scm/guile-strings.c:3776 ../intl-scm/guile-strings.c:3934
+#: ../intl-scm/guile-strings.c:4926 ../intl-scm/guile-strings.c:5084
+#: ../intl-scm/guile-strings.c:5946 ../intl-scm/guile-strings.c:6264
+#: ../intl-scm/guile-strings.c:6470 ../intl-scm/guile-strings.c:6788
+#: ../intl-scm/guile-strings.c:7048 ../intl-scm/guile-strings.c:7288
msgid "Display the description?"
msgstr "Anzeigen der Beschreibung?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2446
+#: ../intl-scm/guile-strings.c:3780 ../intl-scm/guile-strings.c:4930
msgid "Display the memo?"
msgstr "Anzeigen des Buchungstexts?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2450
+#: ../intl-scm/guile-strings.c:3784 ../intl-scm/guile-strings.c:4934
msgid "Display the account name?"
msgstr "Kontenbezeichnung anzeigen?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2454 ../intl-scm/guile-strings.c:2466
+#: ../intl-scm/guile-strings.c:3788 ../intl-scm/guile-strings.c:3800
+#: ../intl-scm/guile-strings.c:4938 ../intl-scm/guile-strings.c:4950
msgid "Display the full account name"
msgstr "Volle Kontenbezeichnung anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2458
+#: ../intl-scm/guile-strings.c:3792 ../intl-scm/guile-strings.c:4942
msgid "Display the account code"
msgstr "Kontonummer anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2462
+#: ../intl-scm/guile-strings.c:3796 ../intl-scm/guile-strings.c:4946
msgid ""
"Display the other account name? (if this is a split transaction, this "
"parameter is guessed)."
@@ -18743,96 +20340,132 @@
"Kontobezeichnung des Gegenkontos anzeigen? (Wenn dies eine mehrteiliger "
"Buchungssatz ist, wird dieser Parameter geraten.)"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2470
+#: ../intl-scm/guile-strings.c:3804 ../intl-scm/guile-strings.c:4954
msgid "Display the other account code"
msgstr "Kontonummer des Gegenkontos anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2474 ../intl-scm/guile-strings.c:2612
+#: ../intl-scm/guile-strings.c:3808 ../intl-scm/guile-strings.c:3946
+#: ../intl-scm/guile-strings.c:4958 ../intl-scm/guile-strings.c:5096
msgid "Display the number of shares?"
msgstr "Anzahl von Anteilen anzeigen?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2478 ../intl-scm/guile-strings.c:2618
+#: ../intl-scm/guile-strings.c:3812 ../intl-scm/guile-strings.c:3952
+#: ../intl-scm/guile-strings.c:4962 ../intl-scm/guile-strings.c:5102
msgid "Display the shares price?"
msgstr "Den Anteilspreis anzeigen?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2482 ../intl-scm/guile-strings.c:2638
+#: ../intl-scm/guile-strings.c:3816 ../intl-scm/guile-strings.c:3972
+#: ../intl-scm/guile-strings.c:4966 ../intl-scm/guile-strings.c:5122
msgid "Display a running balance"
msgstr "Einen laufenden Saldo anzeigen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:2486 ../intl-scm/guile-strings.c:2644
-#: ../intl-scm/guile-strings.c:3274 ../intl-scm/guile-strings.c:3610
-#: ../intl-scm/guile-strings.c:3850
+#: ../intl-scm/guile-strings.c:3820 ../intl-scm/guile-strings.c:3978
+#: ../intl-scm/guile-strings.c:4970 ../intl-scm/guile-strings.c:5128
+#: ../intl-scm/guile-strings.c:6000 ../intl-scm/guile-strings.c:6336
+#: ../intl-scm/guile-strings.c:6524 ../intl-scm/guile-strings.c:6860
+#: ../intl-scm/guile-strings.c:7102 ../intl-scm/guile-strings.c:7342
msgid "Display the totals?"
msgstr "Anzeigen der Bilanz"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2490 ../intl-scm/guile-strings.c:2624
+#: ../intl-scm/guile-strings.c:3824 ../intl-scm/guile-strings.c:3958
+#: ../intl-scm/guile-strings.c:4974 ../intl-scm/guile-strings.c:5108
msgid "Display the amount?"
msgstr "Betrag anzeigen?"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2494
+#: ../intl-scm/guile-strings.c:3828 ../intl-scm/guile-strings.c:4978
msgid "No amount display"
msgstr "Keine Summenanzeige"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2498 ../intl-scm/guile-strings.c:2628
+#: ../intl-scm/guile-strings.c:3832 ../intl-scm/guile-strings.c:3962
+#: ../intl-scm/guile-strings.c:4982 ../intl-scm/guile-strings.c:5112
msgid "Single Column Display"
msgstr "Einspaltige Anzeige"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2500 ../intl-scm/guile-strings.c:2630
+#: ../intl-scm/guile-strings.c:3834 ../intl-scm/guile-strings.c:3964
+#: ../intl-scm/guile-strings.c:4984 ../intl-scm/guile-strings.c:5114
msgid "Double"
msgstr "Doppel"
+#. src/report/standard-reports/gnucash/report/transaction.scm
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/transaction.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2502 ../intl-scm/guile-strings.c:2632
+#: ../intl-scm/guile-strings.c:3836 ../intl-scm/guile-strings.c:3966
+#: ../intl-scm/guile-strings.c:4986 ../intl-scm/guile-strings.c:5116
msgid "Two Column Display"
msgstr "Zweispaltige Anzeige"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2506
+#: ../intl-scm/guile-strings.c:3840 ../intl-scm/guile-strings.c:4990
msgid "Reverse amount display for certain account types"
msgstr "Vorzeichenumkehr für manche Kontenarten"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2510
+#: ../intl-scm/guile-strings.c:3844 ../intl-scm/guile-strings.c:4994
msgid "Don't change any displayed amounts"
msgstr "Keine Vorzeichenumkehr"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2512
+#: ../intl-scm/guile-strings.c:3846 ../intl-scm/guile-strings.c:4996
msgid "Income and Expense"
msgstr "Erträge und Aufwendungen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2514
+#: ../intl-scm/guile-strings.c:3848 ../intl-scm/guile-strings.c:4998
msgid "Reverse amount display for Income and Expense Accounts"
msgstr "Ertrags- und Aufwandskonten mit umgekehrten Vorzeichen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2516
+#: ../intl-scm/guile-strings.c:3850 ../intl-scm/guile-strings.c:5000
msgid "Credit Accounts"
msgstr "Habenkonten"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2518
+#: ../intl-scm/guile-strings.c:3852 ../intl-scm/guile-strings.c:5002
msgid ""
"Reverse amount display for Liability, Payable, Equity, Credit Card, and "
"Income accounts"
@@ -18840,39 +20473,46 @@
"Verbindlichkeiten, Passiva-, Kreditkarten-, Eigenkapital- und Ertragskonten "
"mit umgekehrten Vorzeichen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2520
+#: ../intl-scm/guile-strings.c:3854 ../intl-scm/guile-strings.c:5004
#, c-format
msgid "From %s To %s"
msgstr "Von %s bis %s"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2524
+#: ../intl-scm/guile-strings.c:3858 ../intl-scm/guile-strings.c:5008
msgid "Primary Subtotals/headings"
msgstr "Primäre Zwischenüberschriften/-summen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2528
+#: ../intl-scm/guile-strings.c:3862 ../intl-scm/guile-strings.c:5012
msgid "Secondary Subtotals/headings"
msgstr "Sekundäre Zwischenüberschriften/-summen"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2536
+#: ../intl-scm/guile-strings.c:3870 ../intl-scm/guile-strings.c:5020
msgid "Split Odd"
msgstr "Ungerade Buchung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2540
+#: ../intl-scm/guile-strings.c:3874 ../intl-scm/guile-strings.c:5024
msgid "Split Even"
msgstr "Gerade Buchung"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2550
+#: ../intl-scm/guile-strings.c:3884 ../intl-scm/guile-strings.c:5034
msgid "No matching transactions found"
msgstr "Keine passenden Buchungssätze gefunden"
+#. src/report/standard-reports/gnucash/report/transaction.scm
#. src/report/standard-reports/transaction.scm
-#: ../intl-scm/guile-strings.c:2552
+#: ../intl-scm/guile-strings.c:3886 ../intl-scm/guile-strings.c:5036
msgid ""
"No transactions were found that match the time interval and account "
"selection specified in the Options panel."
@@ -18880,419 +20520,582 @@
"Keine Buchungssätze gefunden, die in den gewählten Zeitraum fallen und die "
"gewählten Konten betreffen. Klicken Sie »Optionen«, um die Auswahl zu ändern."
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2580
+#: ../intl-scm/guile-strings.c:3914 ../intl-scm/guile-strings.c:5064
msgid "The title of the report"
msgstr "Titel des Berichts"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2606
+#: ../intl-scm/guile-strings.c:3940 ../intl-scm/guile-strings.c:5090
msgid "Display the account?"
msgstr "Konto anzeigen?"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2646
+#: ../intl-scm/guile-strings.c:3980 ../intl-scm/guile-strings.c:5130
msgid "Total Debits"
msgstr "Gesamt Soll"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2648
+#: ../intl-scm/guile-strings.c:3982 ../intl-scm/guile-strings.c:5132
msgid "Total Credits"
msgstr "Gesamt Haben"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2650
+#: ../intl-scm/guile-strings.c:3984 ../intl-scm/guile-strings.c:5134
msgid "Net Change"
msgstr "Gesamt Änderung"
+#. src/report/standard-reports/gnucash/report/register.scm
#. src/report/standard-reports/register.scm
-#: ../intl-scm/guile-strings.c:2652
+#: ../intl-scm/guile-strings.c:3986 ../intl-scm/guile-strings.c:5136
msgid "Client"
msgstr "Kunde"
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2664
+#: ../intl-scm/guile-strings.c:3998 ../intl-scm/guile-strings.c:5148
msgid "Budget Report"
msgstr "Budget-Bericht"
+#. src/report/standard-reports/gnucash/report/budget.scm
#. src/report/standard-reports/budget.scm
-#: ../intl-scm/guile-strings.c:2684
+#: ../intl-scm/guile-strings.c:4018 ../intl-scm/guile-strings.c:5168
+msgid "Bgt"
+msgstr "Budget"
+
+#. src/report/standard-reports/gnucash/report/budget.scm
+#. src/report/standard-reports/budget.scm
+#: ../intl-scm/guile-strings.c:4020 ../intl-scm/guile-strings.c:5170
+msgid "Act"
+msgstr "Ist"
+
+#. src/report/standard-reports/gnucash/report/budget.scm
+#. src/report/standard-reports/budget.scm
+#: ../intl-scm/guile-strings.c:4022 ../intl-scm/guile-strings.c:5172
#, c-format
-msgid "%s - %s"
-msgstr "%s bis %s"
+msgid "%s: %s"
+msgstr "%s: %s"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2686 ../intl-scm/guile-strings.c:2720
+#: ../intl-scm/guile-strings.c:4024 ../intl-scm/guile-strings.c:4058
+#: ../intl-scm/guile-strings.c:5174 ../intl-scm/guile-strings.c:5208
msgid "Average Balance"
msgstr "Durchschnittlicher Kontostand"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:2698 ../intl-scm/guile-strings.c:2786
+#: ../intl-scm/guile-strings.c:4036 ../intl-scm/guile-strings.c:4124
+#: ../intl-scm/guile-strings.c:5186 ../intl-scm/guile-strings.c:5274
msgid "Include Sub-Accounts"
msgstr "Unterkonten-Saldo einrechnen"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/average-balance.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:2700 ../intl-scm/guile-strings.c:2800
+#: ../intl-scm/guile-strings.c:4038 ../intl-scm/guile-strings.c:4138
+#: ../intl-scm/guile-strings.c:5188 ../intl-scm/guile-strings.c:5288
msgid "Include sub-accounts of all selected accounts"
msgstr "Unterkonten der ausgewählten Konten einbeziehen"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2704
+#: ../intl-scm/guile-strings.c:4042 ../intl-scm/guile-strings.c:5192
msgid "Do transaction report on this account"
msgstr "Den Buchungsbericht zu diesem Konto erstellen"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2706 ../intl-scm/guile-strings.c:2756
+#: ../intl-scm/guile-strings.c:4044 ../intl-scm/guile-strings.c:4094
+#: ../intl-scm/guile-strings.c:5194 ../intl-scm/guile-strings.c:5244
msgid "Show table"
msgstr "Tabelle anzeigen"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2708
+#: ../intl-scm/guile-strings.c:4046 ../intl-scm/guile-strings.c:5196
msgid "Display a table of the selected data."
msgstr "Daten als Tabelle anzeigen."
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2710 ../intl-scm/guile-strings.c:2754
+#: ../intl-scm/guile-strings.c:4048 ../intl-scm/guile-strings.c:4092
+#: ../intl-scm/guile-strings.c:5198 ../intl-scm/guile-strings.c:5242
msgid "Show plot"
msgstr "Diagramm anzeigen"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2712
+#: ../intl-scm/guile-strings.c:4050 ../intl-scm/guile-strings.c:5200
msgid "Display a graph of the selected data."
msgstr "Daten als Diagramm anzeigen."
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2714 ../intl-scm/guile-strings.c:2752
+#: ../intl-scm/guile-strings.c:4052 ../intl-scm/guile-strings.c:4090
+#: ../intl-scm/guile-strings.c:5202 ../intl-scm/guile-strings.c:5240
msgid "Plot Type"
msgstr "Diagrammtyp"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2716
+#: ../intl-scm/guile-strings.c:4054 ../intl-scm/guile-strings.c:5204
msgid "The type of graph to generate"
msgstr "Die Art von Diagramm, das angezeigt werden soll."
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2722 ../intl-scm/guile-strings.c:2748
+#: ../intl-scm/guile-strings.c:4060 ../intl-scm/guile-strings.c:4086
+#: ../intl-scm/guile-strings.c:5210 ../intl-scm/guile-strings.c:5236
msgid "Profit"
msgstr "Ergebnis"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2724
+#: ../intl-scm/guile-strings.c:4062 ../intl-scm/guile-strings.c:5212
msgid "Profit (Gain minus Loss)"
msgstr "Ergebnis (Erträge minus Aufwendungen)"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2728
+#: ../intl-scm/guile-strings.c:4066 ../intl-scm/guile-strings.c:5216
msgid "Gain And Loss"
msgstr "Wertzuwachs und Verlust"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2734
+#: ../intl-scm/guile-strings.c:4072 ../intl-scm/guile-strings.c:5222
msgid "Period start"
msgstr "Periodenbeginn"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2736
+#: ../intl-scm/guile-strings.c:4074 ../intl-scm/guile-strings.c:5224
msgid "Period end"
msgstr "Periodenende"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2740
+#: ../intl-scm/guile-strings.c:4078 ../intl-scm/guile-strings.c:5228
msgid "Maximum"
msgstr "Maximum"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2742
+#: ../intl-scm/guile-strings.c:4080 ../intl-scm/guile-strings.c:5230
msgid "Minimum"
msgstr "Minimum"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2744
+#: ../intl-scm/guile-strings.c:4082 ../intl-scm/guile-strings.c:5232
msgid "Gain"
msgstr "Wertzuwachs"
+#. src/report/standard-reports/gnucash/report/average-balance.scm
#. src/report/standard-reports/average-balance.scm
-#: ../intl-scm/guile-strings.c:2746
+#: ../intl-scm/guile-strings.c:4084 ../intl-scm/guile-strings.c:5234
msgid "Loss"
msgstr "Verlust"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:2762 ../intl-scm/guile-strings.c:2770
+#: ../intl-scm/guile-strings.c:4100 ../intl-scm/guile-strings.c:4108
+#: ../intl-scm/guile-strings.c:5250 ../intl-scm/guile-strings.c:5258
msgid "Income vs. Day of Week"
msgstr "Erträge pro Wochentag"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:2764 ../intl-scm/guile-strings.c:2772
+#: ../intl-scm/guile-strings.c:4102 ../intl-scm/guile-strings.c:4110
+#: ../intl-scm/guile-strings.c:5252 ../intl-scm/guile-strings.c:5260
msgid "Expenses vs. Day of Week"
msgstr "Aufwendungen pro Wochentag"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:2766
+#: ../intl-scm/guile-strings.c:4104 ../intl-scm/guile-strings.c:5254
msgid "Shows a piechart with the total income for each day of the week"
msgstr ""
"Tortendiagramm mit Erträgen eines Zeitraums nach Wochentag aufgeschlüsselt "
"anzeigen"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
#. src/report/standard-reports/daily-reports.scm
-#: ../intl-scm/guile-strings.c:2768
+#: ../intl-scm/guile-strings.c:4106 ../intl-scm/guile-strings.c:5256
msgid "Shows a piechart with the total expenses for each day of the week"
msgstr ""
"Tortendiagramm mit Aufwendungen eines Zeitraums nach Wochentag "
"aufgeschlüsselt anzeigen"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2790 ../intl-scm/guile-strings.c:2862
+#: ../intl-scm/guile-strings.c:4128 ../intl-scm/guile-strings.c:4200
+#: ../intl-scm/guile-strings.c:5278 ../intl-scm/guile-strings.c:5350
msgid "Show Totals"
msgstr "Beträge anzeigen"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2792 ../intl-scm/guile-strings.c:2864
+#: ../intl-scm/guile-strings.c:4130 ../intl-scm/guile-strings.c:4202
+#: ../intl-scm/guile-strings.c:5280 ../intl-scm/guile-strings.c:5352
msgid "Maximum Slices"
msgstr "Maximale Anzahl Segmente"
+#. src/report/standard-reports/gnucash/report/daily-reports.scm
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/daily-reports.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2806 ../intl-scm/guile-strings.c:2878
+#: ../intl-scm/guile-strings.c:4144 ../intl-scm/guile-strings.c:4216
+#: ../intl-scm/guile-strings.c:5294 ../intl-scm/guile-strings.c:5366
msgid "Show the total balance in legend?"
msgstr "Gesamtbeträge in der Legende anzeigen?"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2824
+#: ../intl-scm/guile-strings.c:4162 ../intl-scm/guile-strings.c:5312
msgid "Income Piechart"
msgstr "Erträge Tortendiagramm"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2826
+#: ../intl-scm/guile-strings.c:4164 ../intl-scm/guile-strings.c:5314
msgid "Expense Piechart"
msgstr "Aufwendungen Tortendiagramm"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2828
+#: ../intl-scm/guile-strings.c:4166 ../intl-scm/guile-strings.c:5316
msgid "Asset Piechart"
msgstr "Aktiva Tortendiagramm"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2830
+#: ../intl-scm/guile-strings.c:4168 ../intl-scm/guile-strings.c:5318
msgid "Liability Piechart"
msgstr "Passiva Tortendiagramm"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2832
+#: ../intl-scm/guile-strings.c:4170 ../intl-scm/guile-strings.c:5320
msgid "Shows a piechart with the Income per given time interval"
msgstr "Tortendiagramm der Erträge eines Zeitraums anzeigen"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2834
+#: ../intl-scm/guile-strings.c:4172 ../intl-scm/guile-strings.c:5322
msgid "Shows a piechart with the Expenses per given time interval"
msgstr "Tortendiagramm der Aufwendungen eines Zeitraums anzeigen "
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2836
+#: ../intl-scm/guile-strings.c:4174 ../intl-scm/guile-strings.c:5324
msgid "Shows a piechart with the Assets balance at a given time"
msgstr "Tortendiagramm der Aktiva eines Zeitpunkts anzeigen"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2838
+#: ../intl-scm/guile-strings.c:4176 ../intl-scm/guile-strings.c:5326
msgid "Shows a piechart with the Liabilities balance at a given time"
msgstr "Tortendiagramm der Passiva eines Zeitpunkts anzeigen"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2840
+#: ../intl-scm/guile-strings.c:4178 ../intl-scm/guile-strings.c:5328
msgid "Income Accounts"
msgstr "Ertragskonten"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2842
+#: ../intl-scm/guile-strings.c:4180 ../intl-scm/guile-strings.c:5330
msgid "Expense Accounts"
msgstr "Aufwandskonten"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2880
+#: ../intl-scm/guile-strings.c:4218 ../intl-scm/guile-strings.c:5368
msgid "Maximum number of slices in pie"
msgstr "Maximale Anzahl Segmente (Tortenstücke) im Diagramm"
+#. src/report/standard-reports/gnucash/report/account-piecharts.scm
#. src/report/standard-reports/account-piecharts.scm
-#: ../intl-scm/guile-strings.c:2886
+#: ../intl-scm/guile-strings.c:4224 ../intl-scm/guile-strings.c:5374
#, c-format
msgid "Balance at %s"
msgstr "Saldo am %s"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2890 ../intl-scm/guile-strings.c:2980
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5378 ../intl-scm/guile-strings.c:5468
+#: ../intl-scm/guile-strings.c:5558 ../intl-scm/guile-strings.c:5648
msgid "Tax Report / TXF Export"
msgstr "Steuer-Bericht / TXF Export"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2896 ../intl-scm/guile-strings.c:2986
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5384 ../intl-scm/guile-strings.c:5474
+#: ../intl-scm/guile-strings.c:5564 ../intl-scm/guile-strings.c:5654
msgid "Alternate Period"
msgstr "Abwechselnde Perioden"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2898 ../intl-scm/guile-strings.c:2988
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5386 ../intl-scm/guile-strings.c:5476
+#: ../intl-scm/guile-strings.c:5566 ../intl-scm/guile-strings.c:5656
msgid "Override or modify From: & To:"
msgstr "Ãœberschreiben oder modifizieren des Von: & An:"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2900 ../intl-scm/guile-strings.c:2990
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5388 ../intl-scm/guile-strings.c:5478
+#: ../intl-scm/guile-strings.c:5568 ../intl-scm/guile-strings.c:5658
msgid "Use From - To"
msgstr "Benutzen Sie Von - Bis"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2902 ../intl-scm/guile-strings.c:2992
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5390 ../intl-scm/guile-strings.c:5480
+#: ../intl-scm/guile-strings.c:5570 ../intl-scm/guile-strings.c:5660
msgid "Use From - To period"
msgstr "Benutzen SIe den Von-Bis Zeitraum"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2904 ../intl-scm/guile-strings.c:2994
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5392 ../intl-scm/guile-strings.c:5482
+#: ../intl-scm/guile-strings.c:5572 ../intl-scm/guile-strings.c:5662
msgid "1st Est Tax Quarter"
msgstr "Steuerschätzung des ersten Quartals"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2906 ../intl-scm/guile-strings.c:2996
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5394 ../intl-scm/guile-strings.c:5484
+#: ../intl-scm/guile-strings.c:5574 ../intl-scm/guile-strings.c:5664
msgid "Jan 1 - Mar 31"
msgstr "1. Jan. - 31. März"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2908 ../intl-scm/guile-strings.c:2998
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5396 ../intl-scm/guile-strings.c:5486
+#: ../intl-scm/guile-strings.c:5576 ../intl-scm/guile-strings.c:5666
msgid "2nd Est Tax Quarter"
msgstr "Steuerschätzung 2. Quartal"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2910 ../intl-scm/guile-strings.c:3000
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5398 ../intl-scm/guile-strings.c:5488
+#: ../intl-scm/guile-strings.c:5578 ../intl-scm/guile-strings.c:5668
msgid "Apr 1 - May 31"
msgstr "1. Apr. - 31. Mai"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2912 ../intl-scm/guile-strings.c:3002
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5400 ../intl-scm/guile-strings.c:5490
+#: ../intl-scm/guile-strings.c:5580 ../intl-scm/guile-strings.c:5670
msgid "3rd Est Tax Quarter"
msgstr "Steurschätzung des dritten Quartals"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2914 ../intl-scm/guile-strings.c:3004
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5402 ../intl-scm/guile-strings.c:5492
+#: ../intl-scm/guile-strings.c:5582 ../intl-scm/guile-strings.c:5672
msgid "Jun 1 - Aug 31"
msgstr "1. Juni -31. Aug."
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2916 ../intl-scm/guile-strings.c:3006
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5404 ../intl-scm/guile-strings.c:5494
+#: ../intl-scm/guile-strings.c:5584 ../intl-scm/guile-strings.c:5674
msgid "4th Est Tax Quarter"
msgstr "Steuerschätzung des 4. Quartals"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2918 ../intl-scm/guile-strings.c:3008
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5406 ../intl-scm/guile-strings.c:5496
+#: ../intl-scm/guile-strings.c:5586 ../intl-scm/guile-strings.c:5676
msgid "Sep 1 - Dec 31"
msgstr "1. Sept - 31. Dez."
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2920 ../intl-scm/guile-strings.c:2922
-#: ../intl-scm/guile-strings.c:3010 ../intl-scm/guile-strings.c:3012
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5408 ../intl-scm/guile-strings.c:5410
+#: ../intl-scm/guile-strings.c:5498 ../intl-scm/guile-strings.c:5500
+#: ../intl-scm/guile-strings.c:5588 ../intl-scm/guile-strings.c:5590
+#: ../intl-scm/guile-strings.c:5678 ../intl-scm/guile-strings.c:5680
msgid "Last Year"
msgstr "Letztes Jahr"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2924 ../intl-scm/guile-strings.c:3014
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5412 ../intl-scm/guile-strings.c:5502
+#: ../intl-scm/guile-strings.c:5592 ../intl-scm/guile-strings.c:5682
msgid "Last Yr 1st Est Tax Qtr"
msgstr "Steuerschätzung erstes Quartal des vergangenen Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2926 ../intl-scm/guile-strings.c:3016
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5414 ../intl-scm/guile-strings.c:5504
+#: ../intl-scm/guile-strings.c:5594 ../intl-scm/guile-strings.c:5684
msgid "Jan 1 - Mar 31, Last year"
msgstr "1. Januar - 31. März letzten Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2928 ../intl-scm/guile-strings.c:3018
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5416 ../intl-scm/guile-strings.c:5506
+#: ../intl-scm/guile-strings.c:5596 ../intl-scm/guile-strings.c:5686
msgid "Last Yr 2nd Est Tax Qtr"
msgstr "Letztes Jahr zweites vermutliches Steuerquartal"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2930 ../intl-scm/guile-strings.c:3020
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5418 ../intl-scm/guile-strings.c:5508
+#: ../intl-scm/guile-strings.c:5598 ../intl-scm/guile-strings.c:5688
msgid "Apr 1 - May 31, Last year"
msgstr "1. April- 31. August letzten Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2932 ../intl-scm/guile-strings.c:3022
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5420 ../intl-scm/guile-strings.c:5510
+#: ../intl-scm/guile-strings.c:5600 ../intl-scm/guile-strings.c:5690
msgid "Last Yr 3rd Est Tax Qtr"
msgstr "Steuerschätzung des 3. Quartals des letzten Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2934 ../intl-scm/guile-strings.c:3024
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5422 ../intl-scm/guile-strings.c:5512
+#: ../intl-scm/guile-strings.c:5602 ../intl-scm/guile-strings.c:5692
msgid "Jun 1 - Aug 31, Last year"
msgstr "1. Juni - 31. August letzten Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2936 ../intl-scm/guile-strings.c:3026
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5424 ../intl-scm/guile-strings.c:5514
+#: ../intl-scm/guile-strings.c:5604 ../intl-scm/guile-strings.c:5694
msgid "Last Yr 4th Est Tax Qtr"
msgstr "Steuer-Schätzung des vierten Quartals des letzten Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2938 ../intl-scm/guile-strings.c:3028
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5426 ../intl-scm/guile-strings.c:5516
+#: ../intl-scm/guile-strings.c:5606 ../intl-scm/guile-strings.c:5696
msgid "Sep 1 - Dec 31, Last year"
msgstr "1. September - 31. Dezember letzten Jahres"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2940 ../intl-scm/guile-strings.c:3030
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5428 ../intl-scm/guile-strings.c:5518
+#: ../intl-scm/guile-strings.c:5608 ../intl-scm/guile-strings.c:5698
msgid "Select Accounts (none = all)"
msgstr "Konten auswählen (keine = alle)"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2942 ../intl-scm/guile-strings.c:3032
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5430 ../intl-scm/guile-strings.c:5520
+#: ../intl-scm/guile-strings.c:5610 ../intl-scm/guile-strings.c:5700
msgid "Select accounts"
msgstr "Konten auswählen"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2944 ../intl-scm/guile-strings.c:3034
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5432 ../intl-scm/guile-strings.c:5522
+#: ../intl-scm/guile-strings.c:5612 ../intl-scm/guile-strings.c:5702
msgid "Suppress $0.00 values"
msgstr "Unterdrücke 0,00 Euro Werte"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2946 ../intl-scm/guile-strings.c:3036
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5434 ../intl-scm/guile-strings.c:5524
+#: ../intl-scm/guile-strings.c:5614 ../intl-scm/guile-strings.c:5704
msgid "$0.00 valued Accounts won't be printed."
msgstr "Konten mit Summe 0,00 Euro werden nicht gedruckt/angezeigt."
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2948 ../intl-scm/guile-strings.c:3038
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5436 ../intl-scm/guile-strings.c:5526
+#: ../intl-scm/guile-strings.c:5616 ../intl-scm/guile-strings.c:5706
msgid "Print Full account names"
msgstr "Vollen Kontonamen anzeigen"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2950 ../intl-scm/guile-strings.c:3040
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5438 ../intl-scm/guile-strings.c:5528
+#: ../intl-scm/guile-strings.c:5618 ../intl-scm/guile-strings.c:5708
msgid "Print all Parent account names"
msgstr "Drucke alle Haupt-Kontenbezeichnungen"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2952 ../intl-scm/guile-strings.c:3042
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5440 ../intl-scm/guile-strings.c:5530
+#: ../intl-scm/guile-strings.c:5620 ../intl-scm/guile-strings.c:5710
msgid ""
"WARNING: There are duplicate TXF codes assigned to some accounts. Only TXF "
"codes with payer sources may be repeated."
@@ -19303,25 +21106,35 @@
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2958 ../intl-scm/guile-strings.c:3048
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5446 ../intl-scm/guile-strings.c:5536
+#: ../intl-scm/guile-strings.c:5626 ../intl-scm/guile-strings.c:5716
msgid "Sub-"
msgstr "Zwischen-"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2960 ../intl-scm/guile-strings.c:3050
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5448 ../intl-scm/guile-strings.c:5538
+#: ../intl-scm/guile-strings.c:5628 ../intl-scm/guile-strings.c:5718
#, c-format
msgid "Period from %s to %s"
msgstr "Zeitraum von %s bis %s"
#. src/report/locale-specific/us/taxtxf.scm
-#: ../intl-scm/guile-strings.c:2962
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#: ../intl-scm/guile-strings.c:5450 ../intl-scm/guile-strings.c:5630
msgid "Blue items are exportable to a .TXF file."
msgstr "Blaue Einträge können in eine .TXF-Datei exportiert werden."
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2964 ../intl-scm/guile-strings.c:3054
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5452 ../intl-scm/guile-strings.c:5542
+#: ../intl-scm/guile-strings.c:5632 ../intl-scm/guile-strings.c:5722
msgid ""
"No Tax Related accounts were found. Go to the Edit->Tax Options dialog to "
"set up tax-related accounts."
@@ -19331,43 +21144,57 @@
"Informationen angeben."
#. src/report/locale-specific/us/taxtxf.scm
-#: ../intl-scm/guile-strings.c:2966
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#: ../intl-scm/guile-strings.c:5454 ../intl-scm/guile-strings.c:5634
msgid "Tax Report & TXF Export"
msgstr "Steuer-Bericht & TXF Export"
#. src/report/locale-specific/us/taxtxf.scm
-#: ../intl-scm/guile-strings.c:2968
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#: ../intl-scm/guile-strings.c:5456 ../intl-scm/guile-strings.c:5636
msgid "Taxable Income / Deductible Expenses / Export to .TXF file"
msgstr "Besteuerte Erträge / Absetzbare Aufwendungen / Exportieren nach .TXF"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2970 ../intl-scm/guile-strings.c:2976
-#: ../intl-scm/guile-strings.c:3060 ../intl-scm/guile-strings.c:3066
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5458 ../intl-scm/guile-strings.c:5464
+#: ../intl-scm/guile-strings.c:5548 ../intl-scm/guile-strings.c:5554
+#: ../intl-scm/guile-strings.c:5638 ../intl-scm/guile-strings.c:5644
+#: ../intl-scm/guile-strings.c:5728 ../intl-scm/guile-strings.c:5734
msgid "Taxable Income / Deductible Expenses"
msgstr "Besteuerte Erträge / Absetzbare Aufwendungen"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2972 ../intl-scm/guile-strings.c:3062
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5460 ../intl-scm/guile-strings.c:5550
+#: ../intl-scm/guile-strings.c:5640 ../intl-scm/guile-strings.c:5730
msgid "This report shows your Taxable Income and Deductible Expenses."
msgstr ""
"Diese Seite zeigt Ihnen zu versteuernde Erträge und absetzbare Aufwendungen."
#. src/report/locale-specific/us/taxtxf.scm
-#: ../intl-scm/guile-strings.c:2974
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#: ../intl-scm/guile-strings.c:5462 ../intl-scm/guile-strings.c:5642
msgid "TXF"
msgstr "TXF"
#. src/report/locale-specific/us/taxtxf.scm
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:2978 ../intl-scm/guile-strings.c:3068
+#. src/report/locale-specific/us/gnucash/report/taxtxf.scm
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5466 ../intl-scm/guile-strings.c:5556
+#: ../intl-scm/guile-strings.c:5646 ../intl-scm/guile-strings.c:5736
msgid "This page shows your Taxable Income and Deductible Expenses."
msgstr ""
"Diese Seite zeigt Ihnen zu versteuernde Erträge und absetzbare Aufwendungen."
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:3052
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5540 ../intl-scm/guile-strings.c:5720
msgid ""
"Blue items are exportable to a German Tax XML file. Press Export to actually "
"export them."
@@ -19376,636 +21203,856 @@
"Klicken Sie »Export«, um den Export durchzuführen."
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:3056
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5544 ../intl-scm/guile-strings.c:5724
msgid "Tax Report & XML Export"
msgstr "Steuer-Bericht & Elster Export"
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:3058
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5546 ../intl-scm/guile-strings.c:5726
msgid "Taxable Income / Deductible Expenses / Export to .XML file"
msgstr ""
"Besteuertes Erträge / Absetzbare Aufwendungen / Exportieren nach Elster-XML"
#. src/report/locale-specific/us/taxtxf-de_DE.scm
-#: ../intl-scm/guile-strings.c:3064
+#. src/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
+#: ../intl-scm/guile-strings.c:5552 ../intl-scm/guile-strings.c:5732
msgid "XML"
msgstr "XML für Elster"
+#. src/import-export/qif-import/qif-import/qif-file.scm
#. src/import-export/qif-import/qif-file.scm
-#: ../intl-scm/guile-strings.c:3116
+#: ../intl-scm/guile-strings.c:5806 ../intl-scm/guile-strings.c:5824
msgid "Loading QIF file..."
msgstr "QIF Datei lesen..."
+#. src/import-export/qif-import/qif-import/qif-to-gnc.scm
#. src/import-export/qif-import/qif-to-gnc.scm
-#: ../intl-scm/guile-strings.c:3118
+#: ../intl-scm/guile-strings.c:5808 ../intl-scm/guile-strings.c:5826
msgid "QIF import: Name conflict with another account."
msgstr "QIF-Import: Namenskonflikt mit bestehendem Konto."
+#. src/import-export/qif-import/qif-import/qif-to-gnc.scm
#. src/import-export/qif-import/qif-to-gnc.scm
-#: ../intl-scm/guile-strings.c:3122
+#: ../intl-scm/guile-strings.c:5812 ../intl-scm/guile-strings.c:5830
msgid "Importing transactions..."
msgstr "Buchungen importieren..."
+#. src/import-export/qif-import/qif-import/qif-parse.scm
#. src/import-export/qif-import/qif-parse.scm
-#: ../intl-scm/guile-strings.c:3124
+#: ../intl-scm/guile-strings.c:5814 ../intl-scm/guile-strings.c:5832
#, c-format
msgid "The file contains an unknown Action '%s'."
msgstr "Diese Datei enthält eine unbekannte Aktion '%s'."
+#. src/import-export/qif-import/qif-import/qif-parse.scm
#. src/import-export/qif-import/qif-parse.scm
-#: ../intl-scm/guile-strings.c:3126
+#: ../intl-scm/guile-strings.c:5816 ../intl-scm/guile-strings.c:5834
msgid "Some transactions may be discarded."
msgstr "Einige Buchungen sind eventuell verworfen worden."
+#. src/import-export/qif-import/qif-import/qif-merge-groups.scm
#. src/import-export/qif-import/qif-merge-groups.scm
-#: ../intl-scm/guile-strings.c:3130
+#: ../intl-scm/guile-strings.c:5820 ../intl-scm/guile-strings.c:5838
msgid "Finding duplicate transactions..."
msgstr "Duplizierte Buchungen finden..."
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3132
+#: ../intl-scm/guile-strings.c:5840
msgid "The name of your business"
msgstr "Der Name Ihres Geschäfts"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3134
+#: ../intl-scm/guile-strings.c:5842
msgid "The address of your business"
msgstr "Die Anschrift Ihres Geschäfts"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3136
+#: ../intl-scm/guile-strings.c:5844
msgid "The contact person to print on invoices"
msgstr ""
"Die/der Ansprechpartner/in, die auf Ihren Rechnungen angegeben werden soll"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3138
+#: ../intl-scm/guile-strings.c:5846
msgid "The phone number of your business"
msgstr "Die Telefonnummer Ihrer Firma"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3140
+#: ../intl-scm/guile-strings.c:5848
msgid "The fax number of your business"
msgstr "Die Faxnummer Ihrer Firma"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3142
+#: ../intl-scm/guile-strings.c:5850
msgid "The email address of your business"
msgstr "Die E-Mail-Adresse Ihrer Firma"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3144
+#: ../intl-scm/guile-strings.c:5852
msgid "The URL address of your website"
msgstr "Die Adresse (URL) Ihrer Webseite"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3146
+#: ../intl-scm/guile-strings.c:5854
msgid "The ID for your company (eg 'Tax-ID: 00-000000)"
msgstr "Eine Nummer ihrer Firma (z.B. Tax-ID: 00-000000)"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3148
+#: ../intl-scm/guile-strings.c:5856
msgid "Default Customer TaxTable"
msgstr "Voreinstellung Kunde Steuertabelle"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3150
+#: ../intl-scm/guile-strings.c:5858
msgid "The default tax table to apply to customers."
msgstr ""
"Voreinstellung für die Steuertabelle, die bei Kunden angewendet werden soll."
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3152
+#: ../intl-scm/guile-strings.c:5860
msgid "Default Vendor TaxTable"
msgstr "Voreinstellung Zulieferer Steuertabelle"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3154
+#: ../intl-scm/guile-strings.c:5862
msgid "The default tax table to apply to vendors."
msgstr ""
"Voreinstellung für die Steuertabelle, die bei Zulieferern angewendet werden "
"soll."
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3156
+#: ../intl-scm/guile-strings.c:5864
msgid "Fancy Date Format"
msgstr "Ausführliches Datumsformat"
#. src/business/business-utils/business-prefs.scm
-#: ../intl-scm/guile-strings.c:3158
+#: ../intl-scm/guile-strings.c:5866
msgid "The default date format used for fancy printed dates"
msgstr "Voreinstellung für Datumsformat im ausführlichen Datumsdruck"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3164
+#: ../intl-scm/guile-strings.c:5872 ../intl-scm/guile-strings.c:5890
msgid "Company Address"
msgstr "Firmenadresse"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3166
+#: ../intl-scm/guile-strings.c:5874 ../intl-scm/guile-strings.c:5892
msgid "Company ID"
msgstr "Firmennummer"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3168
+#: ../intl-scm/guile-strings.c:5876 ../intl-scm/guile-strings.c:5894
msgid "Company Phone Number"
msgstr "Firmentelefonnummer"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3170
+#: ../intl-scm/guile-strings.c:5878 ../intl-scm/guile-strings.c:5896
msgid "Company Fax Number"
msgstr "Firmenfaxnummer"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3172
+#: ../intl-scm/guile-strings.c:5880 ../intl-scm/guile-strings.c:5898
msgid "Company Website URL"
msgstr "Firmenwebseite URL"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3174
+#: ../intl-scm/guile-strings.c:5882 ../intl-scm/guile-strings.c:5900
msgid "Company Email Address"
msgstr "Firmen-E-Mail-Adresse"
+#. src/business/business-utils/gnucash/business-utils.scm
#. src/business/business-utils/business-utils.scm
-#: ../intl-scm/guile-strings.c:3176
+#: ../intl-scm/guile-strings.c:5884 ../intl-scm/guile-strings.c:5902
msgid "Company Contact Person"
msgstr "Firmen Ansprechpartner"
#. src/business/business-reports/payables.scm
-#: ../intl-scm/guile-strings.c:3178
+#. src/business/business-reports/gnucash/report/payables.scm
+#: ../intl-scm/guile-strings.c:5904 ../intl-scm/guile-strings.c:6428
msgid "Payable Account"
msgstr "Verbindlichkeiten Konto"
#. src/business/business-reports/payables.scm
-#: ../intl-scm/guile-strings.c:3180
+#. src/business/business-reports/gnucash/report/payables.scm
+#: ../intl-scm/guile-strings.c:5906 ../intl-scm/guile-strings.c:6430
msgid "The payable account you wish to examine"
msgstr "Folgendes Verbindlichkeiten-Konto wollen Sie untersuchen"
#. src/business/business-reports/payables.scm
-#: ../intl-scm/guile-strings.c:3182 ../intl-scm/guile-strings.c:3184
+#. src/business/business-reports/gnucash/report/payables.scm
+#: ../intl-scm/guile-strings.c:5908 ../intl-scm/guile-strings.c:5910
+#: ../intl-scm/guile-strings.c:6432 ../intl-scm/guile-strings.c:6434
msgid "Payable Aging"
msgstr "Entwicklung Verbindlichkeiten"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3186 ../intl-scm/guile-strings.c:3504
-#: ../intl-scm/guile-strings.c:3762
+#: ../intl-scm/guile-strings.c:5912 ../intl-scm/guile-strings.c:6230
+#: ../intl-scm/guile-strings.c:6436 ../intl-scm/guile-strings.c:6754
+#: ../intl-scm/guile-strings.c:7014 ../intl-scm/guile-strings.c:7254
msgid "Invoice Number"
msgstr "Rechnungsnummer"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3192 ../intl-scm/guile-strings.c:3510
-#: ../intl-scm/guile-strings.c:3768
+#: ../intl-scm/guile-strings.c:5918 ../intl-scm/guile-strings.c:6236
+#: ../intl-scm/guile-strings.c:6442 ../intl-scm/guile-strings.c:6760
+#: ../intl-scm/guile-strings.c:7020 ../intl-scm/guile-strings.c:7260
msgid "Charge Type"
msgstr "Einheit"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3200 ../intl-scm/guile-strings.c:3248
-#: ../intl-scm/guile-strings.c:3518 ../intl-scm/guile-strings.c:3566
-#: ../intl-scm/guile-strings.c:3776 ../intl-scm/guile-strings.c:3824
+#: ../intl-scm/guile-strings.c:5926 ../intl-scm/guile-strings.c:5974
+#: ../intl-scm/guile-strings.c:6244 ../intl-scm/guile-strings.c:6292
+#: ../intl-scm/guile-strings.c:6450 ../intl-scm/guile-strings.c:6498
+#: ../intl-scm/guile-strings.c:6768 ../intl-scm/guile-strings.c:6816
+#: ../intl-scm/guile-strings.c:7028 ../intl-scm/guile-strings.c:7076
+#: ../intl-scm/guile-strings.c:7268 ../intl-scm/guile-strings.c:7316
msgid "Taxable"
msgstr "Steuerwirksam"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3202 ../intl-scm/guile-strings.c:3254
-#: ../intl-scm/guile-strings.c:3520 ../intl-scm/guile-strings.c:3572
-#: ../intl-scm/guile-strings.c:3778 ../intl-scm/guile-strings.c:3830
+#: ../intl-scm/guile-strings.c:5928 ../intl-scm/guile-strings.c:5980
+#: ../intl-scm/guile-strings.c:6246 ../intl-scm/guile-strings.c:6298
+#: ../intl-scm/guile-strings.c:6452 ../intl-scm/guile-strings.c:6504
+#: ../intl-scm/guile-strings.c:6770 ../intl-scm/guile-strings.c:6822
+#: ../intl-scm/guile-strings.c:7030 ../intl-scm/guile-strings.c:7082
+#: ../intl-scm/guile-strings.c:7270 ../intl-scm/guile-strings.c:7322
msgid "Tax Amount"
msgstr "Betrag Steuern"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3208 ../intl-scm/guile-strings.c:3526
-#: ../intl-scm/guile-strings.c:3784
+#: ../intl-scm/guile-strings.c:5934 ../intl-scm/guile-strings.c:6252
+#: ../intl-scm/guile-strings.c:6458 ../intl-scm/guile-strings.c:6776
+#: ../intl-scm/guile-strings.c:7036 ../intl-scm/guile-strings.c:7276
msgid "T"
msgstr "St."
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3210 ../intl-scm/guile-strings.c:3216
-#: ../intl-scm/guile-strings.c:3222 ../intl-scm/guile-strings.c:3228
-#: ../intl-scm/guile-strings.c:3234 ../intl-scm/guile-strings.c:3240
-#: ../intl-scm/guile-strings.c:3246 ../intl-scm/guile-strings.c:3252
-#: ../intl-scm/guile-strings.c:3258 ../intl-scm/guile-strings.c:3436
-#: ../intl-scm/guile-strings.c:3440 ../intl-scm/guile-strings.c:3444
-#: ../intl-scm/guile-strings.c:3448 ../intl-scm/guile-strings.c:3452
-#: ../intl-scm/guile-strings.c:3456 ../intl-scm/guile-strings.c:3528
-#: ../intl-scm/guile-strings.c:3534 ../intl-scm/guile-strings.c:3540
-#: ../intl-scm/guile-strings.c:3546 ../intl-scm/guile-strings.c:3552
-#: ../intl-scm/guile-strings.c:3558 ../intl-scm/guile-strings.c:3564
-#: ../intl-scm/guile-strings.c:3570 ../intl-scm/guile-strings.c:3576
-#: ../intl-scm/guile-strings.c:3786 ../intl-scm/guile-strings.c:3792
-#: ../intl-scm/guile-strings.c:3798 ../intl-scm/guile-strings.c:3804
-#: ../intl-scm/guile-strings.c:3810 ../intl-scm/guile-strings.c:3816
-#: ../intl-scm/guile-strings.c:3822 ../intl-scm/guile-strings.c:3828
-#: ../intl-scm/guile-strings.c:3834
+#: ../intl-scm/guile-strings.c:5936 ../intl-scm/guile-strings.c:5942
+#: ../intl-scm/guile-strings.c:5948 ../intl-scm/guile-strings.c:5954
+#: ../intl-scm/guile-strings.c:5960 ../intl-scm/guile-strings.c:5966
+#: ../intl-scm/guile-strings.c:5972 ../intl-scm/guile-strings.c:5978
+#: ../intl-scm/guile-strings.c:5984 ../intl-scm/guile-strings.c:6162
+#: ../intl-scm/guile-strings.c:6166 ../intl-scm/guile-strings.c:6170
+#: ../intl-scm/guile-strings.c:6174 ../intl-scm/guile-strings.c:6178
+#: ../intl-scm/guile-strings.c:6182 ../intl-scm/guile-strings.c:6254
+#: ../intl-scm/guile-strings.c:6260 ../intl-scm/guile-strings.c:6266
+#: ../intl-scm/guile-strings.c:6272 ../intl-scm/guile-strings.c:6278
+#: ../intl-scm/guile-strings.c:6284 ../intl-scm/guile-strings.c:6290
+#: ../intl-scm/guile-strings.c:6296 ../intl-scm/guile-strings.c:6302
+#: ../intl-scm/guile-strings.c:6460 ../intl-scm/guile-strings.c:6466
+#: ../intl-scm/guile-strings.c:6472 ../intl-scm/guile-strings.c:6478
+#: ../intl-scm/guile-strings.c:6484 ../intl-scm/guile-strings.c:6490
+#: ../intl-scm/guile-strings.c:6496 ../intl-scm/guile-strings.c:6502
+#: ../intl-scm/guile-strings.c:6508 ../intl-scm/guile-strings.c:6686
+#: ../intl-scm/guile-strings.c:6690 ../intl-scm/guile-strings.c:6694
+#: ../intl-scm/guile-strings.c:6698 ../intl-scm/guile-strings.c:6702
+#: ../intl-scm/guile-strings.c:6706 ../intl-scm/guile-strings.c:6778
+#: ../intl-scm/guile-strings.c:6784 ../intl-scm/guile-strings.c:6790
+#: ../intl-scm/guile-strings.c:6796 ../intl-scm/guile-strings.c:6802
+#: ../intl-scm/guile-strings.c:6808 ../intl-scm/guile-strings.c:6814
+#: ../intl-scm/guile-strings.c:6820 ../intl-scm/guile-strings.c:6826
+#: ../intl-scm/guile-strings.c:7038 ../intl-scm/guile-strings.c:7044
+#: ../intl-scm/guile-strings.c:7050 ../intl-scm/guile-strings.c:7056
+#: ../intl-scm/guile-strings.c:7062 ../intl-scm/guile-strings.c:7068
+#: ../intl-scm/guile-strings.c:7074 ../intl-scm/guile-strings.c:7080
+#: ../intl-scm/guile-strings.c:7086 ../intl-scm/guile-strings.c:7278
+#: ../intl-scm/guile-strings.c:7284 ../intl-scm/guile-strings.c:7290
+#: ../intl-scm/guile-strings.c:7296 ../intl-scm/guile-strings.c:7302
+#: ../intl-scm/guile-strings.c:7308 ../intl-scm/guile-strings.c:7314
+#: ../intl-scm/guile-strings.c:7320 ../intl-scm/guile-strings.c:7326
msgid "Display Columns"
msgstr "Spalten anzeigen"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3226 ../intl-scm/guile-strings.c:3544
-#: ../intl-scm/guile-strings.c:3802
+#: ../intl-scm/guile-strings.c:5952 ../intl-scm/guile-strings.c:6270
+#: ../intl-scm/guile-strings.c:6476 ../intl-scm/guile-strings.c:6794
+#: ../intl-scm/guile-strings.c:7054 ../intl-scm/guile-strings.c:7294
msgid "Display the action?"
msgstr "Aktion anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3232 ../intl-scm/guile-strings.c:3550
-#: ../intl-scm/guile-strings.c:3808
+#: ../intl-scm/guile-strings.c:5958 ../intl-scm/guile-strings.c:6276
+#: ../intl-scm/guile-strings.c:6482 ../intl-scm/guile-strings.c:6800
+#: ../intl-scm/guile-strings.c:7060 ../intl-scm/guile-strings.c:7300
msgid "Display the quantity of items?"
msgstr "Anzeigen Anzahl der Einträge?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3238 ../intl-scm/guile-strings.c:3556
-#: ../intl-scm/guile-strings.c:3814
+#: ../intl-scm/guile-strings.c:5964 ../intl-scm/guile-strings.c:6282
+#: ../intl-scm/guile-strings.c:6488 ../intl-scm/guile-strings.c:6806
+#: ../intl-scm/guile-strings.c:7066 ../intl-scm/guile-strings.c:7306
msgid "Display the price per item?"
msgstr "Den Preis pro Artikel anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3244 ../intl-scm/guile-strings.c:3562
-#: ../intl-scm/guile-strings.c:3820
+#: ../intl-scm/guile-strings.c:5970 ../intl-scm/guile-strings.c:6288
+#: ../intl-scm/guile-strings.c:6494 ../intl-scm/guile-strings.c:6812
+#: ../intl-scm/guile-strings.c:7072 ../intl-scm/guile-strings.c:7312
msgid "Display the entry's discount"
msgstr "Anzeigen der Ermäßigung des Postens"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3250 ../intl-scm/guile-strings.c:3568
-#: ../intl-scm/guile-strings.c:3826
+#: ../intl-scm/guile-strings.c:5976 ../intl-scm/guile-strings.c:6294
+#: ../intl-scm/guile-strings.c:6500 ../intl-scm/guile-strings.c:6818
+#: ../intl-scm/guile-strings.c:7078 ../intl-scm/guile-strings.c:7318
msgid "Display the entry's taxable status"
msgstr "Anzeigen der Steuerwirksamkeit des Postens"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3256 ../intl-scm/guile-strings.c:3574
-#: ../intl-scm/guile-strings.c:3832
+#: ../intl-scm/guile-strings.c:5982 ../intl-scm/guile-strings.c:6300
+#: ../intl-scm/guile-strings.c:6506 ../intl-scm/guile-strings.c:6824
+#: ../intl-scm/guile-strings.c:7084 ../intl-scm/guile-strings.c:7324
msgid "Display each entry's total total tax"
msgstr "Anzeigen des gesamten Steueranteils jedes Postens"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3262 ../intl-scm/guile-strings.c:3580
-#: ../intl-scm/guile-strings.c:3838
+#: ../intl-scm/guile-strings.c:5988 ../intl-scm/guile-strings.c:6306
+#: ../intl-scm/guile-strings.c:6512 ../intl-scm/guile-strings.c:6830
+#: ../intl-scm/guile-strings.c:7090 ../intl-scm/guile-strings.c:7330
msgid "Display the entry's value"
msgstr "Anzeigen des Betrags des Postens"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3266 ../intl-scm/guile-strings.c:3602
-#: ../intl-scm/guile-strings.c:3842
+#: ../intl-scm/guile-strings.c:5992 ../intl-scm/guile-strings.c:6328
+#: ../intl-scm/guile-strings.c:6516 ../intl-scm/guile-strings.c:6852
+#: ../intl-scm/guile-strings.c:7094 ../intl-scm/guile-strings.c:7334
msgid "Individual Taxes"
msgstr "Einzelne Steueranteile"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3268 ../intl-scm/guile-strings.c:3604
-#: ../intl-scm/guile-strings.c:3844
+#: ../intl-scm/guile-strings.c:5994 ../intl-scm/guile-strings.c:6330
+#: ../intl-scm/guile-strings.c:6518 ../intl-scm/guile-strings.c:6854
+#: ../intl-scm/guile-strings.c:7096 ../intl-scm/guile-strings.c:7336
msgid "Display all the individual taxes?"
msgstr "Alle einzelnen Steueranteile anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3278 ../intl-scm/guile-strings.c:3620
-#: ../intl-scm/guile-strings.c:3854
+#: ../intl-scm/guile-strings.c:6004 ../intl-scm/guile-strings.c:6346
+#: ../intl-scm/guile-strings.c:6528 ../intl-scm/guile-strings.c:6870
+#: ../intl-scm/guile-strings.c:7106 ../intl-scm/guile-strings.c:7346
msgid "References"
msgstr "Referenz"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3280 ../intl-scm/guile-strings.c:3622
-#: ../intl-scm/guile-strings.c:3856
+#: ../intl-scm/guile-strings.c:6006 ../intl-scm/guile-strings.c:6348
+#: ../intl-scm/guile-strings.c:6530 ../intl-scm/guile-strings.c:6872
+#: ../intl-scm/guile-strings.c:7108 ../intl-scm/guile-strings.c:7348
msgid "Display the invoice references?"
msgstr "Rechnungsreferenz anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3284 ../intl-scm/guile-strings.c:3626
-#: ../intl-scm/guile-strings.c:3860
+#: ../intl-scm/guile-strings.c:6010 ../intl-scm/guile-strings.c:6352
+#: ../intl-scm/guile-strings.c:6534 ../intl-scm/guile-strings.c:6876
+#: ../intl-scm/guile-strings.c:7112 ../intl-scm/guile-strings.c:7352
msgid "Billing Terms"
msgstr "Zahlungsbedingungen"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3286 ../intl-scm/guile-strings.c:3628
-#: ../intl-scm/guile-strings.c:3862
+#: ../intl-scm/guile-strings.c:6012 ../intl-scm/guile-strings.c:6354
+#: ../intl-scm/guile-strings.c:6536 ../intl-scm/guile-strings.c:6878
+#: ../intl-scm/guile-strings.c:7114 ../intl-scm/guile-strings.c:7354
msgid "Display the invoice billing terms?"
msgstr "Zahlungsbedingungen der Rechnung anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3292 ../intl-scm/guile-strings.c:3634
-#: ../intl-scm/guile-strings.c:3868
+#: ../intl-scm/guile-strings.c:6018 ../intl-scm/guile-strings.c:6360
+#: ../intl-scm/guile-strings.c:6542 ../intl-scm/guile-strings.c:6884
+#: ../intl-scm/guile-strings.c:7120 ../intl-scm/guile-strings.c:7360
msgid "Display the billing id?"
msgstr "Rechnungsnummer anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3298 ../intl-scm/guile-strings.c:3640
-#: ../intl-scm/guile-strings.c:3874
+#: ../intl-scm/guile-strings.c:6024 ../intl-scm/guile-strings.c:6366
+#: ../intl-scm/guile-strings.c:6548 ../intl-scm/guile-strings.c:6890
+#: ../intl-scm/guile-strings.c:7126 ../intl-scm/guile-strings.c:7366
msgid "Display the invoice notes?"
msgstr "Rechnungsbemerkungen anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3302 ../intl-scm/guile-strings.c:3644
-#: ../intl-scm/guile-strings.c:3878
+#: ../intl-scm/guile-strings.c:6028 ../intl-scm/guile-strings.c:6370
+#: ../intl-scm/guile-strings.c:6552 ../intl-scm/guile-strings.c:6894
+#: ../intl-scm/guile-strings.c:7130 ../intl-scm/guile-strings.c:7370
msgid "Payments"
msgstr "Zahlungen"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3304 ../intl-scm/guile-strings.c:3646
-#: ../intl-scm/guile-strings.c:3880
+#: ../intl-scm/guile-strings.c:6030 ../intl-scm/guile-strings.c:6372
+#: ../intl-scm/guile-strings.c:6554 ../intl-scm/guile-strings.c:6896
+#: ../intl-scm/guile-strings.c:7132 ../intl-scm/guile-strings.c:7372
msgid "Display the payments applied to this invoice?"
msgstr "Die Zahlungen in dieser Rechnung anzeigen?"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3308
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6034 ../intl-scm/guile-strings.c:6558
msgid "Minimum # of entries"
msgstr "Mindestanzahl Einträge"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3310
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6036 ../intl-scm/guile-strings.c:6560
msgid "The minimum number of invoice entries to display. (-1)"
msgstr ""
"Die Mindestanzahl Einträge einer Rechnung, die angezeigt werden sollen. (-1)"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3314 ../intl-scm/guile-strings.c:3656
-#: ../intl-scm/guile-strings.c:3884
+#: ../intl-scm/guile-strings.c:6040 ../intl-scm/guile-strings.c:6382
+#: ../intl-scm/guile-strings.c:6564 ../intl-scm/guile-strings.c:6906
+#: ../intl-scm/guile-strings.c:7136 ../intl-scm/guile-strings.c:7376
msgid "Extra Notes"
msgstr "Zusätzliche Bemerkungen"
#. src/business/business-reports/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3316 ../intl-scm/guile-strings.c:3886
+#: ../intl-scm/guile-strings.c:6042 ../intl-scm/guile-strings.c:6566
+#: ../intl-scm/guile-strings.c:7138 ../intl-scm/guile-strings.c:7378
msgid "Extra notes to put on the invoice"
msgstr "Zusätzliche Bemerkungen, die auf die Rechnung gedruckt werden sollen"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3320
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6046 ../intl-scm/guile-strings.c:6570
msgid "Payable to"
msgstr "Zahlungsempfänger"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3322
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6048 ../intl-scm/guile-strings.c:6572
msgid "Display the Payable to: information"
msgstr "Die Zahlungsempfänger-Information anzeigen"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3326
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6052 ../intl-scm/guile-strings.c:6576
msgid "Payable to string"
msgstr "Angabe Zahlungsempfänger"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3328
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6054 ../intl-scm/guile-strings.c:6578
msgid "The phrase for specifying to whom payments should be made"
msgstr ""
"Die Angabe des Zahlungsempfängers, wie sie auf die Rechnung gedruckt werden "
"soll"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3330
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6056 ../intl-scm/guile-strings.c:6580
msgid "Make all cheques Payable to"
msgstr "Alle Schecks sollen auf folgenden Zahlungsempfänger ausgestellt werden"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3334
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6060 ../intl-scm/guile-strings.c:6584
msgid "Company contact"
msgstr "Name Ansprechpartner"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3336
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6062 ../intl-scm/guile-strings.c:6586
msgid "Display the Company contact information"
msgstr "Den Ansprechpartner einer Firma anzeigen"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3340
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6066 ../intl-scm/guile-strings.c:6590
msgid "Company contact string"
msgstr "Erklärung Ansprechpartner"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3342
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6068 ../intl-scm/guile-strings.c:6592
msgid "The phrase used to introduce the company contact"
msgstr "Der Satz, mit dem der Ansprechpartner vorgestellt wird"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3344
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6070 ../intl-scm/guile-strings.c:6594
msgid "Direct all inquiries to"
msgstr "Ansprechpartner"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3346 ../intl-scm/guile-strings.c:3418
-#: ../intl-scm/guile-strings.c:3668 ../intl-scm/guile-strings.c:3896
+#: ../intl-scm/guile-strings.c:6072 ../intl-scm/guile-strings.c:6144
+#: ../intl-scm/guile-strings.c:6394 ../intl-scm/guile-strings.c:6596
+#: ../intl-scm/guile-strings.c:6668 ../intl-scm/guile-strings.c:6918
+#: ../intl-scm/guile-strings.c:7148 ../intl-scm/guile-strings.c:7388
msgid "Payment, thank you"
msgstr "Vielen Dank für Ihre Zahlung"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3352 ../intl-scm/guile-strings.c:3674
-#: ../intl-scm/guile-strings.c:3902
+#: ../intl-scm/guile-strings.c:6078 ../intl-scm/guile-strings.c:6400
+#: ../intl-scm/guile-strings.c:6602 ../intl-scm/guile-strings.c:6924
+#: ../intl-scm/guile-strings.c:7154 ../intl-scm/guile-strings.c:7394
msgid "Amount Due"
msgstr "Fälliger Betrag"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3354 ../intl-scm/guile-strings.c:3676
-#: ../intl-scm/guile-strings.c:3904
+#: ../intl-scm/guile-strings.c:6080 ../intl-scm/guile-strings.c:6402
+#: ../intl-scm/guile-strings.c:6604 ../intl-scm/guile-strings.c:6926
+#: ../intl-scm/guile-strings.c:7156 ../intl-scm/guile-strings.c:7396
msgid "REF"
msgstr "Referenz"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3356
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6082 ../intl-scm/guile-strings.c:6606
msgid "INVOICE"
msgstr "Rechnung"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3358
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6084 ../intl-scm/guile-strings.c:6608
msgid "Phone:"
msgstr "Telefon:"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3360
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6086 ../intl-scm/guile-strings.c:6610
msgid "Fax:"
msgstr "Fax:"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3362
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6088 ../intl-scm/guile-strings.c:6612
msgid "Web:"
msgstr "WWW:"
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3370 ../intl-scm/guile-strings.c:3684
-#: ../intl-scm/guile-strings.c:3912
+#: ../intl-scm/guile-strings.c:6096 ../intl-scm/guile-strings.c:6410
+#: ../intl-scm/guile-strings.c:6620 ../intl-scm/guile-strings.c:6934
+#: ../intl-scm/guile-strings.c:7164 ../intl-scm/guile-strings.c:7404
#, c-format
msgid "%s #%d"
msgstr "%s Nr. %d"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3372
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6098 ../intl-scm/guile-strings.c:6622
#, c-format
msgid "Invoice # %d"
msgstr "Rechnung Nr. %d"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3374
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6100 ../intl-scm/guile-strings.c:6624
msgid "Invoice Date"
msgstr "Rechnungsdatum"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3376
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6102 ../intl-scm/guile-strings.c:6626
msgid "Due Date"
msgstr "Fälligkeitsdatum"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3378
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6104 ../intl-scm/guile-strings.c:6628
msgid "<br>Invoice in progress...."
msgstr "Rechnung in Bearbeitung..."
#. src/business/business-reports/fancy-invoice.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3384 ../intl-scm/guile-strings.c:3694
-#: ../intl-scm/guile-strings.c:3924
+#: ../intl-scm/guile-strings.c:6110 ../intl-scm/guile-strings.c:6420
+#: ../intl-scm/guile-strings.c:6634 ../intl-scm/guile-strings.c:6944
+#: ../intl-scm/guile-strings.c:7176 ../intl-scm/guile-strings.c:7416
msgid "No Valid Invoice Selected"
msgstr "Keine gültige Rechnung ausgewählt"
#. src/business/business-reports/fancy-invoice.scm
-#: ../intl-scm/guile-strings.c:3386 ../intl-scm/guile-strings.c:3388
-#: ../intl-scm/guile-strings.c:3390
+#. src/business/business-reports/gnucash/report/fancy-invoice.scm
+#: ../intl-scm/guile-strings.c:6112 ../intl-scm/guile-strings.c:6114
+#: ../intl-scm/guile-strings.c:6116 ../intl-scm/guile-strings.c:6636
+#: ../intl-scm/guile-strings.c:6638 ../intl-scm/guile-strings.c:6640
msgid "Fancy Invoice"
msgstr "Elegante Rechnung"
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3410 ../intl-scm/guile-strings.c:3748
+#: ../intl-scm/guile-strings.c:6136 ../intl-scm/guile-strings.c:6660
+#: ../intl-scm/guile-strings.c:6998 ../intl-scm/guile-strings.c:7238
msgid "0-30 days"
msgstr "0-30 Tage"
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3412 ../intl-scm/guile-strings.c:3750
+#: ../intl-scm/guile-strings.c:6138 ../intl-scm/guile-strings.c:6662
+#: ../intl-scm/guile-strings.c:7000 ../intl-scm/guile-strings.c:7240
msgid "31-60 days"
msgstr "31-60 Tage"
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3414 ../intl-scm/guile-strings.c:3752
+#: ../intl-scm/guile-strings.c:6140 ../intl-scm/guile-strings.c:6664
+#: ../intl-scm/guile-strings.c:7002 ../intl-scm/guile-strings.c:7242
msgid "61-90 days"
msgstr "61-90 Tage"
#. src/business/business-reports/owner-report.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3416 ../intl-scm/guile-strings.c:3754
+#: ../intl-scm/guile-strings.c:6142 ../intl-scm/guile-strings.c:6666
+#: ../intl-scm/guile-strings.c:7004 ../intl-scm/guile-strings.c:7244
msgid "91+ days"
msgstr "Mehr als 91 Tage"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3424
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6150 ../intl-scm/guile-strings.c:6674
msgid "Total Credit"
msgstr "Gesamt Gutschrift"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3426
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6152 ../intl-scm/guile-strings.c:6676
msgid "Total Due"
msgstr "Gesamt fällig"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3428
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6154 ../intl-scm/guile-strings.c:6678
msgid "The company for this report"
msgstr "Die Firma dieses Berichts"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3430
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6156 ../intl-scm/guile-strings.c:6680
msgid "The account to search for transactions"
msgstr "Das Konto, in dem nach Buchungen gesucht werden soll"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3438 ../intl-scm/guile-strings.c:3442
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6164 ../intl-scm/guile-strings.c:6168
+#: ../intl-scm/guile-strings.c:6688 ../intl-scm/guile-strings.c:6692
msgid "Display the transaction date?"
msgstr "Anzeigen des Buchungsdatum?"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3446
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6172 ../intl-scm/guile-strings.c:6696
msgid "Display the transaction reference?"
msgstr "Anzeigen der Buchungsreferenz?"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3450
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6176 ../intl-scm/guile-strings.c:6700
msgid "Display the transaction type?"
msgstr "Anzeigen der Buchungsart?"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3454
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6180 ../intl-scm/guile-strings.c:6704
msgid "Display the transaction description?"
msgstr "Anzeigen der Buchungsbeschreibung?"
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3458 ../intl-scm/guile-strings.c:3486
-#: ../intl-scm/guile-strings.c:3664 ../intl-scm/guile-strings.c:3892
+#: ../intl-scm/guile-strings.c:6184 ../intl-scm/guile-strings.c:6212
+#: ../intl-scm/guile-strings.c:6390 ../intl-scm/guile-strings.c:6708
+#: ../intl-scm/guile-strings.c:6736 ../intl-scm/guile-strings.c:6914
+#: ../intl-scm/guile-strings.c:7144 ../intl-scm/guile-strings.c:7384
msgid "Today Date Format"
msgstr "Datumsformat heute"
#. src/business/business-reports/owner-report.scm
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3460 ../intl-scm/guile-strings.c:3666
-#: ../intl-scm/guile-strings.c:3894
+#: ../intl-scm/guile-strings.c:6186 ../intl-scm/guile-strings.c:6392
+#: ../intl-scm/guile-strings.c:6710 ../intl-scm/guile-strings.c:6916
+#: ../intl-scm/guile-strings.c:7146 ../intl-scm/guile-strings.c:7386
msgid "The format for the date->string conversion for today's date."
msgstr "Das Datumsformat für den Ausdruck des heutigen Datums."
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3466
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6192 ../intl-scm/guile-strings.c:6716
msgid "Expense Report"
msgstr "Bericht Aufwendungen"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3480 ../intl-scm/guile-strings.c:3482
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6206 ../intl-scm/guile-strings.c:6208
+#: ../intl-scm/guile-strings.c:6730 ../intl-scm/guile-strings.c:6732
msgid "Report:"
msgstr "Bericht:"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3484
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#. src/business/business-reports/gnucash/report/aging.scm
+#. src/business/business-reports/aging.scm
+#: ../intl-scm/guile-strings.c:6210 ../intl-scm/guile-strings.c:6734
+#: ../intl-scm/guile-strings.c:7012 ../intl-scm/guile-strings.c:7252
msgid ""
"No valid account selected. Click on the Options button and select the "
"account to use."
@@ -20014,7 +22061,8 @@
"wählen."
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3490
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6216 ../intl-scm/guile-strings.c:6740
#, c-format
msgid "No valid %s selected. Click on the Options button to select a company."
msgstr ""
@@ -20022,117 +22070,146 @@
"wählen."
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3492 ../intl-scm/guile-strings.c:3498
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6218 ../intl-scm/guile-strings.c:6224
+#: ../intl-scm/guile-strings.c:6742 ../intl-scm/guile-strings.c:6748
msgid "Customer Report"
msgstr "Kundenbericht"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3494 ../intl-scm/guile-strings.c:3500
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6220 ../intl-scm/guile-strings.c:6226
+#: ../intl-scm/guile-strings.c:6744 ../intl-scm/guile-strings.c:6750
msgid "Vendor Report"
msgstr "Zuliefererbericht"
#. src/business/business-reports/owner-report.scm
-#: ../intl-scm/guile-strings.c:3496 ../intl-scm/guile-strings.c:3502
+#. src/business/business-reports/gnucash/report/owner-report.scm
+#: ../intl-scm/guile-strings.c:6222 ../intl-scm/guile-strings.c:6228
+#: ../intl-scm/guile-strings.c:6746 ../intl-scm/guile-strings.c:6752
msgid "Employee Report"
msgstr "Mitarbeiterbericht"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3584
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6310 ../intl-scm/guile-strings.c:6834
msgid "My Company"
msgstr "Eigene Firma"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3586
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6312 ../intl-scm/guile-strings.c:6836
msgid "Display my company name and address?"
msgstr "Eigenen Firmenname und Adresse anzeigen?"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3590
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6316 ../intl-scm/guile-strings.c:6840
msgid "My Company ID"
msgstr "Eigene Firmennummer"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3592
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6318 ../intl-scm/guile-strings.c:6842
msgid "Display my company ID?"
msgstr "Eigene Firmennummer anzeigen?"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3598
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6324 ../intl-scm/guile-strings.c:6848
msgid "Display due date?"
msgstr "Fälligkeitsdatum anzeigen?"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3616
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6342 ../intl-scm/guile-strings.c:6866
msgid "Display the subtotals?"
msgstr "Zwischensalden anzeigen?"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3650
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6376 ../intl-scm/guile-strings.c:6900
msgid "Invoice Width"
msgstr "Rechnungsbreite"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3652
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6378 ../intl-scm/guile-strings.c:6902
msgid "The minimum width of the invoice."
msgstr "Minimale Breite der Rechnung."
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3654 ../intl-scm/guile-strings.c:3662
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6380 ../intl-scm/guile-strings.c:6388
+#: ../intl-scm/guile-strings.c:6904 ../intl-scm/guile-strings.c:6912
msgid "Text"
msgstr "Text"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3658
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6384 ../intl-scm/guile-strings.c:6908
msgid "Extra notes to put on the invoice (simple HTML is accepted)"
msgstr ""
"Zusätzliche Bemerkungen, die auf die Rechnung gedruckt werden sollen "
"(einfaches HTML möglich)"
#. src/business/business-reports/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3660 ../intl-scm/guile-strings.c:3888
+#: ../intl-scm/guile-strings.c:6386 ../intl-scm/guile-strings.c:6910
+#: ../intl-scm/guile-strings.c:7140 ../intl-scm/guile-strings.c:7380
msgid "Thank you for your patronage"
msgstr "Vielen Dank für Ihre Bestellung!"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3686
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6412 ../intl-scm/guile-strings.c:6936
#, c-format
msgid "Invoice #%d"
msgstr "Rechnung Nr. %d"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3688
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6414 ../intl-scm/guile-strings.c:6938
msgid "INVOICE NOT POSTED"
msgstr "Rechnung nicht gebucht"
#. src/business/business-reports/easy-invoice.scm
-#: ../intl-scm/guile-strings.c:3696 ../intl-scm/guile-strings.c:3698
-#: ../intl-scm/guile-strings.c:3700
+#. src/business/business-reports/gnucash/report/easy-invoice.scm
+#: ../intl-scm/guile-strings.c:6422 ../intl-scm/guile-strings.c:6424
+#: ../intl-scm/guile-strings.c:6426 ../intl-scm/guile-strings.c:6946
+#: ../intl-scm/guile-strings.c:6948 ../intl-scm/guile-strings.c:6950
msgid "Easy Invoice"
msgstr "Einfache Rechnung"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3704
+#: ../intl-scm/guile-strings.c:6954 ../intl-scm/guile-strings.c:7194
msgid "Sort By"
msgstr "Sortiere nach"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3706
+#: ../intl-scm/guile-strings.c:6956 ../intl-scm/guile-strings.c:7196
msgid "Sort Order"
msgstr "Sortierreihenfolge"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3712
+#: ../intl-scm/guile-strings.c:6962 ../intl-scm/guile-strings.c:7202
msgid "Show Multi-currency Totals?"
msgstr "Multi-Währung Gesamt anzeigen?"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3714
+#: ../intl-scm/guile-strings.c:6964 ../intl-scm/guile-strings.c:7204
msgid "Show zero balance items?"
msgstr "Nullsalden anzeigen?"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3716
+#: ../intl-scm/guile-strings.c:6966 ../intl-scm/guile-strings.c:7206
#, c-format
msgid ""
"Transactions relating to '%s' contain more than one currency. This report "
@@ -20141,65 +22218,77 @@
"Die Buchungen mit Firma »%s« enthält mehr als eine Währung. Dieser Bericht "
"ist für diese Möglichkeit nicht ausgelegt."
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3718
+#: ../intl-scm/guile-strings.c:6968 ../intl-scm/guile-strings.c:7208
msgid "Sort companys by"
msgstr "Firmen sortieren nach"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3722
+#: ../intl-scm/guile-strings.c:6972 ../intl-scm/guile-strings.c:7212
msgid "Name of the company"
msgstr "Name der Organisation/Firma"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3724
+#: ../intl-scm/guile-strings.c:6974 ../intl-scm/guile-strings.c:7214
msgid "Total Owed"
msgstr "Gesamter offener Betrag"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3726
+#: ../intl-scm/guile-strings.c:6976 ../intl-scm/guile-strings.c:7216
msgid "Total amount owed to/from Company"
msgstr "Gesamter offener Betrag von/an Firma"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3728
+#: ../intl-scm/guile-strings.c:6978 ../intl-scm/guile-strings.c:7218
msgid "Bracket Total Owed"
msgstr "Intervall Gesamter offener Betrag"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3730
+#: ../intl-scm/guile-strings.c:6980 ../intl-scm/guile-strings.c:7220
msgid "Amount owed in oldest bracket - if same go to next oldest"
msgstr ""
"Offener Betrag in ältestem Intervall. Falls identisch, wird nächstältestes "
"angezeigt"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3732
+#: ../intl-scm/guile-strings.c:6982 ../intl-scm/guile-strings.c:7222
msgid "Sort order"
msgstr "Sortierreihenfolge"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3734
+#: ../intl-scm/guile-strings.c:6984 ../intl-scm/guile-strings.c:7224
msgid "Increasing"
msgstr "Aufsteigend"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3736
+#: ../intl-scm/guile-strings.c:6986 ../intl-scm/guile-strings.c:7226
msgid "0 -> $999,999.99, A->Z"
msgstr "0,00 -> 9.999,99; A->Z"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3738
+#: ../intl-scm/guile-strings.c:6988 ../intl-scm/guile-strings.c:7228
msgid "Decreasing"
msgstr "Absteigend"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3740
+#: ../intl-scm/guile-strings.c:6990 ../intl-scm/guile-strings.c:7230
msgid "$999,999.99 -> $0, Z->A"
msgstr "9.999,99 -> 0,00; Z->A"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3742
+#: ../intl-scm/guile-strings.c:6992 ../intl-scm/guile-strings.c:7232
msgid ""
"Show multi-currency totals. If not selected, convert all totals to report "
"currency"
@@ -20207,39 +22296,48 @@
"Summen in mehreren Währungen anzeigen. Falls nicht aktiviert, werden alle "
"Summen in die Berichtswährung umgerechnet"
+#. src/business/business-reports/gnucash/report/aging.scm
#. src/business/business-reports/aging.scm
-#: ../intl-scm/guile-strings.c:3744
+#: ../intl-scm/guile-strings.c:6994 ../intl-scm/guile-strings.c:7234
msgid "Show all vendors/customers even if they have a zero balance."
msgstr "Alle Kunden/Lieferanten anzeigen, auch wenn sie den Saldo Null haben."
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3914
+#: ../intl-scm/guile-strings.c:7166 ../intl-scm/guile-strings.c:7406
msgid "Invoice Date"
msgstr "Rechnungsdatum"
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3918
+#: ../intl-scm/guile-strings.c:7170 ../intl-scm/guile-strings.c:7410
msgid "Invoice in progress...."
msgstr "Rechnung in Bearbeitung..."
+#. src/business/business-reports/gnucash/report/invoice.scm
#. src/business/business-reports/invoice.scm
-#: ../intl-scm/guile-strings.c:3926 ../intl-scm/guile-strings.c:3928
-#: ../intl-scm/guile-strings.c:3930
+#: ../intl-scm/guile-strings.c:7178 ../intl-scm/guile-strings.c:7180
+#: ../intl-scm/guile-strings.c:7182 ../intl-scm/guile-strings.c:7418
+#: ../intl-scm/guile-strings.c:7420 ../intl-scm/guile-strings.c:7422
msgid "Printable Invoice"
msgstr "Druckbare Rechnung"
+#. src/business/business-reports/gnucash/report/receivables.scm
#. src/business/business-reports/receivables.scm
-#: ../intl-scm/guile-strings.c:3932
+#: ../intl-scm/guile-strings.c:7184 ../intl-scm/guile-strings.c:7424
msgid "Receivables Account"
msgstr "Forderungen Konto"
+#. src/business/business-reports/gnucash/report/receivables.scm
#. src/business/business-reports/receivables.scm
-#: ../intl-scm/guile-strings.c:3934
+#: ../intl-scm/guile-strings.c:7186 ../intl-scm/guile-strings.c:7426
msgid "The receivables account you wish to examine"
msgstr "Folgendes Forderungen-Konto wollen Sie untersuchen"
+#. src/business/business-reports/gnucash/report/receivables.scm
#. src/business/business-reports/receivables.scm
-#: ../intl-scm/guile-strings.c:3936 ../intl-scm/guile-strings.c:3938
+#: ../intl-scm/guile-strings.c:7188 ../intl-scm/guile-strings.c:7190
+#: ../intl-scm/guile-strings.c:7428 ../intl-scm/guile-strings.c:7430
msgid "Receivable Aging"
msgstr "Entwicklung Forderungen"
@@ -20247,11 +22345,8 @@
msgid ""
"Warning!! This is a DEVELOPMENT version of GnuCash. It probably has lots of "
"bugs and unstable features! If you are looking for a stable personal finance "
-"application, you should use the latest release of GnuCash 1.8."
+"application, you should use the latest release of GnuCash 2.0."
msgstr ""
-"Vorsicht: Das ist eine Entwicklungsversion von GnuCash. Hier können sich "
-"alle möglichen Fehler drin rumtreiben. Wenn Sie eine stabile Version suchen, "
-"sollten sie die letzte Version von GnuCash 1.8.x benutzen!"
#: ../doc/tip_of_the_day.list.in:6
msgid ""
@@ -20318,13 +22413,13 @@
msgid ""
"To enter multiple-split transactions such as a paycheck with multiple "
"deductions, click the Split button in the tool bar. Alternatively, in the "
-"View -> Style menu, you can choose the register style Auto-Split Ledger or "
+"View menu, you can choose the register style Auto-Split Ledger or "
"Transaction Journal."
msgstr ""
"Um Buchungssätze mit mehr als zwei Buchungsteilen einzugeben (z.B. eine "
"Gehaltszahlung mit mehreren Abzügen), drücken Sie den »Vollständig«-Knopf in "
-"der Werkzeugleiste. Alternativ können Sie auch im Menü Ansicht -> Buchung "
-"die Buchungsansicht »Aktive vollständig« oder »Vollständig« wählen."
+"der Werkzeugleiste. Alternativ können Sie auch im Menü Ansicht die "
+"Buchungsansicht »Aktive vollständig« oder »Vollständig« wählen."
#: ../doc/tip_of_the_day.list.in:36
msgid ""
@@ -20387,6 +22482,12 @@
#: ../doc/tip_of_the_day.list.in:60
msgid ""
+"To switch between multiple tabs in the main window, press Control+Alt+Page "
+"Up/Down."
+msgstr ""
+
+#: ../doc/tip_of_the_day.list.in:63
+msgid ""
"In the reconcile window, you can press the spacebar to mark transactions as "
"reconciled. You can also press Tab and Shift-Tab to move between deposits "
"and withdrawals."
@@ -20395,7 +22496,7 @@
"»Abgeglichen« markieren. Um zwischen Haben und Soll zu wechseln, können Sie "
"die Tab (die Tabulatortaste) und Umschalt-Tab drücken."
-#: ../doc/tip_of_the_day.list.in:64
+#: ../doc/tip_of_the_day.list.in:67
msgid ""
"To transfer funds between accounts with different currencies, click on the "
"Transfer button in the register toolbar, select the accounts, and the "
@@ -20407,7 +22508,7 @@
"die zusätzlichen Optionen für Währungstransaktionen werden automatisch "
"aktiviert."
-#: ../doc/tip_of_the_day.list.in:69
+#: ../doc/tip_of_the_day.list.in:72
msgid ""
"You can pack multiple reports into a single window, providing all the "
"financial information you want at a glance. To do so, use the Sample & "
@@ -20417,7 +22518,7 @@
"alle Ihre Informationen im Blick zu haben. Benutzen Sie dafür den Bericht "
"Beispiele -> »Benutzerdefiniert Mehrspaltig«."
-#: ../doc/tip_of_the_day.list.in:74
+#: ../doc/tip_of_the_day.list.in:77
msgid ""
"Style Sheets affect how reports are displayed. Choose a style sheet for "
"your report as a report option, and use the Edit -> Style Sheets menu to "
@@ -20427,8 +22528,17 @@
"Wählen Sie eine Stilvorlage für Ihren Bericht und benutzen Sie den Menüpunkt "
"Bearbeiten -> »Stilvorlagen...«, um die Stilvorlagen anzupassen. "
-#: ../doc/tip_of_the_day.list.in:78
+#: ../doc/tip_of_the_day.list.in:81
msgid ""
+"To raise the accounts menu in the transfer field of a register page, press "
+"the Menu key or the Ctrl-Down key combination."
+msgstr ""
+"In einer Buchungszeile des Kontenfensters kann man die Liste der möglichen "
+"Konten aufrufen, indem man die Tastenkombination Strg+Pfeil nach unten "
+"drückt."
+
+#: ../doc/tip_of_the_day.list.in:84
+msgid ""
"The GnuCash developers are easy to contact. As well as several mailing "
"lists, you can chat to them live on IRC! Join them on #gnucash at irc.gnome."
"org"
@@ -20438,7 +22548,7 @@
"IRC (Internet Relay Chat) ausprobieren. Die Entwicker sind im Channel "
"#gnucash auf irc.gnome.org zu finden."
-#: ../doc/tip_of_the_day.list.in:82
+#: ../doc/tip_of_the_day.list.in:88
msgid ""
"There is a theory that if ever anyone discovers what the Universe is for and "
"why it is here, it will instantly disappear and be replaced with something "
Modified: gnucash/branches/remove-group2/src/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -52,5 +52,4 @@
gnc-test-env \
valgrind-gnucash.supp \
guile-mappings.h \
- glib-compat.h \
- gtk-compat.h
+ glib-compat.h
Modified: gnucash/branches/remove-group2/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,9 +1,9 @@
SUBDIRS = . test
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-app-utils.la
AM_CFLAGS = \
+ -I$(top_srcdir)/lib/libc \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/gnc-module \
@@ -35,6 +35,7 @@
gnc-exp-parser.c \
gnc-gettext-util.c \
gnc-helpers.c \
+ gnc-sx-instance-model.c \
gncmod-app-utils.c \
gnc-ui-util.c \
guile-util.c \
@@ -60,16 +61,19 @@
gnc-exp-parser.h \
gnc-gettext-util.h \
gnc-helpers.h \
+ gnc-sx-instance-model.h \
gnc-ui-common.h \
gnc-ui-util.h \
guile-util.h \
option-util.h
+libgncmod_app_utils_la_LDFLAGS = -avoid-version
+
libgncmod_app_utils_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${GCONF_LIBS} \
${GTK_LIBS} \
${GUILE_LIBS} \
@@ -122,3 +126,5 @@
CLEANFILES = ${SCM_FILE_LINKS} gnucash .scm-links
MAINTAINERCLEANFILES = swig-app-utils.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.app-util\"
Modified: gnucash/branches/remove-group2/src/app-utils/file-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/file-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/file-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -22,6 +22,7 @@
#include "config.h"
#include <glib.h>
+#include <glib/gstdio.h>
#include <libguile.h>
#include <errno.h>
#include <fcntl.h>
@@ -90,7 +91,7 @@
if (!filename) return 0;
/* Open file: */
- fd = open( filename, O_RDONLY );
+ fd = g_open( filename, O_RDONLY, 0 );
g_free(filename); filename = NULL;
@@ -210,7 +211,7 @@
STATE_FILE_TOP, STATE_FILE_BOOK_GUID,
&error);
DEBUG("File GUID is %s", file_guid);
- if (strcmp(guid, file_guid) == 0) {
+ if (safe_strcmp(guid, file_guid) == 0) {
DEBUG("Matched !!!");
g_free(file_guid);
break;
Modified: gnucash/branches/remove-group2/src/app-utils/file-utils.h
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/file-utils.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/file-utils.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,9 +30,6 @@
#define GNC_FILE_UTILS_H
#include <stdio.h> /* for FILE* */
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
char * gncFindFile (const char * filename);
Modified: gnucash/branches/remove-group2/src/app-utils/gfec.c
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/gfec.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/gfec.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -176,9 +176,9 @@
gboolean
gfec_try_load(gchar *fn)
{
- g_message("looking for %s", fn);
+ g_debug("looking for %s", fn);
if (g_file_test(fn, G_FILE_TEST_EXISTS)) {
- g_message("trying to load %s", fn);
+ g_debug("trying to load %s", fn);
error_in_scm_eval = FALSE;
gfec_eval_file(fn, error_handler);
return !error_in_scm_eval;
Copied: gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.c (from rev 15563, gnucash/trunk/src/app-utils/gnc-sx-instance-model.c)
===================================================================
--- gnucash/trunk/src/app-utils/gnc-sx-instance-model.c 2007-02-11 04:22:52 UTC (rev 15563)
+++ gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -0,0 +1,1328 @@
+/*
+ * gnc-sx-instance-model.c
+ *
+ * Copyright (C) 2006 Josh Sled <jsled at asynchronous.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * 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 <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include "glib-compat.h"
+
+#include "Account.h"
+#include "SX-book.h"
+#include "SchedXaction.h"
+#include "Scrub.h"
+#include "Split.h"
+#include "Transaction.h"
+#include "gnc-book.h"
+#include "gnc-commodity.h"
+#include "gnc-event.h"
+#include "gnc-exp-parser.h"
+#include "gnc-glib-utils.h"
+#include "gnc-sx-instance-model.h"
+#include "gnc-ui-util.h"
+#include "qof.h"
+
+#define LOG_MOD "gnc.app-util.sx"
+static QofLogModule log_module = LOG_MOD;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN LOG_MOD
+
+static GObjectClass *parent_class = NULL;
+
+static void gnc_sx_instance_model_class_init (GncSxInstanceModelClass *klass);
+static void gnc_sx_instance_model_init(GTypeInstance *instance, gpointer klass);
+static GncSxInstanceModel* gnc_sx_instance_model_new(void);
+
+static GncSxInstance* gnc_sx_instance_new(GncSxInstances *parent, GncSxInstanceState state, GDate *date, void *temporal_state, gint sequence_num);
+
+static gint _get_vars_helper(Transaction *txn, void *var_hash_data);
+
+static GncSxVariable* gnc_sx_variable_new(gchar *name);
+
+static void _gnc_sx_instance_event_handler(QofEntity *ent, QofEventId event_type, gpointer user_data, gpointer evt_data);
+
+/* ------------------------------------------------------------ */
+
+static void
+_sx_var_to_raw_numeric(gchar *name, GncSxVariable *var, GHashTable *parser_var_hash)
+{
+ g_hash_table_insert(parser_var_hash, name, &var->value);
+}
+
+static void
+_var_numeric_to_sx_var(gchar *name, gnc_numeric *num, GHashTable *sx_var_hash)
+{
+ gpointer p_var;
+ if (!g_hash_table_lookup_extended(sx_var_hash, name, NULL, &p_var))
+ {
+ p_var = (gpointer)gnc_sx_variable_new(name);
+ g_hash_table_insert(sx_var_hash, name, p_var);
+ }
+ ((GncSxVariable*)p_var)->value = *num;
+}
+
+static void
+_wipe_parsed_sx_var(gchar *key, GncSxVariable *var, gpointer unused_user_data)
+{
+ var->value = gnc_numeric_error(GNC_ERROR_ARG);
+}
+
+/**
+ * @return caller-owned.
+ **/
+GHashTable*
+gnc_sx_instance_get_variables_for_parser(GHashTable *instance_var_hash)
+{
+ GHashTable *parser_vars;
+ parser_vars = g_hash_table_new(g_str_hash, g_str_equal);
+ g_hash_table_foreach(instance_var_hash, (GHFunc)_sx_var_to_raw_numeric, parser_vars);
+ return parser_vars;
+}
+
+int
+gnc_sx_parse_vars_from_formula(const char *formula,
+ GHashTable *var_hash,
+ gnc_numeric *result)
+{
+ gnc_numeric num;
+ char *errLoc = NULL;
+ int toRet = 0;
+ GHashTable *parser_vars;
+
+ // convert var_hash -> variables for the parser.
+ parser_vars = gnc_sx_instance_get_variables_for_parser(var_hash);
+
+ num = gnc_numeric_zero();
+ if (!gnc_exp_parser_parse_separate_vars(formula, &num, &errLoc, parser_vars))
+ {
+ toRet = -1;
+ }
+
+ // convert back.
+ g_hash_table_foreach(parser_vars, (GHFunc)_var_numeric_to_sx_var, var_hash);
+ g_hash_table_destroy(parser_vars);
+
+ if (result != NULL)
+ {
+ *result = num;
+ }
+
+ return toRet;
+}
+
+static GncSxVariable*
+gnc_sx_variable_new(gchar *name)
+{
+ GncSxVariable *var = g_new0(GncSxVariable, 1);
+ var->name = name;
+ var->value = gnc_numeric_error(GNC_ERROR_ARG);
+ var->editable = TRUE;
+ return var;
+}
+
+GncSxVariable*
+gnc_sx_variable_new_full(gchar *name, gnc_numeric value, gboolean editable)
+{
+ GncSxVariable *var = gnc_sx_variable_new(name);
+ var->value = value;
+ var->editable = editable;
+ return var;
+}
+
+static gint
+_get_vars_helper(Transaction *txn, void *var_hash_data)
+{
+ GHashTable *var_hash = (GHashTable*)var_hash_data;
+ GList *split_list;
+ kvp_frame *kvpf;
+ kvp_value *kvp_val;
+ Split *s;
+ char *str;
+ gnc_commodity *first_cmdty = NULL;
+
+ split_list = xaccTransGetSplitList(txn);
+ if (split_list == NULL)
+ {
+ return 1;
+ }
+
+ for ( ; split_list; split_list = split_list->next)
+ {
+ gnc_commodity *split_cmdty = NULL;
+ GUID *acct_guid;
+ Account *acct;
+
+ s = (Split*)split_list->data;
+ kvpf = xaccSplitGetSlots(s);
+ kvp_val = kvp_frame_get_slot_path(kvpf,
+ GNC_SX_ID,
+ GNC_SX_ACCOUNT,
+ NULL);
+ acct_guid = kvp_value_get_guid(kvp_val);
+ acct = xaccAccountLookup(acct_guid, gnc_get_current_book());
+ split_cmdty = xaccAccountGetCommodity(acct);
+ if (first_cmdty == NULL)
+ {
+ first_cmdty = split_cmdty;
+ }
+
+ if (! gnc_commodity_equal(split_cmdty, first_cmdty))
+ {
+ GncSxVariable *var;
+ GString *var_name;
+
+ var_name = g_string_sized_new(16);
+ g_string_printf(var_name, "%s -> %s",
+ gnc_commodity_get_mnemonic(split_cmdty),
+ gnc_commodity_get_mnemonic(first_cmdty));
+ var = gnc_sx_variable_new(g_strdup(var_name->str));
+ g_hash_table_insert(var_hash, var->name, var);
+ g_string_free(var_name, TRUE);
+ }
+
+ // existing... ------------------------------------------
+ kvp_val = kvp_frame_get_slot_path(kvpf,
+ GNC_SX_ID,
+ GNC_SX_CREDIT_FORMULA,
+ NULL);
+ if (kvp_val != NULL)
+ {
+ str = kvp_value_get_string(kvp_val);
+ if (str && strlen(str) != 0)
+ {
+ gnc_sx_parse_vars_from_formula(str, var_hash, NULL);
+ }
+ }
+
+ kvp_val = kvp_frame_get_slot_path(kvpf,
+ GNC_SX_ID,
+ GNC_SX_DEBIT_FORMULA,
+ NULL);
+ if (kvp_val != NULL)
+ {
+ str = kvp_value_get_string(kvp_val);
+ if (str && strlen(str) != 0)
+ {
+ gnc_sx_parse_vars_from_formula(str, var_hash, NULL);
+ }
+ }
+ }
+
+ return 0;
+}
+
+Account*
+gnc_sx_get_template_transaction_account(SchedXaction *sx)
+{
+ Account *template_root, *sx_template_acct;
+ const char *sx_guid_str;
+
+ template_root = gnc_book_get_template_root(gnc_get_current_book());
+ sx_guid_str = guid_to_string(xaccSchedXactionGetGUID(sx));
+ /* Get account named after guid string. */
+ sx_template_acct = gnc_account_lookup_by_name(template_root, sx_guid_str);
+ return sx_template_acct;
+}
+
+void
+gnc_sx_get_variables(SchedXaction *sx, GHashTable *var_hash)
+{
+ Account *sx_template_acct;
+ sx_template_acct = gnc_sx_get_template_transaction_account(sx);
+ xaccAccountForEachTransaction(sx_template_acct, _get_vars_helper, var_hash);
+}
+
+static void
+_set_var_to_random_value(gchar *key, GncSxVariable *var, gpointer unused_user_data)
+{
+ var->value = double_to_gnc_numeric(rand() + 2, 1,
+ GNC_NUMERIC_RND_MASK
+ | GNC_RND_FLOOR);
+}
+
+void
+gnc_sx_variable_free(GncSxVariable *var)
+{
+ // g_free(var->name);
+ g_free(var);
+}
+
+void
+gnc_sx_randomize_variables(GHashTable *vars)
+{
+ g_hash_table_foreach(vars, (GHFunc)_set_var_to_random_value, NULL);
+}
+
+static void
+_clone_sx_var_hash_entry(gpointer key, gpointer value, gpointer user_data)
+{
+ GHashTable *to = (GHashTable*)user_data;
+ GncSxVariable *to_copy = (GncSxVariable*)value;
+ GncSxVariable *var = gnc_sx_variable_new(to_copy->name);
+ var->value = to_copy->value;
+ var->editable = to_copy->editable;
+ g_hash_table_insert(to, key, var);
+}
+
+static GncSxInstance*
+gnc_sx_instance_new(GncSxInstances *parent, GncSxInstanceState state, GDate *date, void *temporal_state, gint sequence_num)
+{
+ GncSxInstance *rtn = g_new0(GncSxInstance, 1);
+ rtn->parent = parent;
+ rtn->orig_state = state;
+ rtn->state = state;
+ g_date_clear(&rtn->date, 1);
+ rtn->date = *date;
+ rtn->temporal_state = gnc_sx_clone_temporal_state(temporal_state);
+
+ if (! parent->variable_names_parsed)
+ {
+ parent->variable_names = g_hash_table_new(g_str_hash, g_str_equal);
+ gnc_sx_get_variables(parent->sx, parent->variable_names);
+ g_hash_table_foreach(parent->variable_names, (GHFunc)_wipe_parsed_sx_var, NULL);
+ parent->variable_names_parsed = TRUE;
+ }
+
+ rtn->variable_bindings = g_hash_table_new(g_str_hash, g_str_equal);
+ g_hash_table_foreach(parent->variable_names, _clone_sx_var_hash_entry, rtn->variable_bindings);
+
+ {
+ int instance_i_value;
+ gnc_numeric i_num;
+ GncSxVariable *as_var;
+
+ instance_i_value = gnc_sx_get_instance_count(rtn->parent->sx, rtn->temporal_state);
+ i_num = gnc_numeric_create(instance_i_value, 1);
+ as_var = gnc_sx_variable_new_full("i", i_num, FALSE);
+
+ g_hash_table_insert(rtn->variable_bindings, "i", as_var);
+ }
+
+ return rtn;
+}
+
+static void
+_build_list_from_hash_elts(gpointer key, gpointer value, gpointer user_data)
+{
+ GList **list = (GList**)user_data;
+ *list = g_list_append(*list, value);
+}
+
+GList *
+gnc_sx_instance_get_variables(GncSxInstance *inst)
+{
+ GList *vars = NULL;
+ g_hash_table_foreach(inst->variable_bindings, _build_list_from_hash_elts, &vars);
+ // @@fixme sort by name
+ // @@fixme make sure the returned list is freed by callers.
+ return vars;
+}
+
+static GncSxInstances*
+_gnc_sx_gen_instances(gpointer *data, gpointer user_data)
+{
+ GncSxInstances *instances = g_new0(GncSxInstances, 1);
+ SchedXaction *sx = (SchedXaction*)data;
+ GDate *range_end = (GDate*)user_data;
+ GDate creation_end, remind_end;
+ GDate cur_date;
+ void *sequence_ctx;
+
+ instances->sx = sx;
+
+ creation_end = *range_end;
+ g_date_add_days(&creation_end, xaccSchedXactionGetAdvanceCreation(sx));
+ remind_end = creation_end;
+ g_date_add_days(&remind_end, xaccSchedXactionGetAdvanceReminder(sx));
+
+ /* postponed */
+ {
+ GList *postponed = gnc_sx_get_defer_instances(sx);
+ for ( ; postponed != NULL; postponed = postponed->next)
+ {
+ GDate inst_date;
+ int seq_num;
+ GncSxInstance *inst;
+
+ g_date_clear(&inst_date, 1);
+ inst_date = xaccSchedXactionGetNextInstance(sx, postponed->data);
+ seq_num = gnc_sx_get_instance_count(sx, postponed->data);
+ inst = gnc_sx_instance_new(instances, SX_INSTANCE_STATE_POSTPONED, &inst_date, postponed->data, seq_num);
+ //inst->temporal_state = postponed->data;
+ instances->list = g_list_append(instances->list, inst);
+ }
+ }
+
+ /* to-create */
+ g_date_clear(&cur_date, 1);
+ sequence_ctx = gnc_sx_create_temporal_state(sx);
+ cur_date = xaccSchedXactionGetInstanceAfter(sx, &cur_date, sequence_ctx);
+ instances->next_instance_date = cur_date;
+ while (g_date_valid(&cur_date) && g_date_compare(&cur_date, &creation_end) <= 0)
+ {
+ GncSxInstance *inst;
+ int seq_num;
+ seq_num = gnc_sx_get_instance_count(sx, sequence_ctx);
+ inst = gnc_sx_instance_new(instances, SX_INSTANCE_STATE_TO_CREATE, &cur_date, sequence_ctx, seq_num);
+ instances->list = g_list_append(instances->list, inst);
+ gnc_sx_incr_temporal_state(sx, sequence_ctx);
+ cur_date = xaccSchedXactionGetInstanceAfter(sx, &cur_date, sequence_ctx);
+ }
+
+ /* reminders */
+ while (g_date_valid(&cur_date) && g_date_compare(&cur_date, &remind_end) <= 0)
+ {
+ GncSxInstance *inst;
+ int seq_num;
+ seq_num = gnc_sx_get_instance_count(sx, sequence_ctx);
+ inst = gnc_sx_instance_new(instances, SX_INSTANCE_STATE_REMINDER, &cur_date, sequence_ctx, seq_num);
+ instances->list = g_list_append(instances->list, inst);
+ gnc_sx_incr_temporal_state(sx, sequence_ctx);
+ cur_date = xaccSchedXactionGetInstanceAfter(sx, &cur_date, sequence_ctx);
+ }
+
+ return instances;
+}
+
+GncSxInstanceModel*
+gnc_sx_get_current_instances(void)
+{
+ GDate *now = g_date_new();
+ g_date_clear(now, 1);
+ g_date_set_time_t(now, time(NULL));
+ return gnc_sx_get_instances(now, FALSE);
+}
+
+GncSxInstanceModel*
+gnc_sx_get_instances(GDate *range_end, gboolean include_disabled)
+{
+ GList *all_sxes = gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
+ GncSxInstanceModel *instances;
+
+ g_assert(range_end != NULL);
+ g_assert(g_date_valid(range_end));
+
+ instances = gnc_sx_instance_model_new();
+ instances->include_disabled = include_disabled;
+ instances->range_end = *range_end;
+
+ if (include_disabled)
+ {
+ instances->sx_instance_list = gnc_g_list_map(all_sxes, (GncGMapFunc)_gnc_sx_gen_instances, range_end);
+ }
+ else
+ {
+ GList *sx_iter = g_list_first(all_sxes);
+ GList *enabled_sxes = NULL;
+
+ for (; sx_iter != NULL; sx_iter = sx_iter->next)
+ {
+ SchedXaction *sx = (SchedXaction*)sx_iter->data;
+ if (xaccSchedXactionGetEnabled(sx))
+ {
+ enabled_sxes = g_list_append(enabled_sxes, sx);
+ }
+ }
+ instances->sx_instance_list = gnc_g_list_map(enabled_sxes, (GncGMapFunc)_gnc_sx_gen_instances, range_end);
+ g_list_free(enabled_sxes);
+ }
+
+ return instances;
+}
+static GncSxInstanceModel*
+gnc_sx_instance_model_new(void)
+{
+ return GNC_SX_INSTANCE_MODEL(g_object_new(GNC_TYPE_SX_INSTANCE_MODEL, NULL));
+}
+
+GType
+gnc_sx_instance_model_get_type(void)
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GTypeInfo info = {
+ sizeof (GncSxInstanceModelClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc)gnc_sx_instance_model_class_init, /* class_init */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GncSxInstanceModel),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc)gnc_sx_instance_model_init /* instance_init */
+ };
+ type = g_type_register_static (G_TYPE_OBJECT,
+ "GncSxInstanceModelType",
+ &info, 0);
+ }
+ return type;
+}
+
+static void
+gnc_sx_instance_model_dispose(GObject *object)
+{
+ GncSxInstanceModel *model;
+ g_return_if_fail(object != NULL);
+ model = GNC_SX_INSTANCE_MODEL(object);
+
+ g_return_if_fail(!model->disposed);
+ model->disposed = TRUE;
+
+ qof_event_unregister_handler(model->qof_event_handler_id);
+
+ G_OBJECT_CLASS(parent_class)->dispose(object);
+}
+
+static void
+gnc_sx_instance_free(GncSxInstance *instance)
+{
+ // @fixme:
+ // variable_bindings elts + map
+ // temporal_state (iff not postponed?)
+
+ g_free(instance);
+}
+
+static void
+gnc_sx_instances_free(GncSxInstances *instances)
+{
+ GList *instance_iter;
+ // @fixme:
+ // variable_names
+ // sx = null
+
+ for (instance_iter = instances->list; instance_iter != NULL; instance_iter = instance_iter->next)
+ {
+ GncSxInstance *inst = (GncSxInstance*)instance_iter->data;
+ gnc_sx_instance_free(inst);
+ }
+ g_list_free(instances->list);
+ instances->list = NULL;
+
+ g_free(instances);
+}
+
+static void
+gnc_sx_instance_model_finalize (GObject *object)
+{
+ GncSxInstanceModel *model;
+ GList *sx_list_iter;
+
+ g_return_if_fail(object != NULL);
+
+ model = GNC_SX_INSTANCE_MODEL(object);
+ for (sx_list_iter = model->sx_instance_list; sx_list_iter != NULL; sx_list_iter = sx_list_iter->next)
+ {
+ GncSxInstances *instances = (GncSxInstances*)sx_list_iter->data;
+ gnc_sx_instances_free(instances);
+ }
+ g_list_free(model->sx_instance_list);
+ model->sx_instance_list = NULL;
+
+ G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+static void
+gnc_sx_instance_model_class_init (GncSxInstanceModelClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
+
+ parent_class = g_type_class_peek_parent(klass);
+
+ object_class->dispose = gnc_sx_instance_model_dispose;
+ object_class->finalize = gnc_sx_instance_model_finalize;
+
+ klass->removing_signal_id =
+ g_signal_new("removing",
+ GNC_TYPE_SX_INSTANCE_MODEL,
+ G_SIGNAL_RUN_FIRST,
+ 0, /* class offset */
+ NULL, /* accumulator */
+ NULL, /* accum data */
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_POINTER);
+
+ klass->updated_signal_id =
+ g_signal_new("updated",
+ GNC_TYPE_SX_INSTANCE_MODEL,
+ G_SIGNAL_RUN_FIRST,
+ 0, /* class offset */
+ NULL, /* accumulator */
+ NULL, /* accum data */
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_POINTER);
+
+ klass->added_signal_id =
+ g_signal_new("added",
+ GNC_TYPE_SX_INSTANCE_MODEL,
+ G_SIGNAL_RUN_FIRST,
+ 0, /* class offset */
+ NULL, /* accumulator */
+ NULL, /* accum data */
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_POINTER);
+}
+
+static void
+gnc_sx_instance_model_init(GTypeInstance *instance, gpointer klass)
+{
+ GncSxInstanceModel *inst = (GncSxInstanceModel*)instance;
+
+ g_date_clear(&inst->range_end, 1);
+ inst->sx_instance_list = NULL;
+ inst->qof_event_handler_id = qof_event_register_handler(_gnc_sx_instance_event_handler, inst);
+}
+
+static gint
+_gnc_sx_instance_find_by_sx(GncSxInstances *in_list_instances, SchedXaction *sx_to_find)
+{
+ if (in_list_instances->sx == sx_to_find)
+ return 0;
+ return -1;
+}
+
+static void
+_gnc_sx_instance_event_handler(QofEntity *ent, QofEventId event_type, gpointer user_data, gpointer evt_data)
+{
+ GncSxInstanceModel *instances = GNC_SX_INSTANCE_MODEL(user_data);
+
+ /* selection rules {
+ // (gnc_collection_get_schedxaction_list(book), GNC_EVENT_ITEM_ADDED)
+ // (gnc_collection_get_schedxaction_list(book), GNC_EVENT_ITEM_REMOVED)
+ // (GNC_IS_SX(ent), QOF_EVENT_MODIFIED)
+ // } */
+ if (!(GNC_IS_SX(ent) || GNC_IS_SXES(ent)))
+ return;
+
+ if (GNC_IS_SX(ent))
+ {
+ SchedXaction *sx;
+ gboolean sx_is_in_model = FALSE;
+
+ sx = GNC_SX(ent);
+ // only send `updated` if it's actually in the model
+ sx_is_in_model = (g_list_find_custom(instances->sx_instance_list, sx, (GCompareFunc)_gnc_sx_instance_find_by_sx) != NULL);
+ if (event_type & QOF_EVENT_MODIFY)
+ {
+ if (sx_is_in_model)
+ {
+ if (instances->include_disabled || xaccSchedXactionGetEnabled(sx))
+ {
+ g_signal_emit_by_name(instances, "updated", (gpointer)sx);
+ }
+ else
+ {
+ /* the sx was enabled but is now disabled */
+ g_signal_emit_by_name(instances, "removing", (gpointer)sx);
+ }
+ }
+ else
+ {
+ /* determine if this is a legitimate SX or just a "one-off" / being created */
+ GList *all_sxes = gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
+ if (g_list_find(all_sxes, sx) && (!instances->include_disabled && xaccSchedXactionGetEnabled(sx)))
+ {
+ /* it's moved from disabled to enabled, add the instances */
+ instances->sx_instance_list
+ = g_list_append(instances->sx_instance_list,
+ _gnc_sx_gen_instances((gpointer)sx, (gpointer)&instances->range_end));
+ g_signal_emit_by_name(instances, "added", (gpointer)sx);
+ }
+ }
+ }
+ /* else { unsupported event type; ignore } */
+ }
+ else if (GNC_IS_SXES(ent))
+ {
+ SchedXactions *sxes = GNC_SXES(ent);
+ SchedXaction *sx = GNC_SX(evt_data);
+
+ sxes = NULL;
+ if (event_type & GNC_EVENT_ITEM_REMOVED)
+ {
+ GList *instances_link;
+ instances_link = g_list_find_custom(instances->sx_instance_list, sx, (GCompareFunc)_gnc_sx_instance_find_by_sx);
+ if (instances_link != NULL)
+ {
+ g_signal_emit_by_name(instances, "removing", (gpointer)sx);
+ }
+ else if (instances->include_disabled)
+ {
+ g_warning("could not remove instances that do not exist in the model");
+ }
+ }
+ else if (event_type & GNC_EVENT_ITEM_ADDED)
+ {
+ if (instances->include_disabled || xaccSchedXactionGetEnabled(sx))
+ {
+ /* generate instances, add to instance list, emit update. */
+ instances->sx_instance_list
+ = g_list_append(instances->sx_instance_list,
+ _gnc_sx_gen_instances((gpointer)sx, (gpointer)&instances->range_end));
+ g_signal_emit_by_name(instances, "added", (gpointer)sx);
+ }
+ }
+ /* else { g_critical("unsupported event type [%d]\n", event_type); } */
+ }
+}
+
+void
+gnc_sx_instance_model_update_sx_instances(GncSxInstanceModel *model, SchedXaction *sx)
+{
+ GncSxInstances *existing, *new_instances;
+ GList *link;
+
+ link = g_list_find_custom(model->sx_instance_list, sx, (GCompareFunc)_gnc_sx_instance_find_by_sx);
+ if (link == NULL)
+ {
+ g_critical("couldn't find sx [%p]\n", sx);
+ return;
+ }
+
+ // merge the new instance data into the existing structure, mutating as little as possible.
+ existing = (GncSxInstances*)link->data;
+ new_instances = _gnc_sx_gen_instances((gpointer)sx, &model->range_end);
+ existing->sx = new_instances->sx;
+ // @fixme: variable names stuff
+ existing->next_instance_date = new_instances->next_instance_date;
+ {
+ GList *existing_iter, *new_iter;
+ gboolean existing_remain, new_remain;
+
+ // step through the lists pairwise, and retain the existing
+ // instance if the dates align, as soon as they don't stop and
+ // cleanup.
+ existing_iter = existing->list;
+ new_iter = new_instances->list;
+ for (; existing_iter != NULL && new_iter != NULL; existing_iter = existing_iter->next, new_iter = new_iter->next)
+ {
+ GncSxInstance *existing_inst, *new_inst;
+ gboolean same_instance_date;
+ existing_inst = (GncSxInstance*)existing_iter->data;
+ new_inst = (GncSxInstance*)new_iter->data;
+
+ same_instance_date = g_date_compare(&existing_inst->date, &new_inst->date) == 0;
+ if (!same_instance_date)
+ break;
+ }
+
+ existing_remain = (existing_iter != NULL);
+ new_remain = (new_iter != NULL);
+
+ if (existing_remain)
+ {
+ // delete excess
+ gnc_g_list_cut(&existing->list, existing_iter);
+ g_list_foreach(existing_iter, (GFunc)gnc_sx_instance_free, NULL);
+ }
+
+ if (new_remain)
+ {
+ // append new
+ GList *new_iter_iter;
+ gnc_g_list_cut(&new_instances->list, new_iter);
+
+ for (new_iter_iter = new_iter; new_iter_iter != NULL; new_iter_iter = new_iter_iter->next)
+ {
+ GncSxInstance *inst = (GncSxInstance*)new_iter_iter->data;
+ inst->parent = existing;
+ existing->list = g_list_append(existing->list, new_iter_iter->data);
+ }
+ g_list_free(new_iter);
+ }
+ }
+ gnc_sx_instances_free(new_instances);
+}
+
+void
+gnc_sx_instance_model_remove_sx_instances(GncSxInstanceModel *model, SchedXaction *sx)
+{
+ GList *instance_link = NULL;
+
+ instance_link = g_list_find_custom(model->sx_instance_list, sx, (GCompareFunc)_gnc_sx_instance_find_by_sx);
+ if (instance_link == NULL)
+ {
+ g_warning("instance not found!\n");
+ return;
+ }
+
+ model->sx_instance_list = g_list_remove_link(model->sx_instance_list, instance_link);
+ gnc_sx_instances_free((GncSxInstances*)instance_link->data);
+}
+
+static void
+increment_sx_state(GncSxInstance *inst, GDate **last_occur_date, int *instance_count, int *remain_occur_count)
+{
+ if (!g_date_valid(*last_occur_date)
+ || (g_date_valid(*last_occur_date)
+ && g_date_compare(*last_occur_date, &inst->date) <= 0))
+ {
+ *last_occur_date = &inst->date;
+ }
+
+ *instance_count = gnc_sx_get_instance_count(inst->parent->sx, inst->temporal_state);
+
+ if (*remain_occur_count > 0)
+ {
+ *remain_occur_count -= 1;
+ }
+}
+
+typedef struct _SxTxnCreationData
+{
+ GncSxInstance *instance;
+ GList **created_txn_guids;
+ GList **creation_errors;
+} SxTxnCreationData;
+
+static gboolean
+_get_template_split_account(GncSxInstance *instance, Split *template_split, Account **split_acct, GList **creation_errors)
+{
+ GUID *acct_guid;
+ kvp_frame *split_kvpf;
+ kvp_value *kvp_val;
+
+ split_kvpf = xaccSplitGetSlots(template_split);
+ /* contains the guid of the split's actual account. */
+ kvp_val = kvp_frame_get_slot_path(split_kvpf,
+ GNC_SX_ID,
+ GNC_SX_ACCOUNT,
+ NULL);
+ if (kvp_val == NULL)
+ {
+ // @@fixme: this should be more of an assert...
+ GString *err = g_string_new("");
+ g_string_printf(err, "Null account kvp value for SX [%s], cancelling creation.",
+ xaccSchedXactionGetName(instance->parent->sx));
+ *creation_errors = g_list_append(*creation_errors, err);
+ return FALSE;
+ }
+ acct_guid = kvp_value_get_guid( kvp_val );
+ *split_acct = xaccAccountLookup(acct_guid, gnc_get_current_book());
+ if (*split_acct == NULL)
+ {
+ const char *guid_str;
+ GString *err;
+ guid_str = guid_to_string((const GUID*)acct_guid);
+ err = g_string_new("");
+ g_string_printf(err, "Unknown account for guid [%s], cancelling SX [%s] creation.",
+ guid_str, xaccSchedXactionGetName(instance->parent->sx));
+ g_free((char*)guid_str);
+ *creation_errors = g_list_append(*creation_errors, err);
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void
+_get_sx_formula(GncSxInstance *instance, Split *template_split, gnc_numeric *numeric, GList **creation_errors, const char *formula_key)
+{
+ kvp_frame *split_kvpf;
+ kvp_value *kvp_val;
+ char *formula_str, *parseErrorLoc;
+
+ split_kvpf = xaccSplitGetSlots(template_split);
+ kvp_val = kvp_frame_get_slot_path(split_kvpf,
+ GNC_SX_ID,
+ formula_key,
+ NULL);
+ formula_str = kvp_value_get_string(kvp_val);
+ if (formula_str != NULL && strlen(formula_str) != 0)
+ {
+ GHashTable *parser_vars = gnc_sx_instance_get_variables_for_parser(instance->variable_bindings);
+ if (!gnc_exp_parser_parse_separate_vars(formula_str,
+ numeric,
+ &parseErrorLoc,
+ parser_vars))
+ {
+ GString *err = g_string_new("");
+ g_string_printf(err, "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s",
+ xaccSchedXactionGetName(instance->parent->sx),
+ formula_key,
+ formula_str,
+ parseErrorLoc,
+ gnc_exp_parser_error_string());
+ *creation_errors = g_list_append(*creation_errors, err);
+ }
+ g_hash_table_destroy(parser_vars);
+ }
+}
+
+static void
+_get_credit_formula(GncSxInstance *instance, Split *template_split, gnc_numeric *credit_num, GList **creation_errors)
+{
+ _get_sx_formula(instance, template_split, credit_num, creation_errors, GNC_SX_CREDIT_FORMULA);
+}
+
+static void
+_get_debit_formula(GncSxInstance *instance, Split *template_split, gnc_numeric *debit_num, GList **creation_errors)
+{
+ _get_sx_formula(instance, template_split, debit_num, creation_errors, GNC_SX_DEBIT_FORMULA);
+}
+
+static gboolean
+create_each_transaction_helper(Transaction *template_txn, void *user_data)
+{
+ Transaction *new_txn;
+ GList *txn_splits, *template_splits;
+ Split *copying_split;
+ gnc_commodity *first_cmdty = NULL;
+ gboolean err_flag = FALSE;
+ SxTxnCreationData *creation_data;
+
+ creation_data = (SxTxnCreationData*)user_data;
+
+ /* FIXME: In general, this should [correctly] deal with errors such
+ as not finding the approrpiate Accounts and not being able to
+ parse the formula|credit/debit strings. */
+
+ new_txn = xaccTransClone(template_txn);
+ xaccTransBeginEdit(new_txn);
+
+ /* clear any copied KVP data */
+ qof_instance_set_slots(QOF_INSTANCE(new_txn), kvp_frame_new());
+
+ xaccTransSetDate(new_txn,
+ g_date_get_day(&creation_data->instance->date),
+ g_date_get_month(&creation_data->instance->date),
+ g_date_get_year(&creation_data->instance->date));
+
+ /* the accounts and amounts are in the kvp_frames of the splits. */
+ template_splits = xaccTransGetSplitList(template_txn);
+ txn_splits = xaccTransGetSplitList(new_txn);
+ if ((template_splits == NULL) || (txn_splits == NULL))
+ {
+ g_critical("transaction w/o splits for sx [%s]",
+ xaccSchedXactionGetName(creation_data->instance->parent->sx));
+ xaccTransDestroy(new_txn);
+ xaccTransCommitEdit(new_txn);
+ return FALSE;
+ }
+
+ for (;
+ txn_splits && template_splits;
+ txn_splits = txn_splits->next, template_splits = template_splits->next)
+ {
+ Split *template_split;
+ Account *split_acct;
+ gnc_commodity *split_cmdty = NULL;
+
+ /* FIXME: Ick. This assumes that the split lists will be ordered
+ identically. :( They are, but we'd rather not have to count on
+ it. --jsled */
+ template_split = (Split*)template_splits->data;
+ copying_split = (Split*)txn_splits->data;
+
+ /* clear out any copied Split frame data. */
+ qof_instance_set_slots(QOF_INSTANCE(copying_split), kvp_frame_new());
+
+ if (!_get_template_split_account(creation_data->instance, template_split, &split_acct, creation_data->creation_errors))
+ {
+ err_flag = TRUE;
+ break;
+ }
+
+ split_cmdty = xaccAccountGetCommodity(split_acct);
+ if (first_cmdty == NULL)
+ {
+ first_cmdty = split_cmdty;
+ xaccTransSetCurrency(new_txn, first_cmdty);
+ }
+
+ xaccAccountBeginEdit(split_acct);
+ xaccAccountInsertSplit(split_acct, copying_split);
+
+ {
+ gnc_numeric credit_num, debit_num, final;
+ gint gncn_error;
+
+ credit_num = gnc_numeric_zero();
+ debit_num = gnc_numeric_zero();
+
+ _get_credit_formula(creation_data->instance, template_split, &credit_num, creation_data->creation_errors);
+ _get_debit_formula(creation_data->instance, template_split, &debit_num, creation_data->creation_errors);
+
+ final = gnc_numeric_sub_fixed( debit_num, credit_num );
+
+ gncn_error = gnc_numeric_check(final);
+ if (gncn_error != GNC_ERROR_OK) {
+ GString *err = g_string_new("");
+ g_string_printf(err, "Error %d in SX [%s] final gnc_numeric value, using 0 instead.",
+ gncn_error,
+ xaccSchedXactionGetName(creation_data->instance->parent->sx));
+ *creation_data->creation_errors = g_list_append(*creation_data->creation_errors, err);
+ final = gnc_numeric_zero();
+ }
+
+ xaccSplitSetValue(copying_split, final);
+ if (! gnc_commodity_equal(split_cmdty, first_cmdty))
+ {
+ GString *exchange_rate_var_name = g_string_sized_new(16);
+ GncSxVariable *exchange_rate_var;
+ gnc_numeric exchange_rate, amt;
+
+ /*
+ GNCPriceDB *price_db = gnc_pricedb_get_db(gnc_get_current_book());
+ GNCPrice *price;
+
+ price = gnc_pricedb_lookup_latest(price_db, first_cmdty, split_cmdty);
+ if (price == NULL)
+ {
+ price = gnc_pricedb_lookup_latest(price_db, split_cmdty, first_cmdty);
+ if (price == NULL)
+ {
+ GString *err = g_string_new("");
+ g_string_printf(err, "could not find pricedb entry for commodity-pair (%s, %s).",
+ gnc_commodity_get_mnemonic(first_cmdty),
+ gnc_commodity_get_mnemonic(split_cmdty));
+ exchange = gnc_numeric_create(1, 1);
+ *creation_data->creation_errors = g_list_append(*creation_data->creation_errors, err);
+
+ }
+ else
+ {
+ exchange = gnc_numeric_div(gnc_numeric_create(1,1),
+ gnc_price_get_value(price),
+ 1000, GNC_HOW_RND_ROUND);
+ }
+ }
+ else
+ {
+ exchange = gnc_price_get_value(price);
+ }
+ */
+
+ exchange_rate = gnc_numeric_zero();
+ g_string_printf(exchange_rate_var_name, "%s -> %s",
+ gnc_commodity_get_mnemonic(split_cmdty),
+ gnc_commodity_get_mnemonic(first_cmdty));
+ exchange_rate_var = (GncSxVariable*)g_hash_table_lookup(creation_data->instance->variable_bindings,
+ exchange_rate_var_name->str);
+ if (exchange_rate_var != NULL)
+ {
+ exchange_rate = exchange_rate_var->value;
+ }
+ g_string_free(exchange_rate_var_name, TRUE);
+
+ amt = gnc_numeric_mul(final, exchange_rate, 1000, GNC_HOW_RND_ROUND);
+ xaccSplitSetAmount(copying_split, amt);
+ }
+
+ xaccSplitScrub(copying_split);
+ }
+
+ xaccAccountCommitEdit(split_acct);
+ }
+
+ if (err_flag)
+ {
+ g_critical("new transaction creation sx [%s]",
+ xaccSchedXactionGetName(creation_data->instance->parent->sx));
+ xaccTransDestroy(new_txn);
+ xaccTransCommitEdit(new_txn);
+ return FALSE;
+ }
+
+ {
+ kvp_frame *txn_frame;
+ /* set a kvp-frame element in the transaction indicating and
+ * pointing-to the SX this was created from. */
+ txn_frame = xaccTransGetSlots(new_txn);
+ kvp_frame_set_guid(txn_frame, "from-sched-xaction", xaccSchedXactionGetGUID(creation_data->instance->parent->sx));
+ }
+
+ xaccTransCommitEdit(new_txn);
+
+ if (creation_data->created_txn_guids != NULL)
+ {
+ *creation_data->created_txn_guids
+ = g_list_append(*(creation_data->created_txn_guids), (gpointer)xaccTransGetGUID(new_txn));
+ }
+
+ return TRUE;
+}
+
+static void
+create_transactions_for_instance(GncSxInstance *instance, GList **created_txn_guids, GList **creation_errors)
+{
+ SxTxnCreationData creation_data;
+ Account *sx_template_account;
+
+ sx_template_account = gnc_sx_get_template_transaction_account(instance->parent->sx);
+
+ creation_data.instance = instance;
+ creation_data.created_txn_guids = created_txn_guids;
+ creation_data.creation_errors = creation_errors;
+
+ xaccAccountForEachTransaction(sx_template_account,
+ create_each_transaction_helper,
+ &creation_data);
+}
+
+void
+gnc_sx_instance_model_effect_change(GncSxInstanceModel *model,
+ gboolean auto_create_only,
+ GList **created_transaction_guids,
+ GList **creation_errors)
+{
+ GList *iter;
+ for (iter = model->sx_instance_list; iter != NULL; iter = iter->next)
+ {
+ GList *instance_iter;
+ GncSxInstances *instances = (GncSxInstances*)iter->data;
+ GDate *last_occur_date;
+ gint instance_count = 0;
+ gint remain_occur_count = 0;
+
+ // If there are no instances, then skip; specifically, skip
+ // re-setting SchedXaction fields, which will dirty the book
+ // spuriously.
+ if (g_list_length(instances->list) == 0)
+ continue;
+
+ last_occur_date = xaccSchedXactionGetLastOccurDate(instances->sx);
+ instance_count = gnc_sx_get_instance_count(instances->sx, NULL);
+ remain_occur_count = xaccSchedXactionGetRemOccur(instances->sx);
+
+ for (instance_iter = instances->list; instance_iter != NULL; instance_iter = instance_iter->next)
+ {
+ GncSxInstance *inst = (GncSxInstance*)instance_iter->data;
+ gboolean sx_is_auto_create;
+
+ xaccSchedXactionGetAutoCreate(inst->parent->sx, &sx_is_auto_create, NULL);
+ if (auto_create_only && !sx_is_auto_create)
+ {
+ if (inst->state != SX_INSTANCE_STATE_TO_CREATE)
+ {
+ break;
+ }
+ continue;
+ }
+
+ if (inst->orig_state == SX_INSTANCE_STATE_POSTPONED
+ && inst->state != SX_INSTANCE_STATE_POSTPONED)
+ {
+ // remove from postponed list
+ g_assert(inst->temporal_state != NULL);
+ gnc_sx_remove_defer_instance(inst->parent->sx, inst->temporal_state);
+ }
+
+ switch (inst->state)
+ {
+ case SX_INSTANCE_STATE_CREATED:
+ // nop: we've already processed this.
+ break;
+ case SX_INSTANCE_STATE_IGNORED:
+ increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
+ break;
+ case SX_INSTANCE_STATE_POSTPONED:
+ if (inst->orig_state != SX_INSTANCE_STATE_POSTPONED)
+ {
+ gnc_sx_add_defer_instance(instances->sx, inst->temporal_state);
+ }
+ increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
+ break;
+ case SX_INSTANCE_STATE_TO_CREATE:
+ create_transactions_for_instance(inst, created_transaction_guids, creation_errors);
+ increment_sx_state(inst, &last_occur_date, &instance_count, &remain_occur_count);
+ gnc_sx_instance_model_change_instance_state(model, inst, SX_INSTANCE_STATE_CREATED);
+ break;
+ case SX_INSTANCE_STATE_REMINDER:
+ // do nothing
+ // assert no non-remind instances after this?
+ break;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+ }
+
+ xaccSchedXactionSetLastOccurDate(instances->sx, last_occur_date);
+ gnc_sx_set_instance_count(instances->sx, instance_count);
+ xaccSchedXactionSetRemOccur(instances->sx, remain_occur_count);
+ }
+}
+
+void
+gnc_sx_instance_model_change_instance_state(GncSxInstanceModel *model,
+ GncSxInstance *instance,
+ GncSxInstanceState new_state)
+{
+ if (instance->state == new_state)
+ return;
+
+ instance->state = new_state;
+
+ // ensure 'remind' constraints are met:
+ {
+ GList *inst_iter;
+ inst_iter = g_list_find(instance->parent->list, instance);
+ g_assert(inst_iter != NULL);
+ if (instance->state != SX_INSTANCE_STATE_REMINDER)
+ {
+ // iterate backwards, making sure reminders are changed to 'postponed'
+ for (inst_iter = inst_iter->prev; inst_iter != NULL; inst_iter = inst_iter->prev)
+ {
+ GncSxInstance *prev_inst = (GncSxInstance*)inst_iter->data;
+ if (prev_inst->state != SX_INSTANCE_STATE_REMINDER)
+ continue;
+ prev_inst->state = SX_INSTANCE_STATE_POSTPONED;
+ }
+ }
+ else
+ {
+ // iterate forward, make sure transactions are set to 'remind'
+ for (inst_iter = inst_iter->next; inst_iter != NULL; inst_iter = inst_iter->next)
+ {
+ GncSxInstance *next_inst = (GncSxInstance*)inst_iter->data;
+ if (next_inst->state == SX_INSTANCE_STATE_REMINDER)
+ continue;
+ next_inst->state = SX_INSTANCE_STATE_REMINDER;
+ }
+ }
+ }
+
+ g_signal_emit_by_name(model, "updated", (gpointer)instance->parent->sx);
+}
+
+void
+gnc_sx_instance_model_set_variable(GncSxInstanceModel *model,
+ GncSxInstance *instance,
+ GncSxVariable *variable,
+ gnc_numeric *new_value)
+{
+
+ if (gnc_numeric_equal(variable->value, *new_value))
+ return;
+ variable->value = *new_value;
+ g_signal_emit_by_name(model, "updated", (gpointer)instance->parent->sx);
+}
+
+static void
+_list_from_hash_elts(gpointer key, gpointer value, GList **result_list)
+{
+ *result_list = g_list_append(*result_list, value);
+}
+
+GList*
+gnc_sx_instance_model_check_variables(GncSxInstanceModel *model)
+{
+ GList *rtn = NULL;
+ GList *sx_iter, *inst_iter, *var_list = NULL, *var_iter;
+
+ for (sx_iter = model->sx_instance_list; sx_iter != NULL; sx_iter = sx_iter->next)
+ {
+ GncSxInstances *instances = (GncSxInstances*)sx_iter->data;
+ for (inst_iter = instances->list; inst_iter != NULL; inst_iter = inst_iter->next)
+ {
+ GncSxInstance *inst = (GncSxInstance*)inst_iter->data;
+
+ if (inst->state != SX_INSTANCE_STATE_TO_CREATE)
+ continue;
+
+ g_hash_table_foreach(inst->variable_bindings, (GHFunc)_list_from_hash_elts, &var_list);
+ for (var_iter = var_list; var_iter != NULL; var_iter = var_iter->next)
+ {
+ GncSxVariable *var = (GncSxVariable*)var_iter->data;
+ if (gnc_numeric_check(var->value) != GNC_ERROR_OK)
+ {
+ GncSxVariableNeeded *need = g_new0(GncSxVariableNeeded, 1);
+ need->instance = inst;
+ need->variable = var;
+ rtn = g_list_append(rtn, need);
+ }
+ }
+ g_list_free(var_list);
+ var_list = NULL;
+ }
+ }
+ return rtn;
+}
+
+void
+gnc_sx_instance_model_summarize(GncSxInstanceModel *model, GncSxSummary *summary)
+{
+ GList *sx_iter, *inst_iter;
+
+ g_return_if_fail(model != NULL);
+ g_return_if_fail(summary != NULL);
+
+ summary->need_dialog = FALSE;
+ summary->num_instances = 0;
+ summary->num_to_create_instances = 0;
+ summary->num_auto_create_instances = 0;
+ summary->num_auto_create_no_notify_instances = 0;
+
+ for (sx_iter = model->sx_instance_list; sx_iter != NULL; sx_iter = sx_iter->next)
+ {
+ GncSxInstances *instances = (GncSxInstances*)sx_iter->data;
+ gboolean sx_is_auto_create = FALSE, sx_notify = FALSE;
+ xaccSchedXactionGetAutoCreate(instances->sx, &sx_is_auto_create, &sx_notify);
+ for (inst_iter = instances->list; inst_iter != NULL; inst_iter = inst_iter->next)
+ {
+ GncSxInstance *inst = (GncSxInstance*)inst_iter->data;
+ summary->num_instances++;
+
+ if (inst->state == SX_INSTANCE_STATE_TO_CREATE)
+ {
+ if (sx_is_auto_create)
+ {
+ if (!sx_notify)
+ {
+ summary->num_auto_create_no_notify_instances++;
+ }
+ else
+ {
+ summary->num_auto_create_instances++;
+ }
+ }
+ else
+ {
+ summary->num_to_create_instances++;
+ }
+ }
+ }
+ }
+
+ // if all the instances are 'auto-create, no-notify', then we don't need
+ // the dialog.
+ summary->need_dialog
+ = (summary->num_instances != 0
+ && summary->num_auto_create_no_notify_instances != summary->num_instances);
+}
+
+void
+gnc_sx_summary_print(GncSxSummary *summary)
+{
+ g_message("num_instances: %d", summary->num_instances);
+ g_message("num_to_create: %d", summary->num_to_create_instances);
+ g_message("num_auto_create_instances: %d", summary->num_auto_create_instances);
+ g_message("num_auto_create_no_notify_instances: %d", summary->num_auto_create_no_notify_instances);
+ g_message("need dialog? %s", summary->need_dialog ? "true" : "false");
+}
Copied: gnucash/branches/remove-group2/src/app-utils/gnc-sx-instance-model.h (from rev 15563, gnucash/trunk/src/app-utils/gnc-sx-instance-model.h)
Modified: gnucash/branches/remove-group2/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/gnc-ui-util.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/gnc-ui-util.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,6 +30,9 @@
#include <limits.h>
#include <locale.h>
#include <math.h>
+#ifdef G_OS_WIN32
+#include <pow.h>
+#endif
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
@@ -724,18 +727,34 @@
gnc_lconv_set_utf8 (char **p_value, char *default_value)
{
char *value = *p_value;
+ *p_value = NULL;
if ((value == NULL) || (value[0] == 0))
- *p_value = default_value;
+ value = default_value;
- *p_value = g_locale_to_utf8 (*p_value, -1, NULL, NULL, NULL);
+#ifdef G_OS_WIN32
+ {
+ /* get number of resulting wide characters */
+ size_t count = mbstowcs (NULL, value, 0);
+ if (count > 0) {
+ /* malloc and convert */
+ wchar_t *wvalue = g_malloc ((count+1) * sizeof(wchar_t));
+ count = mbstowcs (wvalue, value, count+1);
+ if (count > 0) {
+ *p_value = g_utf16_to_utf8 (wvalue, -1, NULL, NULL, NULL);
+ }
+ g_free (wvalue);
+ }
+ }
+#else /* !G_OS_WIN32 */
+ *p_value = g_locale_to_utf8 (value, -1, NULL, NULL, NULL);
+#endif
+
if (*p_value == NULL) {
// The g_locale_to_utf8 conversion failed. FIXME: Should we rather
// use an empty string instead of the default_value? Not sure.
*p_value = default_value;
}
- // FIXME: Do we really need to make a copy here ?
- //*p_value = g_strdup (*p_value);
}
static void
Modified: gnucash/branches/remove-group2/src/app-utils/gncmod-app-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/gncmod-app-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/gncmod-app-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,13 +1,12 @@
/*********************************************************************
* gncmod-app-utils.c
- * module definition/initialization for the report infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the report infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -18,32 +17,26 @@
#include "gnc-exp-parser.h"
/* version of the gnc module system interface we require */
-int libgncmod_app_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_app_utils_LTX_gnc_module_current = 0;
-int libgncmod_app_utils_LTX_gnc_module_revision = 0;
-int libgncmod_app_utils_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_app_utils_LTX_gnc_module_path(void);
-char *libgncmod_app_utils_LTX_gnc_module_description(void);
-int libgncmod_app_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_app_utils_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_app_utils_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/app-utils");
}
-char *
-libgncmod_app_utils_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Utilities for building gnc applications");
}
static void
-lmod(char * mn)
+lmod(char * mn)
{
char * form = g_strdup_printf("(use-modules %s)\n", mn);
scm_c_eval_string(form);
@@ -61,7 +54,7 @@
extern SCM scm_init_sw_app_utils_module(void);
int
-libgncmod_app_utils_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
@@ -89,7 +82,7 @@
}
int
-libgncmod_app_utils_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
if (refcount == 0)
gnc_component_manager_shutdown ();
Modified: gnucash/branches/remove-group2/src/app-utils/prefs.scm
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/prefs.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/prefs.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,7 +17,6 @@
;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
;; Boston, MA 02110-1301, USA gnu at gnu.org
-(require 'sort)
(require 'hash-table)
;; (define gnc:*double-entry-restriction*
Property changes on: gnucash/branches/remove-group2/src/app-utils/test
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
test-exp-parser
test-link-module
test-print-parse-amount
test-print-queries
test-scm-query-string
.deps
.libs
semantic.cache
TAGS
*.exe
+ Makefile
Makefile.in
test-exp-parser
test-link-module
test-print-parse-amount
test-print-queries
test-scm-query-string
test-sx
.deps
.libs
semantic.cache
TAGS
*.exe
Modified: gnucash/branches/remove-group2/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -3,7 +3,8 @@
test-load-module \
test-exp-parser \
test-scm-query-string \
- test-print-parse-amount
+ test-print-parse-amount \
+ test-sx
test_exp_parser_SOURCES = \
${top_builddir}/src/core-utils/gnc-gconf-utils.c \
@@ -14,42 +15,42 @@
test-print-parse-amount.c
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_builddir}/src/gnome-utils \
- --guile-load-dir ${top_builddir}/src/core-utils \
- --guile-load-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/gnome
+ --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/calculation \
+ --library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${GUILE_LIBS} \
${QOF_LIBS} \
${GCONF_LIBS}
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-link-module \
test-exp-parser \
test-print-parse-amount \
test-scm-query-string \
- test-print-queries
+ test-print-queries \
+ test-sx
EXTRA_DIST = \
test-load-module
Modified: gnucash/branches/remove-group2/src/app-utils/test/test-exp-parser.c
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/test/test-exp-parser.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/test/test-exp-parser.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -209,10 +209,22 @@
}
static void
+test_variable_expressions()
+{
+ gnc_numeric num;
+ gchar *errLoc = NULL;
+ GHashTable *vars = g_hash_table_new(g_str_hash, g_str_equal);
+ do_test(gnc_exp_parser_parse_separate_vars("123 + a", &num, &errLoc, vars), "parsing");
+ do_test(g_hash_table_size(vars) == 1, "'a' is the variable; good job, gnc-exp-parser!");
+ success("variable found");
+}
+
+static void
real_main (void *closure, int argc, char **argv)
{
/* set_should_print_success (TRUE); */
test_parser();
+ test_variable_expressions();
print_test_results();
exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/app-utils/test/test-load-module
===================================================================
--- gnucash/branches/remove-group2/src/app-utils/test/test-load-module 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/app-utils/test/test-load-module 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
exec guile -s "$0"
!#
Copied: gnucash/branches/remove-group2/src/app-utils/test/test-sx.c (from rev 15563, gnucash/trunk/src/app-utils/test/test-sx.c)
Modified: gnucash/branches/remove-group2/src/backend/file/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,8 @@
SUBDIRS = . test
# Now a shared library AND a GModule
-lib_LTLIBRARIES = libgnc-backend-file-utils.la libgnc-backend-file.la
+lib_LTLIBRARIES = libgnc-backend-file-utils.la
+pkglib_LTLIBRARIES = libgncmod-backend-file.la
AM_CFLAGS = \
-I.. -I../.. \
@@ -38,7 +39,7 @@
sixtp-utils.c \
sixtp.c
-libgnc_backend_file_la_SOURCES = \
+libgncmod_backend_file_la_SOURCES = \
gnc-backend-file.c
noinst_HEADERS = \
@@ -60,13 +61,15 @@
libgnc_backend_file_utils_la_LIBADD = \
${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${QOF_LIBS}
-libgnc_backend_file_la_LDFLAGS = -module -avoid-version
-libgnc_backend_file_la_LIBADD = \
+libgncmod_backend_file_la_LDFLAGS = -module -avoid-version
+libgncmod_backend_file_la_LIBADD = \
${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
libgnc-backend-file-utils.la \
${QOF_LIBS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.file\"
Modified: gnucash/branches/remove-group2/src/backend/file/gnc-account-xml-v2.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/gnc-account-xml-v2.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/gnc-account-xml-v2.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -142,7 +142,8 @@
xmlAddChild(toaddto, gnc_lot_dom_tree_create(lot));
}
}
-
+
+ LEAVE("");
return ret;
}
Modified: gnucash/branches/remove-group2/src/backend/file/gnc-backend-file.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/gnc-backend-file.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/gnc-backend-file.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -32,9 +32,12 @@
#include <glib.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#ifndef HAVE_GLIB_2_8
+#include <gstdio-2.8.h>
+#endif
#include <libintl.h>
#include <locale.h>
-#include <stdio.h>
#include <fcntl.h>
#include <limits.h>
#include <sys/stat.h>
@@ -91,7 +94,7 @@
int rc;
QofBackendError be_err;
- rc = stat (be->lockfile, &statbuf);
+ rc = g_stat (be->lockfile, &statbuf);
if (!rc)
{
/* oops .. file is locked by another user .. */
@@ -99,7 +102,7 @@
return FALSE;
}
- be->lockfd = open (be->lockfile, O_RDWR | O_CREAT | O_EXCL , 0);
+ be->lockfd = g_open (be->lockfile, O_RDWR | O_CREAT | O_EXCL , 0);
if (be->lockfd < 0)
{
/* oops .. we can't create the lockfile .. */
@@ -154,29 +157,29 @@
/* Otherwise, something else is wrong. */
qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_LOCKED);
- unlink (pathbuf);
+ g_unlink (pathbuf);
close (be->lockfd);
- unlink (be->lockfile);
+ g_unlink (be->lockfile);
return FALSE;
}
- rc = stat (be->lockfile, &statbuf);
+ rc = g_stat (be->lockfile, &statbuf);
if (rc)
{
/* oops .. stat failed! This can't happen! */
qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_LOCKED);
- unlink (pathbuf);
+ g_unlink (pathbuf);
close (be->lockfd);
- unlink (be->lockfile);
+ g_unlink (be->lockfile);
return FALSE;
}
if (statbuf.st_nlink != 2)
{
qof_backend_set_error ((QofBackend*)be, ERR_BACKEND_LOCKED);
- unlink (pathbuf);
+ g_unlink (pathbuf);
close (be->lockfd);
- unlink (be->lockfile);
+ g_unlink (be->lockfile);
return FALSE;
}
@@ -208,6 +211,7 @@
if (NULL == be->fullpath)
{
qof_backend_set_error (be_start, ERR_FILEIO_FILE_NOT_FOUND);
+ LEAVE("");
return;
}
be->be.fullpath = be->fullpath;
@@ -218,7 +222,7 @@
int rc;
/* Again check whether the directory can be accessed */
- rc = stat (be->dirname, &statbuf);
+ rc = g_stat (be->dirname, &statbuf);
if (rc != 0 || !S_ISDIR(statbuf.st_mode))
{
/* Error on stat or if it isn't a directory means we
@@ -226,17 +230,19 @@
qof_backend_set_error (be_start, ERR_FILEIO_FILE_NOT_FOUND);
g_free (be->fullpath); be->fullpath = NULL;
g_free (be->dirname); be->dirname = NULL;
+ LEAVE("");
return;
}
- /* Now check whether we can stat(2) the file itself */
- rc = stat (be->fullpath, &statbuf);
+ /* Now check whether we can g_stat the file itself */
+ rc = g_stat (be->fullpath, &statbuf);
if ((rc != 0) && (!create_if_nonexistent))
{
/* Error on stat means the file doesn't exist */
qof_backend_set_error (be_start, ERR_FILEIO_FILE_NOT_FOUND);
g_free (be->fullpath); be->fullpath = NULL;
g_free (be->dirname); be->dirname = NULL;
+ LEAVE("");
return;
}
if (rc == 0 && S_ISDIR(statbuf.st_mode))
@@ -248,6 +254,7 @@
qof_backend_set_error (be_start, ERR_FILEIO_UNKNOWN_FILE_TYPE);
g_free (be->fullpath); be->fullpath = NULL;
g_free (be->dirname); be->dirname = NULL;
+ LEAVE("");
return;
}
}
@@ -261,6 +268,7 @@
if (!ignore_lock && !gnc_file_be_get_file_lock (be))
{
g_free (be->lockfile); be->lockfile = NULL;
+ LEAVE("");
return;
}
@@ -277,7 +285,7 @@
ENTER (" ");
if (be->linkfile)
- unlink (be->linkfile);
+ g_unlink (be->linkfile);
if (be->lockfd > 0)
close (be->lockfd);
@@ -286,18 +294,14 @@
int rv;
#ifdef G_OS_WIN32
/* On windows, we need to allow write-access before
- unlink() can succeed */
- rv = chmod (be->lockfile, S_IWRITE | S_IREAD);
- if (rv) {
- PWARN("Error on chmod(%s): %d: %s", be->lockfile,
- errno, strerror(errno) ? strerror(errno) : "");
- }
+ g_unlink() can succeed */
+ rv = g_chmod (be->lockfile, S_IWRITE | S_IREAD);
#endif
- rv = unlink (be->lockfile);
- if (rv) {
- PWARN("Error on unlink(%s): %d: %s", be->lockfile,
- errno, strerror(errno) ? strerror(errno) : "");
- }
+ rv = g_unlink (be->lockfile);
+ if (rv) {
+ PWARN("Error on g_unlink(%s): %d: %s", be->lockfile,
+ errno, strerror(errno) ? strerror(errno) : "");
+ }
}
g_free (be->dirname);
@@ -341,12 +345,12 @@
ssize_t count_write;
ssize_t count_read;
- orig_fd = open(orig, O_RDONLY);
+ orig_fd = g_open(orig, O_RDONLY, 0);
if(orig_fd == -1)
{
return FALSE;
}
- bkup_fd = creat(bkup, 0600);
+ bkup_fd = g_open(bkup, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
if(bkup_fd == -1)
{
close(orig_fd);
@@ -445,10 +449,10 @@
if (!path) { return FALSE; }
if (0 == safe_strcmp(path, QOF_STDOUT)) { return FALSE; }
- t = fopen(path, "r");
+ t = g_fopen(path, "r");
if(!t) { PINFO (" new file"); return TRUE; }
fclose(t);
- rc = stat(path, &sbuf);
+ rc = g_stat(path, &sbuf);
if(rc < 0) { return FALSE; }
if (sbuf.st_size == 0) { PINFO (" empty file"); return TRUE; }
if(gnc_is_xml_data_file_v2(path, NULL)) { return TRUE; }
@@ -469,7 +473,7 @@
datafile = be->fullpath;
- rc = stat (datafile, &statbuf);
+ rc = g_stat (datafile, &statbuf);
if (rc)
return (errno == ENOENT);
@@ -529,6 +533,7 @@
if(!mktemp(tmp_name))
{
qof_backend_set_error(be, ERR_BACKEND_MISC);
+ LEAVE("");
return FALSE;
}
@@ -536,14 +541,15 @@
{
if(!gnc_file_be_backup_file(fbe))
{
+ LEAVE("");
return FALSE;
}
}
if (gnc_book_write_to_xml_file_v2(book, tmp_name, fbe->file_compression))
{
- /* Record the file's permissions before unlinking it */
- rc = stat(datafile, &statbuf);
+ /* Record the file's permissions before g_unlinking it */
+ rc = g_stat(datafile, &statbuf);
if(rc == 0)
{
/* Use the permissions from the original data file */
@@ -581,28 +587,31 @@
}
#endif
}
- if(unlink(datafile) != 0 && errno != ENOENT)
+ if(g_unlink(datafile) != 0 && errno != ENOENT)
{
qof_backend_set_error(be, ERR_FILEIO_BACKUP_ERROR);
PWARN("unable to unlink filename %s: %s",
datafile ? datafile : "(null)",
strerror(errno) ? strerror(errno) : "");
g_free(tmp_name);
+ LEAVE("");
return FALSE;
}
if(!gnc_int_link_or_make_backup(fbe, tmp_name, datafile))
{
qof_backend_set_error(be, ERR_FILEIO_BACKUP_ERROR);
g_free(tmp_name);
+ LEAVE("");
return FALSE;
}
- if(unlink(tmp_name) != 0)
+ if(g_unlink(tmp_name) != 0)
{
qof_backend_set_error(be, ERR_BACKEND_PERM);
PWARN("unable to unlink temp filename %s: %s",
tmp_name ? tmp_name : "(null)",
strerror(errno) ? strerror(errno) : "");
g_free(tmp_name);
+ LEAVE("");
return FALSE;
}
g_free(tmp_name);
@@ -615,7 +624,7 @@
}
else
{
- if(unlink(tmp_name) != 0)
+ if(g_unlink(tmp_name) != 0)
{
switch (errno) {
case ENOENT: /* tmp_name doesn't exist? Assume "RO" error */
@@ -634,36 +643,33 @@
/* already in an error just flow on through */
}
g_free(tmp_name);
+ LEAVE("");
return FALSE;
}
+ LEAVE("");
return TRUE;
}
/* ================================================================= */
static int
-gnc_file_be_select_files (const struct dirent *d)
+gnc_file_be_select_files (const gchar *d)
{
- int len = strlen(d->d_name) - 4;
-
- if (len <= 0)
- return(0);
-
- return((strcmp(d->d_name + len, ".LNK") == 0) ||
- (strcmp(d->d_name + len, ".xac") == 0) ||
- (strcmp(d->d_name + len, ".log") == 0));
+ return (g_str_has_suffix(d, ".LNK") ||
+ g_str_has_suffix(d, ".xac") ||
+ g_str_has_suffix(d, ".log"));
}
static void
gnc_file_be_remove_old_files(FileBackend *be)
{
- struct dirent *dent;
- DIR *dir;
+ const gchar *dent;
+ GDir *dir;
struct stat lockstatbuf, statbuf;
int pathlen;
time_t now;
- if (stat (be->lockfile, &lockstatbuf) != 0)
+ if (g_stat (be->lockfile, &lockstatbuf) != 0)
return;
pathlen = strlen(be->fullpath);
@@ -684,20 +690,20 @@
* directory and then one pass over the 'matching' files. --
* warlord at MIT.EDU 2002-05-06
*/
-
- dir = opendir (be->dirname);
+
+ dir = g_dir_open (be->dirname, 0, NULL);
if (!dir)
return;
now = time(NULL);
- while((dent = readdir(dir)) != NULL) {
+ while((dent = g_dir_read_name(dir)) != NULL) {
char *name;
int len;
if (gnc_file_be_select_files (dent) == 0)
continue;
- name = g_build_filename(be->dirname, dent->d_name, (char*)NULL);
+ name = g_build_filename(be->dirname, dent, (gchar*)NULL);
len = strlen(name) - 4;
/* Is this file associated with the current data file */
@@ -707,11 +713,11 @@
/* Is a lock file. Skip the active lock file */
(safe_strcmp(name, be->linkfile) != 0) &&
/* Only delete lock files older than the active one */
- (stat(name, &statbuf) == 0) &&
+ (g_stat(name, &statbuf) == 0) &&
(statbuf.st_mtime <lockstatbuf.st_mtime))
{
PINFO ("unlink lock file: %s", name);
- unlink(name);
+ g_unlink(name);
}
else if (be->file_retention_days > 0)
{
@@ -736,14 +742,14 @@
&& file_time > 0
&& days > be->file_retention_days)
{
- PINFO ("unlink stale (%d days old) file: %s", days, name);
- unlink(name);
+ PINFO ("g_unlink stale (%d days old) file: %s", days, name);
+ g_unlink(name);
}
}
}
g_free(name);
}
- closedir (dir);
+ g_dir_close (dir);
}
static void
@@ -935,7 +941,7 @@
/* FIXME: Make sure this doesn't need more sophisticated semantics
* in the face of special file, devices, pipes, symlinks, etc. */
- if (stat(bend->fullpath, &statbuf) == 0) return TRUE;
+ if (g_stat(bend->fullpath, &statbuf) == 0) return TRUE;
return FALSE;
}
@@ -1020,7 +1026,7 @@
be->load_config = NULL;
be->get_config = NULL;
- be->export = gnc_file_be_write_accounts_to_file;
+ be->export = gnc_file_be_write_accounts_to_file;
gnc_be->dirname = NULL;
gnc_be->fullpath = NULL;
@@ -1030,11 +1036,11 @@
gnc_be->primary_book = NULL;
- gnc_be->file_retention_days = (int)gnc_gconf_get_float("general", "retain_days", NULL);
- gnc_be->file_compression = gnc_gconf_get_bool("general", "file_compression", NULL);
+ gnc_be->file_retention_days = (int)gnc_gconf_get_float("general", "retain_days", NULL);
+ gnc_be->file_compression = gnc_gconf_get_bool("general", "file_compression", NULL);
- gnc_gconf_general_register_cb("retain_days", retain_changed_cb, be);
- gnc_gconf_general_register_cb("file_compression", compression_changed_cb, be);
+ gnc_gconf_general_register_cb("retain_days", retain_changed_cb, be);
+ gnc_gconf_general_register_cb("file_compression", compression_changed_cb, be);
return be;
}
@@ -1069,8 +1075,9 @@
prov->partial_book_supported = FALSE;
prov->backend_new = gnc_backend_new;
prov->provider_free = gnc_provider_free;
- prov->check_data_type = gnc_determine_file_type;
+ prov->check_data_type = gnc_determine_file_type;
qof_backend_register_provider (prov);
+ g_module_make_resident (module);
return NULL;
}
Modified: gnucash/branches/remove-group2/src/backend/file/gnc-lot-xml-v2.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/gnc-lot-xml-v2.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/gnc-lot-xml-v2.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -60,7 +60,7 @@
xmlNodePtr ret;
kvp_frame *kf;
- ENTER("(lot=%p)", lot);
+ ENTER("(lot=%p)", lot);
ret = xmlNewNode(NULL, BAD_CAST gnc_lot_string);
xmlSetProp(ret, BAD_CAST "version", BAD_CAST lot_version_string);
@@ -76,6 +76,7 @@
}
}
+ LEAVE("");
return ret;
}
@@ -93,12 +94,13 @@
struct lot_pdata *pdata = p;
GUID *guid;
- ENTER("(lot=%p)", pdata->lot);
+ ENTER("(lot=%p)", pdata->lot);
guid = dom_tree_to_guid(node);
gnc_lot_set_guid(pdata->lot, *guid);
g_free(guid);
+ LEAVE("");
return TRUE;
}
@@ -108,12 +110,12 @@
struct lot_pdata *pdata = p;
gboolean success;
- ENTER("(lot=%p)", pdata->lot);
+ ENTER("(lot=%p)", pdata->lot);
success = dom_tree_to_kvp_frame_given
- (node, gnc_lot_get_slots (pdata->lot));
+ (node, gnc_lot_get_slots (pdata->lot));
+ LEAVE("");
g_return_val_if_fail(success, FALSE);
-
return TRUE;
}
@@ -161,6 +163,7 @@
xmlFreeNode(tree);
+ LEAVE("");
return lot != NULL;
}
@@ -186,6 +189,7 @@
lot = NULL;
}
+ LEAVE("");
return lot;
}
Modified: gnucash/branches/remove-group2/src/backend/file/gnc-schedxaction-xml-v2.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/gnc-schedxaction-xml-v2.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/gnc-schedxaction-xml-v2.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -54,6 +54,7 @@
* <gnc:schedxaction version="1.0.0">
* <sx:id type="guid">...</sx:id>
* <sx:name>Rent</sx:name>
+ * <sx:enabled>y</sx:enabled>
* <sx:autoCreate>y</sx:autoCreate>
* <sx:autoCreateNotify>n</sx:autoCreateNotify>
* <sx:advanceCreateDays>0</sx:advanceCreateDays>
@@ -116,6 +117,7 @@
#define SX_ID "sx:id"
#define SX_NAME "sx:name"
+#define SX_ENABLED "sx:enabled"
#define SX_AUTOCREATE "sx:autoCreate"
#define SX_AUTOCREATE_NOTIFY "sx:autoCreateNotify"
#define SX_ADVANCE_CREATE_DAYS "sx:advanceCreateDays"
@@ -163,6 +165,9 @@
xmlNewTextChild( ret, NULL, BAD_CAST SX_NAME, BAD_CAST xaccSchedXactionGetName(sx) );
+ xmlNewTextChild( ret, NULL, BAD_CAST SX_ENABLED,
+ BAD_CAST ( sx->enabled ? "y" : "n" ) );
+
xmlNewTextChild( ret, NULL, BAD_CAST SX_AUTOCREATE,
BAD_CAST ( sx->autoCreateOption ? "y" : "n" ) );
xmlNewTextChild( ret, NULL, BAD_CAST SX_AUTOCREATE_NOTIFY,
@@ -284,6 +289,18 @@
}
static gboolean
+sx_enabled_handler( xmlNodePtr node, gpointer sx_pdata )
+{
+ struct sx_pdata *pdata = sx_pdata;
+ SchedXaction *sx = pdata->sx;
+ gchar *tmp = dom_tree_to_text( node );
+
+ sx->enabled = (safe_strcmp( tmp, "y" ) == 0 ? TRUE : FALSE );
+
+ return TRUE;
+}
+
+static gboolean
sx_autoCreate_handler( xmlNodePtr node, gpointer sx_pdata )
{
struct sx_pdata *pdata = sx_pdata;
@@ -560,6 +577,7 @@
struct dom_tree_handler sx_dom_handlers[] = {
{ SX_ID, sx_id_handler, 1, 0 },
{ SX_NAME, sx_name_handler, 1, 0 },
+ { SX_ENABLED, sx_enabled_handler, 0, 0 },
{ SX_AUTOCREATE, sx_autoCreate_handler, 1, 0 },
{ SX_AUTOCREATE_NOTIFY, sx_notify_handler, 1, 0 },
{ SX_ADVANCE_CREATE_DAYS, sx_advCreate_handler, 1, 0 },
Modified: gnucash/branches/remove-group2/src/backend/file/gncmod-backend-file.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/gncmod-backend-file.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/gncmod-backend-file.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,49 +1,43 @@
/*********************************************************************
* gncmod-file-backend.c
* module definition/initialization for the file backend module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include <stdio.h>
-#include <glib.h>
-#include <glib-gobject.h>
+#include <gmodule.h>
+/* #include <glib-gobject.h> */
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_backend_file_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_backend_file_LTX_gnc_module_current = 0;
-int libgncmod_backend_file_LTX_gnc_module_revision = 0;
-int libgncmod_backend_file_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
static GNCModule engine;
-/* forward references */
-char *libgncmod_backend_file_LTX_gnc_module_path(void);
-char *libgncmod_backend_file_LTX_gnc_module_description(void);
-int libgncmod_backend_file_LTX_gnc_module_init(int refcount);
-int libgncmod_backend_file_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_backend_file_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/backend/file");
}
-char *
-libgncmod_backend_file_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("The binary and XML (v1 and v2) backends for GnuCash");
}
int
-libgncmod_backend_file_LTX_gnc_module_init(int refcount)
-{
+gnc_module_init(int refcount)
+{
engine = gnc_module_load("gnucash/engine", 0);
if(!engine) return FALSE;
@@ -55,7 +49,7 @@
}
int
-libgncmod_backend_file_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
int unload = TRUE;
Modified: gnucash/branches/remove-group2/src/backend/file/io-example-account.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/io-example-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/io-example-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <glib.h>
+#include <glib/gstdio.h>
#include "sixtp.h"
#include "gnc-engine.h"
@@ -378,7 +379,7 @@
FILE *out;
sixtp_gdv2 data = { 0 };;
- out = fopen(filename, "w");
+ out = g_fopen(filename, "w");
if (out == NULL)
{
return FALSE;
@@ -429,24 +430,14 @@
g_slist_free(list);
}
-static gboolean
-is_directory(const gchar *filename)
-{
- struct stat fileinfo;
-
- stat(filename, &fileinfo);
-
- return S_ISDIR(fileinfo.st_mode);
-}
-
GSList*
gnc_load_example_account_list(const char *dirname)
{
GSList *ret;
- DIR *dir;
- struct dirent *direntry;
+ GDir *dir;
+ const gchar *direntry;
- dir = opendir(dirname);
+ dir = g_dir_open(dirname, 0, NULL);
if(dir == NULL)
{
@@ -455,13 +446,14 @@
ret = NULL;
- for(direntry = readdir(dir); direntry != NULL; direntry = readdir(dir))
+ for(direntry = g_dir_read_name(dir); direntry != NULL;
+ direntry = g_dir_read_name(dir))
{
gchar *filename;
GncExampleAccount *gea;
- filename = g_strdup_printf("%s/%s", dirname, direntry->d_name);
+ filename = g_build_filename(dirname, direntry, (gchar*) NULL);
- if(!is_directory(filename))
+ if(!g_file_test(filename, G_FILE_TEST_IS_DIR))
{
gea = gnc_read_example_account(filename);
@@ -469,14 +461,16 @@
{
g_free(filename);
gnc_free_example_account_list(ret);
+ g_dir_close(dir);
return NULL;
}
-
+
ret = g_slist_append(ret, gea);
}
-
+
g_free(filename);
}
+ g_dir_close(dir);
return ret;
}
Modified: gnucash/branches/remove-group2/src/backend/file/io-gncxml-v2.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/io-gncxml-v2.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/io-gncxml-v2.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -22,7 +22,7 @@
#include "config.h"
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
@@ -247,16 +247,12 @@
static gboolean
add_schedXaction_local(sixtp_gdv2 *data, SchedXaction *sx)
{
- GList *list;
-
- list = gnc_book_get_schedxactions (data->book);
- list = g_list_append(list, sx);
-
- gnc_book_set_schedxactions(data->book, list);
- data->counter.schedXactions_loaded++;
- run_callback(data, "schedXactions");
-
- return TRUE;
+ SchedXactions *sxes;
+ sxes = gnc_book_get_schedxactions(data->book);
+ gnc_sxes_add_sx(sxes, sx);
+ data->counter.schedXactions_loaded++;
+ run_callback(data, "schedXactions");
+ return TRUE;
}
static gboolean
@@ -420,20 +416,20 @@
}
static void
-print_counter_data(load_counter *data)
+debug_print_counter_data(load_counter *data)
{
- PINFO("Transactions: Total: %d, Loaded: %d",
- data->transactions_total, data->transactions_loaded);
- PINFO("Accounts: Total: %d, Loaded: %d",
- data->accounts_total, data->accounts_loaded);
- PINFO("Books: Total: %d, Loaded: %d",
- data->books_total, data->books_loaded);
- PINFO("Commodities: Total: %d, Loaded: %d",
- data->commodities_total, data->commodities_loaded);
- PINFO("Scheduled Tansactions: Total: %d, Loaded: %d",
- data->schedXactions_total, data->schedXactions_loaded);
- PINFO("Budgets: Total: %d, Loaded: %d",
- data->budgets_total, data->budgets_loaded);
+ DEBUG("Transactions: Total: %d, Loaded: %d",
+ data->transactions_total, data->transactions_loaded);
+ DEBUG("Accounts: Total: %d, Loaded: %d",
+ data->accounts_total, data->accounts_loaded);
+ DEBUG("Books: Total: %d, Loaded: %d",
+ data->books_total, data->books_loaded);
+ DEBUG("Commodities: Total: %d, Loaded: %d",
+ data->commodities_total, data->commodities_loaded);
+ DEBUG("Scheduled Tansactions: Total: %d, Loaded: %d",
+ data->schedXactions_total, data->schedXactions_loaded);
+ DEBUG("Budgets: Total: %d, Loaded: %d",
+ data->budgets_total, data->budgets_loaded);
}
static void
@@ -738,7 +734,7 @@
xaccEnableDataScrubbing();
goto bail;
}
- DEBUGCMD (print_counter_data(&gd->counter));
+ debug_print_counter_data(&gd->counter);
/* destroy the parser */
sixtp_destroy (top_parser);
@@ -940,7 +936,7 @@
"transaction",
gnc_book_count_transactions(book),
"schedxaction",
- g_list_length( gnc_book_get_schedxactions(book) ),
+ g_list_length(gnc_book_get_schedxactions(book)->sx_list),
"budget", qof_collection_count(
qof_book_get_collection(book, GNC_ID_BUDGET)),
NULL);
@@ -1075,25 +1071,24 @@
static void
write_schedXactions( FILE *out, QofBook *book, sixtp_gdv2 *gd)
{
- GList *schedXactions;
- SchedXaction *tmpSX;
- xmlNodePtr node;
+ GList *schedXactions;
+ SchedXaction *tmpSX;
+ xmlNodePtr node;
+
+ schedXactions = gnc_book_get_schedxactions(book)->sx_list;
- /* get list of scheduled transactions from QofBook */
- schedXactions = gnc_book_get_schedxactions( book );
+ if ( schedXactions == NULL )
+ return;
- if ( schedXactions == NULL )
- return;
-
- do {
- tmpSX = schedXactions->data;
- node = gnc_schedXaction_dom_tree_create( tmpSX );
- xmlElemDump( out, NULL, node );
- fprintf( out, "\n" );
- xmlFreeNode( node );
- gd->counter.schedXactions_loaded++;
- run_callback(gd, "schedXactions");
- } while ( (schedXactions = schedXactions->next) );
+ do {
+ tmpSX = schedXactions->data;
+ node = gnc_schedXaction_dom_tree_create( tmpSX );
+ xmlElemDump( out, NULL, node );
+ fprintf( out, "\n" );
+ xmlFreeNode( node );
+ gd->counter.schedXactions_loaded++;
+ run_callback(gd, "schedXactions");
+ } while ( (schedXactions = schedXactions->next) );
}
static void
@@ -1183,7 +1178,7 @@
gnc_account_n_descendants(gnc_book_get_root_account(book));
gd->counter.transactions_total = gnc_book_count_transactions(book);
gd->counter.schedXactions_total =
- g_list_length( gnc_book_get_schedxactions(book));
+ g_list_length(gnc_book_get_schedxactions(book)->sx_list);
gd->counter.budgets_total = qof_collection_count(
qof_book_get_collection(book, GNC_ID_BUDGET));
@@ -1245,11 +1240,11 @@
use_gzip = TRUE;
if (!use_gzip)
- return fopen(filename, perms);
+ return g_fopen(filename, perms);
#ifdef G_OS_WIN32
PWARN("Compression not implemented on Windows. Opening uncompressed file.");
- return fopen(filename, perms);
+ return g_fopen(filename, perms);
/* Potential implementation: Windows doesn't have pipe(); use
the g_spawn glib wrappers. */
@@ -1270,7 +1265,7 @@
&child_stdin, NULL, NULL,
&error) ) {
PWARN("G_spawn call failed. Opening uncompressed file.");
- return fopen(filename, perms);
+ return g_fopen(filename, perms);
}
/* FIXME: Now need to set up the child process to write to the
file. */
@@ -1292,14 +1287,14 @@
if (pipe(filedes) < 0) {
PWARN("Pipe call failed. Opening uncompressed file.");
- return fopen(filename, perms);
+ return g_fopen(filename, perms);
}
pid = fork();
switch (pid) {
case -1:
PWARN("Fork call failed. Opening uncompressed file.");
- return fopen(filename, perms);
+ return g_fopen(filename, perms);
case 0: /* child */ {
char buffer[BUFLEN];
@@ -1411,7 +1406,7 @@
{
FILE *out;
- out = fopen(filename, "w");
+ out = g_fopen(filename, "w");
if (out == NULL)
{
return FALSE;
@@ -1434,7 +1429,7 @@
is_gzipped_file(const gchar *name)
{
unsigned char buf[2];
- int fd = open(name, O_RDONLY);
+ int fd = g_open(name, O_RDONLY, 0);
if (fd == -1) {
return FALSE;
Modified: gnucash/branches/remove-group2/src/backend/file/sixtp-dom-parsers.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/sixtp-dom-parsers.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/sixtp-dom-parsers.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -475,18 +475,18 @@
/* no nodes means it's an empty string text */
if(!tree->xmlChildrenNode)
{
- PINFO ("No children");
+ DEBUG("No children");
return g_strdup("");
}
temp = (char*)xmlNodeListGetString (NULL, tree->xmlChildrenNode, TRUE);
if (!temp)
{
- PINFO ("Null string");
+ DEBUG("Null string");
return NULL;
}
- PINFO ("node string is >>>%s<<<", temp);
+ DEBUG("node string [%s]", (temp == NULL ? "(null)" : temp));
result = g_strdup (temp);
xmlFree (temp);
return result;
Modified: gnucash/branches/remove-group2/src/backend/file/sixtp-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/sixtp-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/sixtp-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -381,34 +381,36 @@
#ifdef HAVE_TIMEGM
# define gnc_timegm timegm
-#else
+#else /* !HAVE_TIMEGM */
+
+/* This code originates from GLib 2.12, gtimer.c and works until the year 2100
+ * or the system-dependent maximal date that can be represented by a time_t,
+ * whatever comes first. The old implementation called mktime after setting
+ * the environment variable TZ to UTC. It did not work on Windows, at least.
+ */
+static const gint days_before[] = {
+ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
+};
+
static time_t
gnc_timegm (struct tm *tm)
{
- time_t result;
- char *old_tz;
+ time_t retval;
+ if (tm->tm_mon < 0 || tm->tm_mon > 11)
+ return (time_t) -1;
- old_tz = getenv ("TZ");
- /* FIXME: there's no way to report this error to the caller. */
- if (!g_setenv("TZ", "UTC", 1))
- PERR ("couldn't switch the TZ.");
- result = mktime (tm);
- if(old_tz)
- {
- /* FIXME: there's no way to report this error to the caller. */
- if (!g_setenv("TZ", old_tz, 1))
- PERR ("couldn't switch the TZ back.");
- }
- else
- {
- /* FIXME: there's no way to report this error to the caller. */
- g_unsetenv("TZ");
- if(errno != 0)
- PERR ("couldn't restore the TZ to undefined.");
- }
- return result;
+ retval = (tm->tm_year - 70) * 365;
+ retval += (tm->tm_year - 68) / 4;
+ retval += days_before[tm->tm_mon] + tm->tm_mday - 1;
+
+ if (tm->tm_year % 4 == 0 && tm->tm_mon < 2)
+ retval -= 1;
+
+ retval = ((((retval * 24) + tm->tm_hour) * 60) + tm->tm_min) * 60 + tm->tm_sec;
+
+ return retval;
}
-#endif
+#endif /* HAVE_TIMEGM */
/****************************************************************************/
Modified: gnucash/branches/remove-group2/src/backend/file/sixtp.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/sixtp.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/sixtp.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -24,6 +24,7 @@
#include "config.h"
#include <glib.h>
+#include <glib/gstdio.h>
#include <string.h>
#include <ctype.h>
#include <stdarg.h>
@@ -843,7 +844,7 @@
g_return_val_if_fail(filename, FALSE);
g_return_val_if_fail(first_tag, FALSE);
- f = fopen(filename, "r");
+ f = g_fopen(filename, "r");
if (f == NULL) {
return FALSE;
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -177,13 +177,13 @@
test-xml2-is-file
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --library-dir ${top_builddir}/src/backend/file \
+ --guile-load-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/lib/libqof/qof \
- --gnc-module-dir ${top_srcdir}/src/engine
+ --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/file
TESTS_ENVIRONMENT := \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
@@ -191,13 +191,13 @@
SRCDIR=${srcdir} \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_LTLIBRARIES = libgnc-test-file-stuff.la
+check_LTLIBRARIES = libgnc-test-file-stuff.la
libgnc_test_file_stuff_la_SOURCES = test-file-stuff.c
libgnc_test_file_stuff_la_LIBADD = \
${top_builddir}/src/engine/libgncmod-engine.la
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-date-converting \
test-dom-converters1 \
test-kvp-frames \
@@ -215,10 +215,10 @@
noinst_HEADERS = test-file-stuff.h
LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
./libgnc-test-file-stuff.la \
${LIBXML2_LIBS} \
${QOF_LIBS} \
@@ -244,3 +244,5 @@
test-dom-parser1.c \
test-real-data.sh \
test-xml2-is-file.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.file\"
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-dom-parser1.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-dom-parser1.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-dom-parser1.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -60,7 +60,7 @@
{
parse_file("test-dom-parser1-1.xml", get_parser1_1_parser1());
parse_file("test-dom-parser1-1.xml", get_parser1_1_parser2());
- exit(0);
+ exit(get_rv());
}
static void
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-file-stuff.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-file-stuff.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-file-stuff.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,10 +28,10 @@
#include <sys/stat.h>
#include <dirent.h>
#include <fcntl.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
+#include <glib/gstdio.h>
#include "gnc-engine.h"
#include "sixtp-dom-parsers.h"
@@ -58,8 +58,8 @@
int fd1, fd2;
int amount_read1, amount_read2;
- fd1 = open(f1, O_RDONLY);
- fd2 = open(f2, O_RDONLY);
+ fd1 = g_open(f1, O_RDONLY, 0);
+ fd2 = g_open(f2, O_RDONLY, 0);
do
{
@@ -372,7 +372,7 @@
{
struct stat file_info;
const char *to_open = argv[count];
- if(stat(to_open, &file_info) != 0)
+ if(g_stat(to_open, &file_info) != 0)
{
printf("cannot stat %s.\n", to_open);
failure("unable to stat file");
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-kvp-frames.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-kvp-frames.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-kvp-frames.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -215,6 +215,7 @@
int
main(int argc, char** argv)
{
+ qof_init();
test_kvp_create_delete();
test_kvp_printing();
test_kvp_frames1();
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-load-backend.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-load-backend.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-load-backend.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,7 +30,7 @@
#include "cashobjects.h"
#include "test-stuff.h"
-#define GNC_LIB_NAME "gnc-backend-file"
+#define GNC_LIB_NAME "gncmod-backend-file"
int main (int argc, char ** argv)
{
@@ -41,5 +41,5 @@
" loading gnc-backend-file GModule failed");
print_test_results();
qof_close();
- return 0;
+ exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-load-example-account.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-load-example-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-load-example-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -66,9 +66,9 @@
static void
guile_main (void *closure, int argc, char **argv)
{
- const char *location = getenv("GNC_ACCOUNT_PATH");
+ const char *location = g_getenv("GNC_ACCOUNT_PATH");
GSList *list = NULL;
- DIR *ea_dir;
+ GDir *ea_dir;
if (!location)
{
@@ -78,37 +78,28 @@
gnc_module_system_init();
gnc_module_load("gnucash/engine", 0);
- if((ea_dir = opendir(location)) == NULL)
+ if((ea_dir = g_dir_open(location, 0, NULL)) == NULL)
{
failure("unable to open ea directory");
}
else
{
- struct dirent *entry;
+ const gchar *entry;
- while((entry = readdir(ea_dir)) != NULL)
+ while((entry = g_dir_read_name(ea_dir)) != NULL)
{
- struct stat file_info;
- if(strstr(entry->d_name, da_ending) != NULL)
+ if(g_str_has_suffix(entry, da_ending))
{
- char *to_open = g_strdup_printf("%s/%s", location,
- entry->d_name);
- if(stat(to_open, &file_info) != 0)
+ gchar *to_open = g_build_filename(location, entry, (gchar*)NULL);
+ if (!g_file_test(to_open, G_FILE_TEST_IS_DIR))
{
- failure("unable to stat file");
+ test_load_file(book, to_open);
}
- else
- {
- if(!S_ISDIR(file_info.st_mode))
- {
- test_load_file(to_open);
- }
- }
g_free(to_open);
}
}
}
- closedir(ea_dir);
+ g_dir_close(ea_dir);
{
list = gnc_load_example_account_list(location);
@@ -127,5 +118,5 @@
main (int argc, char ** argv)
{
scm_boot_guile (argc, argv, guile_main, NULL);
- return 0;
+ exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-load-xml2.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-load-xml2.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-load-xml2.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,7 +28,6 @@
#include "config.h"
#include <stdlib.h>
-#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -36,6 +35,7 @@
#include <string.h>
#include <glib.h>
#include <glib-object.h>
+#include <glib/gstdio.h>
#include "cashobjects.h"
#include "TransLog.h"
@@ -47,7 +47,7 @@
#include "test-engine-stuff.h"
#include "test-file-stuff.h"
-#define GNC_LIB_NAME "gnc-backend-file"
+#define GNC_LIB_NAME "gncmod-backend-file"
static void
remove_files_pattern(const char *begining, const char *ending)
@@ -62,9 +62,9 @@
{
to_remove = g_strdup_printf("%s.LCK", filename);
- if(stat(to_remove, &buf) != -1)
+ if(g_stat(to_remove, &buf) != -1)
{
- unlink(to_remove);
+ g_unlink(to_remove);
}
g_free(to_remove);
}
@@ -84,7 +84,7 @@
remove_locks(filename);
- ignore_lock = (safe_strcmp(getenv("SRCDIR"), ".") != 0);
+ ignore_lock = (safe_strcmp(g_getenv("SRCDIR"), ".") != 0);
qof_session_begin(session, filename, ignore_lock, FALSE);
qof_session_load(session, NULL);
@@ -105,8 +105,8 @@
int
main (int argc, char ** argv)
{
- const char *location = getenv("GNC_TEST_FILES");
- DIR *xml2_dir;
+ const char *location = g_getenv("GNC_TEST_FILES");
+ GDir *xml2_dir;
g_type_init();
qof_init();
@@ -121,40 +121,31 @@
xaccLogDisable();
- if((xml2_dir = opendir(location)) == NULL)
+ if((xml2_dir = g_dir_open(location, 0, NULL)) == NULL)
{
failure("unable to open xml2 directory");
}
else
{
- struct dirent *entry;
+ const gchar *entry;
- while((entry = readdir(xml2_dir)) != NULL)
+ while((entry = g_dir_read_name(xml2_dir)) != NULL)
{
- if(strstr(entry->d_name, ".gml2") != NULL)
+ if(g_str_has_suffix(entry, ".gml2"))
{
- struct stat file_info;
- char *to_open = g_strdup_printf("%s/%s", location,
- entry->d_name);
- if(stat(to_open, &file_info) != 0)
+ gchar *to_open = g_build_filename(location, entry, (gchar*)NULL);
+ if(!g_file_test(to_open, G_FILE_TEST_IS_DIR))
{
- failure("unable to stat file");
+ test_load_file(to_open);
}
- else
- {
- if(!S_ISDIR(file_info.st_mode))
- {
- test_load_file(to_open);
- }
- }
g_free(to_open);
}
}
}
- closedir(xml2_dir);
+ g_dir_close(xml2_dir);
print_test_results();
qof_close();
- return 0;
+ exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-save-in-lang.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-save-in-lang.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-save-in-lang.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,6 @@
#include "config.h"
#include <glib.h>
+#include <glib/gstdio.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -92,8 +93,8 @@
return g_strdup_printf("qof_session_load errorid %d", err);
}
- if (!g_setenv("LANG", possible_envs[i], 1))
- return g_strdup_printf("setenv for LANG");
+ if (!g_setenv("LANG", possible_envs[i], TRUE))
+ return g_strdup("setenv for LANG");
new_session = qof_session_new();
@@ -134,28 +135,28 @@
int
main(int argc, char **argv)
{
- DIR *adir;
+ GDir *adir;
gnc_engine_init(argc, argv);
xaccLogDisable();
- if((adir = opendir(test_dir)) == NULL)
+ if((adir = g_dir_open(test_dir, 0, NULL)) == NULL)
{
- failure_args("opendir", __FILE__, __LINE__,
+ failure_args("g_dir_open", __FILE__, __LINE__,
"couldn't open dir %s", test_dir);
}
else
{
- struct dirent *next_file;
+ const gchar *next_file;
- while((next_file = readdir(adir)) != NULL)
+ while((next_file = g_dir_read_name(adir)) != NULL)
{
struct stat file_info;
char* filename;
- filename = g_strdup_printf("%s/%s", test_dir, next_file->d_name);
-
- if(stat(filename, &file_info) != 0)
+ filename = g_build_filename(test_dir, next_file, (gchar*) NULL);
+
+ if(g_stat(filename, &file_info) != 0)
{
failure_args("stat", __FILE__, __LINE__,
"couldn't stat file %s: %s", filename,
@@ -164,7 +165,7 @@
break;
}
- if (!g_setenv("LANG", base_env, 1))
+ if (!g_setenv("LANG", base_env, TRUE))
{
failure_args("setenv", __FILE__, __LINE__,
"setenv of LANG failed");
@@ -187,6 +188,7 @@
g_free(filename);
}
+ g_dir_close(adir);
}
print_test_results();
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-string-converters.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-string-converters.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-string-converters.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -102,6 +102,7 @@
int
main(int argc, char **argv)
{
+ qof_log_init();
test_binary();
fflush(stdout);
test_string_converters();
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-xml-account.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-xml-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-xml-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,7 +25,7 @@
#include "config.h"
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -273,7 +273,7 @@
}
- unlink(filename1);
+ g_unlink(filename1);
g_free(filename1);
xmlFreeNode(test_node);
}
@@ -369,5 +369,5 @@
qof_session_destroy(session);
print_test_results();
qof_close();
- return 0;
+ exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-xml-commodity.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-xml-commodity.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-xml-commodity.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,8 +1,8 @@
#include "config.h"
#include <glib.h>
+#include <glib/gstdio.h>
#include <libguile.h>
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -204,7 +204,7 @@
/* sixtp_destroy(parser); */
}
- unlink(filename1);
+ g_unlink(filename1);
g_free(filename1);
gnc_commodity_destroy(ran_com);
xmlFreeNode(test_node);
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-xml-pricedb.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-xml-pricedb.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-xml-pricedb.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,7 +25,7 @@
#include "config.h"
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -116,7 +116,7 @@
}
}
- unlink (filename1);
+ g_unlink (filename1);
g_free (filename1);
xmlFreeNode (test_node);
}
@@ -150,12 +150,12 @@
{
qof_init();
cashobjects_register();
- qof_log_init_filename("/tmp/gnctest.trace");
- qof_log_set_default(QOF_LOG_DETAIL);
- qof_log_set_level(GNC_MOD_PRICE, QOF_LOG_DETAIL);
- session = qof_session_new ();
- test_generation ();
- print_test_results ();
+ //qof_log_init_filename("/tmp/gnctest.trace");
+ //qof_log_set_default(QOF_LOG_DETAIL);
+ //qof_log_set_level(GNC_MOD_PRICE, QOF_LOG_DETAIL);
+ session = qof_session_new ();
+ test_generation ();
+ print_test_results ();
qof_close();
- return 0;
+ exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-xml-transaction.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-xml-transaction.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-xml-transaction.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,7 +25,7 @@
#include "config.h"
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -471,7 +471,7 @@
/* sixtp_destroy(parser); */
}
- unlink(filename1);
+ g_unlink(filename1);
g_free(filename1);
really_get_rid_of_transaction(ran_trn);
xmlFreeNode(test_node);
@@ -515,5 +515,5 @@
print_test_results();
qof_close();
- return 0;
+ exit(get_rv());
}
Modified: gnucash/branches/remove-group2/src/backend/file/test/test-xml2-is-file.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/file/test/test-xml2-is-file.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/file/test/test-xml2-is-file.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -13,7 +13,7 @@
int
main(int argc, char **argv)
{
- const char *directory = getenv("GNC_TEST_FILES");
+ const char *directory = g_getenv("GNC_TEST_FILES");
char *filename;
if (!directory)
Modified: gnucash/branches/remove-group2/src/backend/postgres/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/backend/postgres/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/postgres/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -111,3 +111,5 @@
.sql.c:
echo "\"-- DO NOT EDIT THIS FILE. IT IS AUTOGENERATED.\"" > $@
cat $< >> $@
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.pg\"
Modified: gnucash/branches/remove-group2/src/backend/postgres/PostgresBackend.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/postgres/PostgresBackend.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/postgres/PostgresBackend.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -508,7 +508,7 @@
qd.resolve_list = NULL;
ENTER (" ");
- if (!be) return;
+ if (!be) { LEAVE(""); return; }
if (0 == ncalls) {
START_CLOCK (9, "starting at level 0");
@@ -654,7 +654,7 @@
qd.xaction_list = NULL;
REPORT_CLOCK (9, "done gathering at call %d", call_count);
- if (NULL == acct_list) return;
+ if (NULL == acct_list) { LEAVE(""); return; }
/* OK, at this point, we have a list of accounts, including the
* date of the earliest split in that account. Now, we need to
@@ -2231,8 +2231,6 @@
/* ---------------------------------------------------------------- */
- // DEBUGCMD (PQtrace(be->connection, stderr));
-
/* set the datestyle to something we can parse */
p = "SET DATESTYLE='ISO';";
SEND_QUERY (be,p, );
Modified: gnucash/branches/remove-group2/src/backend/postgres/checkpoint.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/postgres/checkpoint.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/postgres/checkpoint.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -457,9 +457,9 @@
com = xaccAccountGetCommodity(acc);
if (!com)
{
- PERR ("account %s has no commodity",
- guid_to_string (xaccAccountGetGUID (acc)));
- return;
+ PERR("account %s has no commodity",
+ guid_to_string (xaccAccountGetGUID (acc)));
+ return;
}
chk.commodity = gnc_commodity_get_unique_name(com);
@@ -476,13 +476,13 @@
rec_b = chk.reconciled_balance;
deno = gnc_commodity_get_fraction (com);
- DEBUGCMD({
+ {
char buf[80];
gnc_timespec_to_iso8601_buff (chk.date_start, buf);
- PINFO("%s balance to %s baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " clr=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " rcn=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
- xaccAccountGetDescription (acc), buf,
- b, deno, cl_b, deno, rec_b, deno);
- });
+ DEBUG("%s balance to %s baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " clr=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " rcn=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT,
+ xaccAccountGetDescription (acc), buf,
+ b, deno, cl_b, deno, rec_b, deno);
+ }
/* add up loose entries since the checkpoint */
pgendAccountGetPartialBalance (be, &chk);
@@ -498,13 +498,13 @@
xaccAccountSetStartingBalance (acc, baln, cleared_baln, reconciled_baln);
- DEBUGCMD ({
- char buf[80];
- gnc_timespec_to_iso8601_buff (as_of_date, buf);
- LEAVE("be=%p %s %s baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " clr=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " rcn=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, be,
- xaccAccountGetDescription (acc), buf,
- b, deno, cl_b, deno, rec_b, deno);
- });
+ {
+ char buf[80];
+ gnc_timespec_to_iso8601_buff (as_of_date, buf);
+ LEAVE("be=%p %s %s baln=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " clr=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT " rcn=%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT, be,
+ xaccAccountGetDescription (acc), buf,
+ b, deno, cl_b, deno, rec_b, deno);
+ }
}
/* ============================================================= */
Modified: gnucash/branches/remove-group2/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/backend/postgres/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/postgres/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -14,19 +14,18 @@
TEST_DB_SOCKET_DIR=`pwd`/gnc_test_db_sock \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-load-backend \
test-db \
test-escape \
test-period
LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
- -lltdl \
- -lpq
+ -lpq
test_db_SOURCES = \
${top_srcdir}/src/backend/postgres/PostgresBackend.c \
@@ -77,3 +76,5 @@
EXTRA_DIST = \
db-control.sh \
run-tests.sh
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.pg\"
Modified: gnucash/branches/remove-group2/src/backend/postgres/test/test-db.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/postgres/test/test-db.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/postgres/test/test-db.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -507,7 +507,7 @@
book = qof_session_get_book(session);
be = (PGBackend *) qof_book_get_backend(book);
- if (qof_log_check(log_module, QOF_LOG_DETAIL))
+ if (qof_log_check(log_module, QOF_LOG_DEBUG))
qof_query_print(qn);
sq = sqlQuery_new();
Modified: gnucash/branches/remove-group2/src/backend/postgres/test/test-period.c
===================================================================
--- gnucash/branches/remove-group2/src/backend/postgres/test/test-period.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/backend/postgres/test/test-period.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -130,7 +130,8 @@
g_return_if_fail (io_err == ERR_BACKEND_NO_ERR);
qof_log_set_file (stdout);
- qof_log_set_level_registered (QOF_LOG_INFO);
+ qof_log_set_level("gnc", G_LOG_LEVEL_INFO);
+
closedbook = gnc_book_close_period (openbook, tsmiddle,
NULL, "this is opening balance dude");
Modified: gnucash/branches/remove-group2/src/bin/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/bin/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -22,11 +22,11 @@
gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
${QOF_LIBS} \
${top_builddir}/src/engine/libgncmod-engine.la \
-${top_builddir}/src/gnome/libgncgnome.la \
+${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-${top_builddir}/src/core-utils/libcore-utils.la \
-${top_builddir}/src/gnc-module/libgncmodule.la
+${top_builddir}/src/core-utils/libgnc-core-utils.la \
+${top_builddir}/src/gnc-module/libgnc-module.la
gnucash: gnucash.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
@@ -36,8 +36,7 @@
-e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
-e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
-e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g' \
- -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g'
+ -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g'
mv $@.tmp $@
chmod u+x $@
@@ -49,7 +48,6 @@
-e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
-e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
-e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g' \
-e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g"
mv $@.tmp $@
chmod u+x $@
@@ -98,3 +96,5 @@
-e 's#@-GCONF_SCHEMA_FILE_DIR-@#${GCONF_SCHEMA_FILE_DIR}#g'
mv $@.tmp $@
chmod +x $@
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.bin\"
Modified: gnucash/branches/remove-group2/src/bin/gnucash-bin.c
===================================================================
--- gnucash/branches/remove-group2/src/bin/gnucash-bin.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/gnucash-bin.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -20,7 +20,6 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
* Boston, MA 02110-1301, USA gnu at gnu.org
*/
-
#include "config.h"
#include <stdlib.h>
@@ -67,11 +66,12 @@
#endif
/* Command-line option variables */
-static int gnucash_show_version;
-static const char *add_quotes_file;
-static int nofile;
-static const char *file_to_load;
-static int loglevel;
+static int gnucash_show_version = 0;
+static const char *add_quotes_file = NULL;
+static int nofile = 0;
+static const char *file_to_load = NULL;
+static gchar **log_flags = NULL;
+static gchar *log_to_filename = NULL;
static void
gnc_print_unstable_message(void)
@@ -82,7 +82,7 @@
_("This is a development version. It may or may not work.\n"),
_("Report bugs and other problems to gnucash-devel at gnucash.org.\n"),
_("You can also lookup and file bug reports at http://bugzilla.gnome.org\n"),
- _("The last stable version was "), "GnuCash 2.0.3",
+ _("The last stable version was "), "GnuCash 2.0.4",
_("The next stable version will be "), "GnuCash 2.2");
}
@@ -94,16 +94,16 @@
static char *help_path = GNC_HELPDIR;
static void
-envt_override()
+environment_override()
{
- char *path;
+ const char *path;
- if ((path = getenv("GNC_CONFIG_PATH")))
- config_path = path;
- if ((path = getenv("GNC_SHARE_PATH")))
- share_path = path;
- if ((path = getenv("GNC_DOC_PATH")))
- help_path = path;
+ if ((path = g_getenv("GNC_CONFIG_PATH")))
+ config_path = g_strdup(path);
+ if ((path = g_getenv("GNC_SHARE_PATH")))
+ share_path = g_strdup(path);
+ if ((path = g_getenv("GNC_DOC_PATH")))
+ help_path = g_strdup(path);
}
static gboolean
@@ -197,77 +197,42 @@
char *p;
int debugging = 0;
char *namespace_regexp = NULL;
-#ifndef HAVE_GTK26
- poptContext pc;
- int rc;
- struct poptOption options[] = {
- POPT_AUTOHELP
- {"version", 'v', POPT_ARG_NONE, &gnucash_show_version, 1,
- _("Show GnuCash version"), NULL},
- {"debug", '\0', POPT_ARG_NONE, &debugging, 0,
- _("Enable debugging mode"), NULL},
- {"loglevel", '\0', POPT_ARG_INT, &loglevel, 0,
- /* Translators: This is the command line option autohelp
- text; see popt(3) */
- _("Set the logging level from 0 (least) to 6 (most)"),
- /* Translators: Argument description for autohelp; see popt(3) */
- _("LOGLEVEL")},
- {"nofile", '\0', POPT_ARG_NONE, &nofile, 0,
- _("Do not load the last file opened"), NULL},
- {"config-path", '\0', POPT_ARG_STRING, &config_path, 0,
- _("Set configuration path"),
- /* Translators: Argument description for autohelp; see popt(3) */
- _("CONFIGPATH")},
- {"share-path", '\0', POPT_ARG_STRING, &share_path, 0,
- _("Set shared data file search path"),
- /* Translators: Argument description for autohelp; see popt(3) */
- _("SHAREPATH")},
- {"doc-path", '\0', POPT_ARG_STRING, &help_path, 0,
- _("Set the search path for documentation files"),
- /* Translators: Argument description for autohelp; see popt(3) */
- _("DOCPATH")},
- {"add-price-quotes", '\0', POPT_ARG_STRING, &add_quotes_file, 0,
- _("Add price quotes to given GnuCash datafile"),
- /* Translators: Argument description for autohelp; see popt(3) */
- _("FILE")},
- {"namespace", '\0', POPT_ARG_STRING, &namespace_regexp, 0,
- _("Regular expression determining which namespace commodities will be retrieved"),
- /* Translators: Argument description for autohelp; see popt(3) */
- _("REGEXP")},
- POPT_TABLEEND
- };
-
- /* Pretend that argv[0] is "gnucash" */
- if ((p = strstr(argv[0], "-bin"))) *p = '\0';
-
- pc = poptGetContext(NULL, *argc, (const char **)argv, options, 0);
- poptSetOtherOptionHelp(pc, "[OPTIONS...] [datafile]");
-
- while ((rc = poptGetNextOpt(pc)) > 0);
- file_to_load = poptGetArg(pc);
- poptFreeContext(pc);
-#else
GError *error = NULL;
GOptionContext *context;
GOptionEntry options[] = {
{"version", 'v', 0, G_OPTION_ARG_NONE, &gnucash_show_version,
_("Show GnuCash version"), NULL},
+
{"debug", '\0', 0, G_OPTION_ARG_NONE, &debugging,
_("Enable debugging mode"), NULL},
+
+ {"log", '\0', 0, G_OPTION_ARG_STRING_ARRAY, &log_flags,
+ _("Log level overrides, of the form \"log.ger.path={debug,info,warn,crit,error}\""),
+ _("LOG")},
+
+ {"logto", '\0', 0, G_OPTION_ARG_STRING, &log_to_filename,
+ _("File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or \"stdout\"."),
+ _("LOGTO")},
+
+#if 0
{"loglevel", '\0', 0, G_OPTION_ARG_INT, &loglevel,
/* Translators: This is the command line option autohelp
text; see popt(3) */
- _("Set the logging level from 0 (least) to 6 (most)"),
+ _("Set the logging level from 0 (least) to 6 (most)"),
/* Translators: Argument description for autohelp; see
http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html */
_("LOGLEVEL")},
+#endif // 0
+
{"nofile", '\0', 0, G_OPTION_ARG_NONE, &nofile,
_("Do not load the last file opened"), NULL},
+
{"config-path", '\0', 0, G_OPTION_ARG_STRING, &config_path,
_("Set configuration path"),
/* Translators: Argument description for autohelp; see
http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html */
_("CONFIGPATH")},
+
{"share-path", '\0', 0, G_OPTION_ARG_STRING, &share_path,
_("Set shared data file search path"),
/* Translators: Argument description for autohelp; see
@@ -297,25 +262,33 @@
context = g_option_context_new (" [datafile]");
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
g_option_context_add_group (context, gtk_get_option_group (FALSE));
- g_option_context_parse (context, argc, &argv, &error);
+ if (!g_option_context_parse (context, argc, &argv, &error))
+ {
+ g_error("error parsing command line args: %s", error->message);
+ }
g_option_context_free (context);
+ if (error)
+ g_error_free(error);
if (*argc > 0)
file_to_load = argv[1];
-#endif
if (gnucash_show_version) {
if (is_development_version)
- /* Translators: %s is the version number */
- g_print(_("GnuCash %s development version"), VERSION);
- else
- /* Translators: %s is the version number */
- g_print(_("GnuCash %s"), VERSION);
- g_print("\n");
- /* Translators: 1st %s is the build date; 2nd %s is the SVN
- revision number */
+ {
+ /* Translators: %s is the version number */
+ g_print(_("GnuCash %s development version"), VERSION);
+ }
+ else
+ {
+ /* Translators: %s is the version number */
+ g_print(_("GnuCash %s"), VERSION);
+ }
+ g_print("\n");
+ /* Translators: 1st %s is the build date; 2nd %s is the SVN
+ revision number */
g_print(_("Built %s from r%s"), GNUCASH_BUILD_DATE, GNUCASH_SVN_REV);
- g_print("\n");
+ g_print("\n");
exit(0);
}
@@ -437,7 +410,7 @@
SCM main_mod;
char* fn;
GError *error = NULL;
-
+
main_mod = scm_c_resolve_module("gnucash main");
scm_set_current_module(main_mod);
@@ -458,10 +431,6 @@
before booting guile. */
gnc_main_gui_init();
- /* set a log level before trying to change it globally */
- gnc_log_default();
- qof_log_set_level_registered(loglevel);
-
gnc_hook_add_dangler(HOOK_UI_SHUTDOWN, (GFunc)gnc_file_quit, NULL);
scm_c_eval_string("(gnc:main)");
@@ -495,8 +464,65 @@
return;
}
-int main(int argc, char ** argv)
+static void
+gnc_log_init()
{
+ if (log_to_filename != NULL)
+ {
+ qof_log_init_filename_special(log_to_filename);
+ }
+ else
+ {
+ /* initialize logging to our file. */
+ gchar *tracefilename;
+ tracefilename = g_build_filename(g_get_tmp_dir(), "gnucash.trace",
+ (gchar *)NULL);
+ qof_log_init_filename(tracefilename);
+ g_free(tracefilename);
+ }
+
+ // set a reasonable default.
+ qof_log_set_default(QOF_LOG_WARNING);
+
+ gnc_log_default();
+
+ if (log_flags != NULL)
+ {
+ int i = 0;
+ for (; log_flags[i] != NULL; i++)
+ {
+ QofLogLevel level;
+ gchar **parts = NULL;
+ gchar *logger_name = NULL;
+
+ gchar *log_opt = log_flags[i];
+ parts = g_strsplit(log_opt, "=", 2);
+ if (parts == NULL || parts[0] == NULL || parts[1] == NULL)
+ {
+ g_warning("string [%s] not parseable", log_opt);
+ continue;
+ }
+
+ logger_name = g_strdup(parts[0]);
+ level = qof_log_level_from_string(parts[1]);
+
+ qof_log_set_level(logger_name, level);
+ g_strfreev(parts);
+ }
+ }
+
+ {
+ gchar *log_config_filename;
+ log_config_filename = gnc_build_dotgnucash_path("log.conf");
+ if (g_file_test(log_config_filename, G_FILE_TEST_EXISTS))
+ qof_log_parse_log_config(log_config_filename);
+ g_free(log_config_filename);
+ }
+ }
+
+int
+main(int argc, char ** argv)
+{
gchar *localedir;
GError *binreloc_error = NULL;
@@ -514,16 +540,20 @@
#endif
g_free (localedir);
+ qof_log_init();
+ qof_log_set_default(QOF_LOG_INFO);
+
gnc_module_system_init();
- envt_override();
+ environment_override();
gnucash_command_line(&argc, argv);
gnc_print_unstable_message();
+ gnc_log_init();
if (add_quotes_file) {
gchar *prefix = gnc_path_get_prefix ();
- gchar *pkgsysconfdir = gnc_path_get_pkgsysconfdir ();
- gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
- gchar *pkglibdir = gnc_path_get_pkglibdir ();
+ gchar *pkgsysconfdir = gnc_path_get_pkgsysconfdir ();
+ gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
+ gchar *pkglibdir = gnc_path_get_pkglibdir ();
/* This option needs to run without a display, so we can't
initialize any GUI libraries. */
gnome_program_init(
@@ -534,10 +564,10 @@
GNOME_PARAM_APP_DATADIR, pkgdatadir,
GNOME_PARAM_APP_LIBDIR, pkglibdir,
GNOME_PARAM_NONE);
- g_free (prefix);
- g_free (pkgsysconfdir);
- g_free (pkgdatadir);
- g_free (pkglibdir);
+ g_free (prefix);
+ g_free (pkgsysconfdir);
+ g_free (pkgdatadir);
+ g_free (pkglibdir);
scm_boot_guile(argc, argv, inner_main_add_price_quotes, 0);
exit(0); /* never reached */
}
Modified: gnucash/branches/remove-group2/src/bin/gnucash-valgrind.in
===================================================================
--- gnucash/branches/remove-group2/src/bin/gnucash-valgrind.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/gnucash-valgrind.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -14,16 +14,14 @@
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
TOP_SRC_DIR="@-TOP_SRC_DIR-@"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
-export LTDL_LIBRARY_PATH
#
# Other potentially useful options, particularly for valgrind-2.x:
Modified: gnucash/branches/remove-group2/src/bin/gnucash.in
===================================================================
--- gnucash/branches/remove-group2/src/bin/gnucash.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/gnucash.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -14,14 +14,14 @@
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_MODULE_DIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}@-PATH_SEPARATOR-@@-GNC_PKGLIB_INSTALLDIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
-LTDL_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LTDL_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
-export LTDL_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
exec gnucash-bin "$@"
Modified: gnucash/branches/remove-group2/src/bin/overrides/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/bin/overrides/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/overrides/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,7 +35,6 @@
-e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
-e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
-e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g' \
-e 's#@-GNC_SCRIPT_OVERRIDE_DIR-@#${gncoverridedir}#g'
mv $@.tmp $@
chmod u+x $@
Modified: gnucash/branches/remove-group2/src/bin/overrides/gnucash-build-env.in
===================================================================
--- gnucash/branches/remove-group2/src/bin/overrides/gnucash-build-env.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/overrides/gnucash-build-env.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,45 +30,52 @@
fi
eval `@-GNC_SRCDIR-@/src/gnc-test-env @-GNC_TEST_SRFI_LOAD_CMD-@ \
- --library-dir ${top_builddir}/src/gnome \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_builddir}/lib/guile-www \
- --guile-load-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/backend/file \
+ --gnc-module-dir ${top_builddir}/src/network-utils \
+ --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/tax/us \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/gnome-search \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_builddir}/src/app-file \
- --gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/report/stylesheets \
- --gnc-module-dir ${top_builddir}/src/report/report-gnome \
--gnc-module-dir ${top_builddir}/src/report/report-system \
+ --gnc-module-dir ${top_builddir}/src/report/standard-reports \
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
- --gnc-module-dir ${top_builddir}/src/report/standard-reports \
--gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
- --gnc-module-dir ${top_builddir}/src/backend/rpc \
- --gnc-module-dir ${top_builddir}/src/backend/file \
- --gnc-module-dir ${top_builddir}/src/backend/postgres \
+ --gnc-module-dir ${top_builddir}/src/report/stylesheets \
+ --gnc-module-dir ${top_builddir}/src/register/register-core \
+ --gnc-module-dir ${top_builddir}/src/register/register-gnome \
+ --gnc-module-dir ${top_builddir}/src/register/ledger-core \
+ --gnc-module-dir ${top_builddir}/src/import-export \
+ --gnc-module-dir ${top_builddir}/src/import-export/qif-import \
+ --gnc-module-dir ${top_builddir}/src/import-export/ofx \
+ --gnc-module-dir ${top_builddir}/src/import-export/hbci \
+ --gnc-module-dir ${top_builddir}/src/import-export/log-replay \
--gnc-module-dir ${top_builddir}/src/business/business-core \
--gnc-module-dir ${top_builddir}/src/business/business-core/file \
+ --gnc-module-dir ${top_builddir}/src/business/business-utils \
--gnc-module-dir ${top_builddir}/src/business/dialog-tax-table \
- --gnc-module-dir ${top_builddir}/src/business/business-utils \
--gnc-module-dir ${top_builddir}/src/business/business-ledger \
--gnc-module-dir ${top_builddir}/src/business/business-gnome \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/tax/us \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/report/standard-reports \
+ --guile-load-dir ${top_builddir}/src/report/utility-reports \
+ --guile-load-dir ${top_builddir}/src/report/locale-specific/us \
+ --guile-load-dir ${top_builddir}/src/report/report-gnome \
+ --guile-load-dir ${top_builddir}/src/report/stylesheets \
+ --guile-load-dir ${top_builddir}/src/import-export/qif-import \
+ --guile-load-dir ${top_builddir}/src/business/business-core \
+ --guile-load-dir ${top_builddir}/src/business/business-utils \
+ --guile-load-dir ${top_builddir}/src/business/dialog-tax-table \
+ --guile-load-dir ${top_builddir}/src/business/business-gnome \
--guile-load-dir ${top_builddir}/src/business/business-reports \
- --gnc-module-dir ${top_builddir}/src/import-export \
- --gnc-module-dir ${top_builddir}/src/import-export/qif-io-core \
- --gnc-module-dir ${top_builddir}/src/import-export/qif-import \
- --gnc-module-dir ${top_builddir}/src/import-export/binary-import \
- --gnc-module-dir ${top_builddir}/src/import-export/ofx \
- --gnc-module-dir ${top_builddir}/src/import-export/hbci \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/register/ledger-core \
- --gnc-module-dir ${top_builddir}/src/register/register-gnome \
- --gnc-module-dir ${top_builddir}/src/register/register-core \
`
exec "$@"
Modified: gnucash/branches/remove-group2/src/bin/overrides/gnucash-env.in
===================================================================
--- gnucash/branches/remove-group2/src/bin/overrides/gnucash-env.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/overrides/gnucash-env.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -13,14 +13,14 @@
EXTRA_LIBS="${GNC_MODULE_PATH}"
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_MODULE_DIR-@"
+EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-LTDL_LIBRARY_PATH="${EXTRA_LIBS}:${LTDL_LIBRARY_PATH}"
+DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
-export LTDL_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
exec "$@"
Modified: gnucash/branches/remove-group2/src/bin/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/bin/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/bin/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,6 +2,6 @@
TESTS = test-version
TESTS_ENVIRONMENT := \
- PATH="..:${PATH}" LD_LIBRARY_PATH="${top_builddir}/lib/libqof/qof/.libs:${LD_LIBRARY_PATH}"
+ PATH="..:${PATH}"
EXTRA_DIST = test-version
Modified: gnucash/branches/remove-group2/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,4 @@
SUBDIRS = . test file
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-business-core.la
@@ -15,7 +14,7 @@
libgncmod_business_core_la_SOURCES = \
swig-business-core.c \
gncBusGuile.c \
- businessmod-core.c \
+ gncmod-business-core.c \
gncAddress.c \
gncBillTerm.c \
gncBusiness.c \
@@ -56,8 +55,10 @@
gncVendor.h \
gncVendorP.h
+libgncmod_business_core_la_LDFLAGS = -avoid-version
+
libgncmod_business_core_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${QOF_LIBS} \
${GUILE_LIBS} \
@@ -97,3 +98,5 @@
noinst_DATA = .scm-links
CLEANFILES = gnucash .scm-links ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-business-core.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.core\"
Deleted: gnucash/branches/remove-group2/src/business/business-core/businessmod-core.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/businessmod-core.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/businessmod-core.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,108 +0,0 @@
-/*********************************************************************
- * businessmod-core.c
- * module definition/initialization for the core Business module
- *
- * Copyright (c) 2001 Derek Atkins <warlord at MIT.EDU>
- *
- * 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 <stdio.h>
-#include <glib.h>
-#include <libguile.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "gncAddressP.h"
-#include "gncBillTermP.h"
-#include "gncCustomerP.h"
-#include "gncEmployeeP.h"
-#include "gncEntryP.h"
-#include "gncInvoiceP.h"
-#include "gncJobP.h"
-#include "gncOrderP.h"
-#include "gncOwnerP.h"
-#include "gncTaxTableP.h"
-#include "gncVendorP.h"
-
-extern SCM scm_init_sw_business_core_module (void);
-
-/* version of the gnc module system interface we require */
-int libgncmod_business_core_LTX_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_business_core_LTX_gnc_module_current = 0;
-int libgncmod_business_core_LTX_gnc_module_revision = 0;
-int libgncmod_business_core_LTX_gnc_module_age = 0;
-
-/* forward references */
-char *libgncmod_business_core_LTX_gnc_module_path(void);
-char *libgncmod_business_core_LTX_gnc_module_description(void);
-int libgncmod_business_core_LTX_gnc_module_init(int refcount);
-int libgncmod_business_core_LTX_gnc_module_end(int refcount);
-
-char *
-libgncmod_business_core_LTX_gnc_module_path(void)
-{
- return g_strdup("gnucash/business-core");
-}
-
-char *
-libgncmod_business_core_LTX_gnc_module_description(void)
-{
- return g_strdup("The GnuCash business core");
-}
-
-int
-libgncmod_business_core_LTX_gnc_module_init(int refcount)
-{
- /* load the engine (we depend on it) */
- if(!gnc_module_load("gnucash/engine", 0)) {
- return FALSE;
- }
-
- if(refcount == 0)
- {
- /* initialize known types */
- gncInvoiceRegister ();
- gncJobRegister ();
- gncBillTermRegister ();
- gncCustomerRegister ();
- gncAddressRegister ();
- gncEmployeeRegister ();
- gncEntryRegister ();
- gncOrderRegister ();
- gncOwnerRegister ();
- gncTaxTableRegister ();
- gncVendorRegister ();
- }
-
- scm_init_sw_business_core_module();
- scm_c_eval_string("(use-modules (sw_business_core))");
- scm_c_eval_string("(use-modules (gnucash business-core))");
-
- return TRUE;
-}
-
-int
-libgncmod_business_core_LTX_gnc_module_end(int refcount) {
- return TRUE;
-}
Modified: gnucash/branches/remove-group2/src/business/business-core/file/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/file/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/file/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,13 +41,13 @@
gnc-vendor-xml-v2.h \
xml-helpers.h
-libgncmod_business_backend_file_la_LDFLAGS = -module
+libgncmod_business_backend_file_la_LDFLAGS = -module -avoid-version
libgncmod_business_backend_file_la_LIBADD = \
${top_builddir}/src/business/business-core/libgncmod-business-core.la \
${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${LIBXML2_LIBS} \
${QOF_LIBS} \
${GLIB_LIBS}
Modified: gnucash/branches/remove-group2/src/business/business-core/file/gncmod-business-backend-file.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/file/gncmod-business-backend-file.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/file/gncmod-business-backend-file.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
/*********************************************************************
* gncmod-business-backend-file.c
* module definition/initialization for the file backend module
- *
+ *
* Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
*
* This program is free software; you can redistribute it and/or
@@ -24,8 +24,7 @@
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
@@ -45,38 +44,32 @@
#include "gnc-vendor-xml-v2.h"
/* version of the gnc module system interface we require */
-int libgncmod_business_backend_file_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_business_backend_file_LTX_gnc_module_current = 0;
-int libgncmod_business_backend_file_LTX_gnc_module_revision = 0;
-int libgncmod_business_backend_file_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
static GNCModule bus_core;
static GNCModule file;
-/* forward references */
-char *libgncmod_business_backend_file_LTX_gnc_module_path(void);
-char *libgncmod_business_backend_file_LTX_gnc_module_description(void);
-int libgncmod_business_backend_file_LTX_gnc_module_init(int refcount);
-int libgncmod_business_backend_file_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_business_backend_file_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/business-core-file");
}
-char *
-libgncmod_business_backend_file_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("The XML (v2) parsers for GnuCash business objects");
}
int
-libgncmod_business_backend_file_LTX_gnc_module_init(int refcount)
-{
+gnc_module_init(int refcount)
+{
if(!gnc_engine_is_initialized()) { return FALSE; }
bus_core = gnc_module_load("gnucash/business-core", 0);
@@ -101,7 +94,7 @@
}
int
-libgncmod_business_backend_file_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
int unload = TRUE;
Copied: gnucash/branches/remove-group2/src/business/business-core/gncmod-business-core.c (from rev 15563, gnucash/trunk/src/business/business-core/gncmod-business-core.c)
Modified: gnucash/branches/remove-group2/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -10,13 +10,12 @@
${GLIB_CFLAGS}
LDADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/engine/libgncmod-engine.la \
../libgncmod-business-core.la \
${GLIB_LIBS} \
- ${QOF_LIBS} \
- -lltdl
+ ${QOF_LIBS}
TESTS = \
test-load-module \
@@ -28,18 +27,21 @@
test-vendor
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/business/business-core \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/business/business-core \
--library-dir ${top_builddir}/lib/libqof/qof \
- --gnc-module-dir ${top_srcdir}/src/engine
+ --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
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-load-module \
test-business \
test-address \
Modified: gnucash/branches/remove-group2/src/business/business-core/test/test-customer.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/test/test-customer.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/test/test-customer.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -208,6 +208,7 @@
int
main (int argc, char **argv)
{
+ qof_log_init();
guid_init ();
qof_query_init ();
qof_object_initialize ();
Modified: gnucash/branches/remove-group2/src/business/business-core/test/test-employee.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/test/test-employee.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/test/test-employee.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -217,7 +217,8 @@
int
main (int argc, char **argv)
-{
+{
+ qof_log_init();
guid_init ();
qof_query_init ();
qof_object_initialize ();
Modified: gnucash/branches/remove-group2/src/business/business-core/test/test-job.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/test/test-job.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/test/test-job.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -235,6 +235,7 @@
int
main (int argc, char **argv)
{
+ qof_log_init();
guid_init ();
qof_query_init ();
qof_object_initialize ();
Modified: gnucash/branches/remove-group2/src/business/business-core/test/test-vendor.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-core/test/test-vendor.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-core/test/test-vendor.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -216,6 +216,7 @@
int
main (int argc, char **argv)
{
+ qof_log_init();
guid_init ();
qof_query_init ();
qof_object_initialize ();
Modified: gnucash/branches/remove-group2/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,4 @@
SUBDIRS = . glade schemas ui
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-business-gnome.la
@@ -30,7 +29,6 @@
-I${top_srcdir}/src/register/ledger-core
libgncmod_business_gnome_la_SOURCES = \
- businessmod-gnome.c \
business-options-gnome.c \
business-urls.c \
business-gnome-utils.c \
@@ -46,6 +44,7 @@
dialog-vendor.c \
gnc-plugin-business.c \
gnc-plugin-page-invoice.c \
+ gncmod-business-gnome.c \
search-owner.c
noinst_HEADERS = \
@@ -66,6 +65,8 @@
gnc-plugin-page-invoice.h \
search-owner.h
+libgncmod_business_gnome_la_LDFLAGS = -avoid-version
+
libgncmod_business_gnome_la_LIBADD = \
${top_builddir}/src/business/business-core/libgncmod-business-core.la \
${top_builddir}/src/business/business-ledger/libgnc-business-ledger.la \
@@ -77,8 +78,8 @@
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GLADE_LIBS} \
${GNOME_LIBS} \
${GUILE_LIBS} \
@@ -116,3 +117,5 @@
noinst_DATA = .scm-links
CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.gnome\"
Deleted: gnucash/branches/remove-group2/src/business/business-gnome/businessmod-gnome.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/businessmod-gnome.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/businessmod-gnome.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,149 +0,0 @@
-/*********************************************************************
- * businessmod-core.c
- * module definition/initialization for the Business GNOME UI module
- *
- * Copyright (c) 2001 Derek Atkins <warlord at MIT.EDU>
- *
- * 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
- *
- *********************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include <stdio.h>
-#include <libguile.h>
-
-#include "gnc-hooks.h"
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "search-core-type.h"
-#include "search-owner.h"
-#include "gncOwner.h"
-#include "business-options-gnome.h"
-#include "business-urls.h"
-
-#include "gnc-plugin-manager.h"
-#include "gnc-plugin-business.h"
-
-#include "gnc-hooks.h"
-#include "dialog-invoice.h"
-#include "dialog-preferences.h"
-
-/* version of the gnc module system interface we require */
-int libgncmod_business_gnome_LTX_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_business_gnome_LTX_gnc_module_current = 0;
-int libgncmod_business_gnome_LTX_gnc_module_revision = 0;
-int libgncmod_business_gnome_LTX_gnc_module_age = 0;
-
-/* forward references */
-char *libgncmod_business_gnome_LTX_gnc_module_path(void);
-char *libgncmod_business_gnome_LTX_gnc_module_description(void);
-int libgncmod_business_gnome_LTX_gnc_module_init(int refcount);
-int libgncmod_business_gnome_LTX_gnc_module_end(int refcount);
-
-
-char *
-libgncmod_business_gnome_LTX_gnc_module_path(void)
-{
- return g_strdup("gnucash/business-gnome");
-}
-
-char *
-libgncmod_business_gnome_LTX_gnc_module_description(void)
-{
- return g_strdup("The GnuCash business module GNOME UI");
-}
-
-int
-libgncmod_business_gnome_LTX_gnc_module_init(int refcount)
-{
- /* load business-core: we depend on it -- and it depends on the engine */
- if (!gnc_module_load ("gnucash/business-core", 0)) {
- return FALSE;
- }
- /* We also depend on app-utils, gnome-utils, and gnome-search modules */
- if (!gnc_module_load ("gnucash/app-utils", 0)) {
- return FALSE;
- }
- if (!gnc_module_load ("gnucash/gnome-utils", 0)) {
- return FALSE;
- }
- if (!gnc_module_load ("gnucash/gnome-search", 0)) {
- return FALSE;
- }
- if (!gnc_module_load ("gnucash/report/report-gnome", 0)) {
- return FALSE;
- }
- // if (!gnc_module_load ("gnucash/report/standard-reports", 0)) {
- // return FALSE;
- // }
-
- scm_c_eval_string("(use-modules (gnucash business-gnome))");
- scm_c_eval_string("(use-modules (gnucash report business-reports))");
-
- // temp code until gnc:url-type is wrapped
- /*
- {
- SCM wct_gnc_url_type = scm_c_eval_string("<gnc:url-type>");
- SCM tmp;
-
- tmp = gw_wcp_assimilate_ptr(GNC_CUSTOMER_MODULE_NAME, wct_gnc_url_type);
- scm_c_define("gnc:url-type-customer", tmp);
- tmp = gw_wcp_assimilate_ptr(GNC_VENDOR_MODULE_NAME, wct_gnc_url_type);
- scm_c_define("gnc:url-type-vendor", tmp);
- tmp = gw_wcp_assimilate_ptr(GNC_EMPLOYEE_MODULE_NAME, wct_gnc_url_type);
- scm_c_define("gnc:url-type-employee", tmp);
- tmp = gw_wcp_assimilate_ptr(GNC_INVOICE_MODULE_NAME, wct_gnc_url_type);
- scm_c_define("gnc:url-type-invoice", tmp);
- tmp = gw_wcp_assimilate_ptr(URL_TYPE_OWNERREPORT, wct_gnc_url_type);
- scm_c_define("gnc:url-type-ownerreport", tmp);
- }
- */
-
- if (refcount == 0) {
- /* Register the Owner search type */
- gnc_search_core_register_type (GNC_OWNER_MODULE_NAME,
- (GNCSearchCoreNew) gnc_search_owner_new);
- gnc_business_urls_initialize ();
- gnc_business_options_gnome_initialize ();
-
- gnc_plugin_manager_add_plugin (gnc_plugin_manager_get (),
- gnc_plugin_business_new ());
-
- gnc_hook_add_dangler(HOOK_BOOK_OPENED,
- (GFunc)gnc_invoice_remind_bills_due_cb, NULL);
-
- gnc_preferences_add_page("businessprefs.glade", "business_prefs",
- _("Business"));
- }
-
- return TRUE;
-}
-
-int
-libgncmod_business_gnome_LTX_gnc_module_end(int refcount) {
- return TRUE;
-}
-
Modified: gnucash/branches/remove-group2/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/dialog-invoice.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/dialog-invoice.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -53,10 +53,6 @@
#include "gncEntryLedger.h"
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
-
#include "gnc-plugin-page.h"
#include "gnc-general-search.h"
#include "dialog-date-close.h"
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/billterms.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/billterms.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/billterms.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="billterms_window_destroy_cb" last_modification_time="Mon, 08 Sep 2003 02:00:27 GMT"/>
@@ -78,6 +79,10 @@
<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>
@@ -115,6 +120,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -217,6 +224,10 @@
<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>
@@ -267,6 +278,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">desc_entry</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="left_attach">0</property>
@@ -291,6 +306,10 @@
<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="left_attach">0</property>
@@ -338,6 +357,10 @@
<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="left_attach">1</property>
@@ -441,6 +464,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -576,6 +600,10 @@
<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="left_attach">0</property>
@@ -600,6 +628,10 @@
<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="left_attach">0</property>
@@ -624,6 +656,10 @@
<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="left_attach">0</property>
@@ -661,6 +697,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">name_entry</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>
@@ -700,6 +740,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">desc_entry</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>
@@ -739,6 +783,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">type_combobox</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>
@@ -757,6 +805,7 @@
<property name="visible">True</property>
<property name="items" translatable="yes">Days
Proximo</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="billterms_type_combobox_changed" last_modification_time="Tue, 06 Jun 2006 01:17:37 GMT"/>
</widget>
@@ -793,6 +842,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -864,6 +914,10 @@
<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="left_attach">0</property>
@@ -901,6 +955,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">desc_entry</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>
@@ -963,6 +1021,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">type_combobox</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>
@@ -981,6 +1043,7 @@
<property name="visible">True</property>
<property name="items" translatable="yes">Days
Proximo</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="billterms_type_combobox_changed" last_modification_time="Tue, 06 Jun 2006 01:17:37 GMT"/>
</widget>
@@ -1035,6 +1098,7 @@
<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="GtkNotebook" id="term_notebook">
@@ -1076,6 +1140,10 @@
<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>
@@ -1097,6 +1165,10 @@
<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>
@@ -1118,6 +1190,10 @@
<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>
@@ -1232,6 +1308,10 @@
<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="type">tab</property>
@@ -1269,6 +1349,10 @@
<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>
@@ -1290,6 +1374,10 @@
<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>
@@ -1311,6 +1399,10 @@
<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>
@@ -1332,6 +1424,10 @@
<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>
@@ -1466,6 +1562,10 @@
<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="type">tab</property>
@@ -1489,6 +1589,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/businessprefs.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/businessprefs.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/businessprefs.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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="GtkTable" id="business_prefs">
@@ -40,6 +41,10 @@
<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="left_attach">0</property>
@@ -64,6 +69,10 @@
<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="left_attach">0</property>
@@ -136,6 +145,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/business/bill/days_in_advance</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="left_attach">2</property>
@@ -184,6 +197,10 @@
<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="left_attach">0</property>
@@ -208,6 +225,10 @@
<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="left_attach">0</property>
@@ -281,6 +302,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/business/invoice/number_of_rows</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="left_attach">2</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/choose-owner.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/choose-owner.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/choose-owner.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -72,7 +73,7 @@
<child>
<widget class="GtkLabel" id="title_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(docs)</property>
+ <property name="label">(docs)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -82,6 +83,10 @@
<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>
@@ -126,6 +131,10 @@
<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>
@@ -137,7 +146,7 @@
<child>
<widget class="GtkLabel" id="owner_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(owner)</property>
+ <property name="label">(owner)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -147,6 +156,10 @@
<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>
@@ -171,7 +184,7 @@
<child>
<widget class="GtkLabel" id="desc_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(desc)</property>
+ <property name="label">(desc)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -181,6 +194,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/customer.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/customer.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/customer.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_customer_window_destroy_cb" last_modification_time="Sat, 19 Jul 2003 22:41:20 GMT"/>
@@ -131,6 +132,10 @@
<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>
@@ -152,6 +157,10 @@
<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>
@@ -202,7 +211,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_customer_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:39:38 GMT"/>
</widget>
@@ -223,7 +232,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_customer_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:39:57 GMT"/>
</widget>
@@ -247,6 +256,10 @@
<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>
@@ -277,6 +290,10 @@
<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="type">label_item</property>
@@ -324,6 +341,10 @@
<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>
@@ -345,6 +366,10 @@
<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>
@@ -366,6 +391,10 @@
<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>
@@ -387,6 +416,10 @@
<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>
@@ -408,6 +441,10 @@
<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>
@@ -429,6 +466,10 @@
<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>
@@ -450,6 +491,10 @@
<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>
@@ -471,6 +516,10 @@
<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>
@@ -502,7 +551,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -521,7 +570,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -540,7 +589,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -559,7 +608,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -578,7 +627,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -597,7 +646,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -616,7 +665,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -635,7 +684,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -667,6 +716,10 @@
<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="type">label_item</property>
@@ -732,6 +785,10 @@
<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="type">label_item</property>
@@ -764,6 +821,10 @@
<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="type">tab</property>
@@ -809,6 +870,10 @@
<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>
@@ -830,6 +895,10 @@
<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>
@@ -851,6 +920,10 @@
<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>
@@ -872,6 +945,10 @@
<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>
@@ -893,6 +970,10 @@
<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>
@@ -914,6 +995,10 @@
<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>
@@ -966,7 +1051,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget4">
<property name="visible">True</property>
- <property name="label" translatable="no">(terms)</property>
+ <property name="label">(terms)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1027,7 +1112,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget6">
<property name="visible">True</property>
- <property name="label" translatable="no">(taxincluded)</property>
+ <property name="label">(taxincluded)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1082,7 +1167,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget8">
<property name="visible">True</property>
- <property name="label" translatable="no">(taxtables)</property>
+ <property name="label">(taxtables)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1125,6 +1210,10 @@
<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="type">label_item</property>
@@ -1161,6 +1250,10 @@
<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="type">tab</property>
@@ -1207,6 +1300,10 @@
<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>
@@ -1228,6 +1325,10 @@
<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>
@@ -1249,6 +1350,10 @@
<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>
@@ -1270,6 +1375,10 @@
<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>
@@ -1291,6 +1400,10 @@
<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>
@@ -1312,6 +1425,10 @@
<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>
@@ -1333,6 +1450,10 @@
<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>
@@ -1354,6 +1475,10 @@
<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>
@@ -1385,7 +1510,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1404,7 +1529,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1423,7 +1548,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1442,7 +1567,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1461,7 +1586,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1480,7 +1605,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1499,7 +1624,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1518,7 +1643,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -1550,6 +1675,10 @@
<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="type">label_item</property>
@@ -1590,6 +1719,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/date-close.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/date-close.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/date-close.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -110,6 +111,10 @@
<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>
@@ -131,6 +136,10 @@
<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">3</property>
@@ -169,6 +178,10 @@
<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>
@@ -207,6 +220,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -300,6 +314,10 @@
<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>
@@ -327,6 +345,10 @@
<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>
@@ -348,6 +370,10 @@
<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>
@@ -369,6 +395,10 @@
<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>
@@ -390,6 +420,10 @@
<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>
@@ -411,6 +445,10 @@
<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>
@@ -475,7 +513,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -541,6 +579,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/employee.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/employee.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/employee.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_employee_window_destroy_cb" last_modification_time="Sat, 19 Jul 2003 22:48:49 GMT"/>
@@ -131,6 +132,10 @@
<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>
@@ -152,6 +157,10 @@
<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>
@@ -202,7 +211,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_employee_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:49:16 GMT"/>
</widget>
@@ -223,7 +232,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_employee_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:49:28 GMT"/>
</widget>
@@ -247,6 +256,10 @@
<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>
@@ -277,6 +290,10 @@
<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="type">label_item</property>
@@ -324,6 +341,10 @@
<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>
@@ -345,6 +366,10 @@
<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>
@@ -366,6 +391,10 @@
<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>
@@ -387,6 +416,10 @@
<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>
@@ -408,6 +441,10 @@
<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>
@@ -429,6 +466,10 @@
<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>
@@ -450,6 +491,10 @@
<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>
@@ -471,6 +516,10 @@
<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>
@@ -502,7 +551,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -521,7 +570,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -540,7 +589,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -559,7 +608,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -578,7 +627,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -597,7 +646,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -616,7 +665,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -635,7 +684,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -667,6 +716,10 @@
<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="type">label_item</property>
@@ -714,6 +767,10 @@
<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>
@@ -731,7 +788,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -763,6 +820,10 @@
<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="type">label_item</property>
@@ -810,6 +871,10 @@
<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>
@@ -861,6 +926,10 @@
<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>
@@ -912,6 +981,10 @@
<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>
@@ -963,6 +1036,10 @@
<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>
@@ -1030,6 +1107,10 @@
<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="type">label_item</property>
@@ -1062,6 +1143,10 @@
<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="type">tab</property>
@@ -1107,6 +1192,10 @@
<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="type">label_item</property>
@@ -1139,6 +1228,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/invoice.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/invoice.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/invoice.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_invoice_window_destroy_cb" last_modification_time="Sat, 19 Jul 2003 22:55:50 GMT"/>
@@ -120,6 +121,10 @@
<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>
@@ -141,6 +146,10 @@
<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>
@@ -174,7 +183,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_invoice_id_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:56:07 GMT"/>
</widget>
@@ -224,6 +233,10 @@
<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="type">label_item</property>
@@ -261,7 +274,7 @@
<child>
<widget class="GtkLabel" id="owner_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(owner)</property>
+ <property name="label">(owner)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -271,6 +284,10 @@
<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>
@@ -292,6 +309,10 @@
<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>
@@ -313,6 +334,10 @@
<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>
@@ -334,6 +359,10 @@
<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>
@@ -399,7 +428,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -422,7 +451,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget2">
<property name="visible">True</property>
- <property name="label" translatable="no">(terms)</property>
+ <property name="label">(terms)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -458,6 +487,10 @@
<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="type">label_item</property>
@@ -505,6 +538,10 @@
<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>
@@ -526,6 +563,10 @@
<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>
@@ -604,6 +645,10 @@
<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="type">label_item</property>
@@ -669,6 +714,10 @@
<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="type">label_item</property>
@@ -705,6 +754,7 @@
<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="GtkVBox" id="invoice_entry_vbox">
@@ -750,6 +800,10 @@
<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>
@@ -771,6 +825,10 @@
<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>
@@ -792,6 +850,10 @@
<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>
@@ -813,6 +875,10 @@
<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>
@@ -834,6 +900,10 @@
<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>
@@ -855,6 +925,10 @@
<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>
@@ -885,7 +959,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -938,7 +1012,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -981,6 +1055,10 @@
<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>
@@ -1011,6 +1089,10 @@
<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="type">label_item</property>
@@ -1056,6 +1138,10 @@
<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>
@@ -1077,6 +1163,10 @@
<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>
@@ -1098,6 +1188,10 @@
<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>
@@ -1119,6 +1213,10 @@
<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>
@@ -1140,6 +1238,10 @@
<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>
@@ -1204,7 +1306,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1228,7 +1330,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget8">
<property name="visible">True</property>
- <property name="label" translatable="no">(terms)</property>
+ <property name="label">(terms)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1255,6 +1357,10 @@
<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>
@@ -1285,6 +1391,10 @@
<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="type">label_item</property>
@@ -1349,6 +1459,10 @@
<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="type">label_item</property>
@@ -1396,6 +1510,10 @@
<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>
@@ -1434,6 +1552,10 @@
<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>
@@ -1474,6 +1596,10 @@
<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="type">label_item</property>
@@ -1513,6 +1639,10 @@
<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>
@@ -1553,6 +1683,10 @@
<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="type">label_item</property>
@@ -1590,6 +1724,10 @@
<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="type">label_item</property>
@@ -1619,6 +1757,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1707,6 +1846,10 @@
<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">5</property>
@@ -1792,6 +1935,10 @@
<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="type">label_item</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/job.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/job.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/job.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_job_window_destroy_cb" last_modification_time="Sat, 19 Jul 2003 23:00:18 GMT"/>
@@ -121,6 +122,10 @@
<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>
@@ -142,6 +147,10 @@
<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>
@@ -174,7 +183,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_job_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:58:48 GMT"/>
</widget>
@@ -195,7 +204,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_job_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 22:58:36 GMT"/>
</widget>
@@ -228,6 +237,10 @@
<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="type">label_item</property>
@@ -266,7 +279,7 @@
<child>
<widget class="GtkLabel" id="owner_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(owner)</property>
+ <property name="label">(owner)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -276,6 +289,10 @@
<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>
@@ -297,6 +314,10 @@
<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>
@@ -345,7 +366,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -377,6 +398,10 @@
<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="type">label_item</property>
@@ -425,6 +450,10 @@
<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="type">label_item</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/order.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/order.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/order.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" last_modification_time="Mon, 08 Sep 2003 01:36:38 GMT"/>
@@ -142,6 +143,10 @@
<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>
@@ -163,6 +168,10 @@
<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>
@@ -184,6 +193,10 @@
<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>
@@ -205,6 +218,10 @@
<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>
@@ -236,7 +253,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -316,6 +333,10 @@
<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="type">label_item</property>
@@ -353,7 +374,7 @@
<child>
<widget class="GtkLabel" id="owner_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(owner)</property>
+ <property name="label">(owner)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -363,6 +384,10 @@
<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>
@@ -384,6 +409,10 @@
<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>
@@ -405,6 +434,10 @@
<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>
@@ -426,6 +459,10 @@
<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>
@@ -474,7 +511,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -497,6 +534,10 @@
<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>
@@ -518,6 +559,10 @@
<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>
@@ -548,6 +593,10 @@
<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="type">label_item</property>
@@ -612,6 +661,10 @@
<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="type">label_item</property>
@@ -669,6 +722,10 @@
<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="type">label_item</property>
@@ -705,6 +762,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" last_modification_time="Sat, 19 Jul 2003 23:05:37 GMT"/>
@@ -810,6 +868,10 @@
<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>
@@ -831,6 +893,10 @@
<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>
@@ -863,7 +929,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -909,6 +975,10 @@
<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="type">label_item</property>
@@ -956,6 +1026,10 @@
<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>
@@ -977,6 +1051,10 @@
<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>
@@ -1025,7 +1103,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -1057,6 +1135,10 @@
<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="type">label_item</property>
@@ -1122,6 +1204,10 @@
<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="type">label_item</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/payment.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/payment.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/payment.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_payment_window_destroy_cb" last_modification_time="Mon, 08 Sep 2003 02:39:12 GMT"/>
@@ -105,6 +106,10 @@
<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>
@@ -126,6 +131,10 @@
<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>
@@ -147,6 +156,10 @@
<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>
@@ -168,6 +181,10 @@
<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>
@@ -189,6 +206,10 @@
<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>
@@ -210,6 +231,10 @@
<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>
@@ -360,6 +385,10 @@
<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="type">label_item</property>
@@ -368,8 +397,8 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -384,6 +413,7 @@
<widget class="GtkComboBoxEntry" id="post_combo">
<property name="visible">True</property>
<property name="items">Dummy Entry</property>
+ <property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
</widget>
@@ -402,6 +432,10 @@
<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="type">label_item</property>
@@ -410,8 +444,8 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -450,6 +484,10 @@
<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="type">label_item</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/glade/vendor.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/glade/vendor.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/glade/vendor.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="destroy" handler="gnc_vendor_window_destroy_cb" last_modification_time="Sat, 19 Jul 2003 23:15:46 GMT"/>
@@ -132,6 +133,10 @@
<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>
@@ -153,6 +158,10 @@
<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>
@@ -203,7 +212,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_vendor_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 23:16:23 GMT"/>
</widget>
@@ -224,7 +233,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
<signal name="changed" handler="gnc_vendor_name_changed_cb" last_modification_time="Sat, 19 Jul 2003 23:16:07 GMT"/>
</widget>
@@ -248,6 +257,10 @@
<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>
@@ -278,6 +291,10 @@
<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="type">label_item</property>
@@ -325,6 +342,10 @@
<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>
@@ -346,6 +367,10 @@
<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>
@@ -367,6 +392,10 @@
<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>
@@ -388,6 +417,10 @@
<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>
@@ -409,6 +442,10 @@
<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>
@@ -430,6 +467,10 @@
<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>
@@ -451,6 +492,10 @@
<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>
@@ -472,6 +517,10 @@
<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>
@@ -503,7 +552,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -522,7 +571,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -541,7 +590,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -560,7 +609,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -579,7 +628,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -598,7 +647,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -617,7 +666,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -636,7 +685,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -668,6 +717,10 @@
<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="type">label_item</property>
@@ -733,6 +786,10 @@
<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="type">label_item</property>
@@ -765,6 +822,10 @@
<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="type">tab</property>
@@ -810,6 +871,10 @@
<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>
@@ -831,6 +896,10 @@
<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>
@@ -852,6 +921,10 @@
<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>
@@ -873,6 +946,10 @@
<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>
@@ -925,7 +1002,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget4">
<property name="visible">True</property>
- <property name="label" translatable="no">(terms)</property>
+ <property name="label">(terms)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -952,7 +1029,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget6">
<property name="visible">True</property>
- <property name="label" translatable="no">(taxincluded)</property>
+ <property name="label">(taxincluded)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1007,7 +1084,7 @@
<child>
<widget class="GtkMenuItem" id="convertwidget8">
<property name="visible">True</property>
- <property name="label" translatable="no">(taxtables)</property>
+ <property name="label">(taxtables)</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1050,6 +1127,10 @@
<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="type">label_item</property>
@@ -1086,6 +1167,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-business.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-business.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-business.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -722,7 +722,7 @@
chart_session = qof_session_new();
success = FALSE;
filename = gnc_file_dialog(_("Export Invoices to XML"), NULL,
- "/tmp/qsf-invoices.xml", GNC_FILE_DIALOG_EXPORT);
+ NULL, GNC_FILE_DIALOG_EXPORT);
if (filename)
{
qof_session_begin(chart_session, filename, TRUE, TRUE);
@@ -757,7 +757,7 @@
chart_session = qof_session_new();
success = FALSE;
filename = gnc_file_dialog(_("Export Customers to XML"), NULL,
- "/tmp/qsf-customers.xml", GNC_FILE_DIALOG_EXPORT);
+ NULL, GNC_FILE_DIALOG_EXPORT);
if (filename)
{
qof_session_begin(chart_session, filename, TRUE, TRUE);
@@ -789,7 +789,7 @@
chart_session = qof_session_new();
success = FALSE;
filename = gnc_file_dialog(_("Export Vendors to XML"), NULL,
- "/tmp/qsf-vendors.xml", GNC_FILE_DIALOG_EXPORT);
+ NULL, GNC_FILE_DIALOG_EXPORT);
if (filename)
{
qof_session_begin(chart_session, filename, TRUE, TRUE);
@@ -821,7 +821,7 @@
chart_session = qof_session_new();
success = FALSE;
filename = gnc_file_dialog(_("Export Employees to XML"), NULL,
- "/tmp/qsf-employee.xml", GNC_FILE_DIALOG_EXPORT);
+ NULL, GNC_FILE_DIALOG_EXPORT);
if (filename)
{
qof_session_begin(chart_session, filename, TRUE, TRUE);
Modified: gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-page-invoice.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-page-invoice.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/gnc-plugin-page-invoice.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -384,7 +384,10 @@
page = GNC_PLUGIN_PAGE_INVOICE (plugin_page);
priv = GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(page);
if (priv->widget != NULL)
+ {
+ LEAVE("");
return priv->widget;
+ }
priv->widget = gtk_vbox_new (FALSE, 0);
gtk_widget_show (priv->widget);
@@ -407,6 +410,7 @@
gnc_plugin_page_invoice_refresh_cb,
NULL, page);
+ LEAVE("");
return priv->widget;
}
@@ -421,7 +425,10 @@
priv = GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(page);
if (priv->widget == NULL)
+ {
+ LEAVE("");
return;
+ }
if (priv->component_manager_id) {
gnc_unregister_gui_component(priv->component_manager_id);
@@ -431,6 +438,7 @@
gtk_widget_hide(priv->widget);
gnc_invoice_window_destroy_cb(priv->widget, priv->iw);
priv->widget = NULL;
+ LEAVE("");
}
/** Save enough information about this invoice page that it can be
@@ -460,7 +468,7 @@
invoice = GNC_PLUGIN_PAGE_INVOICE(plugin_page);
priv = GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(invoice);
- gnc_invoice_save_page(priv->iw, key_file, group_name);
+ gnc_invoice_save_page(priv->iw, key_file, group_name);
LEAVE(" ");
}
@@ -487,7 +495,7 @@
ENTER("key_file %p, group_name %s", key_file, group_name);
/* Create the new page. */
- page = gnc_invoice_recreate_page(key_file, group_name);
+ page = gnc_invoice_recreate_page(key_file, group_name);
LEAVE(" ");
return page;
@@ -645,12 +653,15 @@
invoice_sort_type_t value;
ENTER("(action %p, radio action %p, plugin_page %p)",
- action, current, plugin_page);
+ action, current, plugin_page);
+ LEAVE("g_return testing...");
g_return_if_fail(GTK_IS_ACTION(action));
g_return_if_fail(GTK_IS_RADIO_ACTION(current));
g_return_if_fail(GNC_IS_PLUGIN_PAGE_INVOICE(plugin_page));
+ ENTER("...passed (action %p, radio action %p, plugin_page %p)",
+ action, current, plugin_page);
priv = GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(plugin_page);
value = gtk_radio_action_get_current_value(current);
gnc_invoice_window_sort (priv->iw, value);
Copied: gnucash/branches/remove-group2/src/business/business-gnome/gncmod-business-gnome.c (from rev 15563, gnucash/trunk/src/business/business-gnome/gncmod-business-gnome.c)
Modified: gnucash/branches/remove-group2/src/business/business-gnome/search-owner.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/search-owner.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/search-owner.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -68,10 +68,10 @@
static guint signals[LAST_SIGNAL] = { 0 };
#endif
-guint
+GType
gnc_search_owner_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/business/business-gnome/search-owner.h
===================================================================
--- gnucash/branches/remove-group2/src/business/business-gnome/search-owner.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-gnome/search-owner.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -46,7 +46,7 @@
/* signals */
};
-guint gnc_search_owner_get_type (void);
+GType gnc_search_owner_get_type (void);
GNCSearchOwner *gnc_search_owner_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-ledger/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-ledger/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
SUBDIRS = .
-pkglib_LTLIBRARIES = libgnc-business-ledger.la
+lib_LTLIBRARIES = libgnc-business-ledger.la
libgnc_business_ledger_la_SOURCES = \
gncEntryLedger.c \
@@ -26,7 +26,7 @@
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${GTK_LIBS} \
${GUILE_LIBS} \
${QOF_LIBS} \
@@ -48,3 +48,5 @@
${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GLIB_CFLAGS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.ledger\"
Modified: gnucash/branches/remove-group2/src/business/business-reports/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-reports/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-reports/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,3 +35,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.reports\"
Modified: gnucash/branches/remove-group2/src/business/business-reports/aging.scm
===================================================================
--- gnucash/branches/remove-group2/src/business/business-reports/aging.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-reports/aging.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,7 +31,6 @@
(use-modules (gnucash gnc-module))
(require 'hash-table)
-(require 'record)
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/business-core" 0)
Modified: gnucash/branches/remove-group2/src/business/business-reports/easy-invoice.scm
===================================================================
--- gnucash/branches/remove-group2/src/business/business-reports/easy-invoice.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-reports/easy-invoice.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,7 +35,6 @@
(use-modules (gnucash gnc-module))
(require 'hash-table)
-(require 'record)
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/business-utils" 0)
Modified: gnucash/branches/remove-group2/src/business/business-reports/fancy-invoice.scm
===================================================================
--- gnucash/branches/remove-group2/src/business/business-reports/fancy-invoice.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-reports/fancy-invoice.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -53,7 +53,6 @@
(use-modules (gnucash gnc-module))
(require 'hash-table)
-(require 'record)
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/business-utils" 0)
Modified: gnucash/branches/remove-group2/src/business/business-reports/invoice.scm
===================================================================
--- gnucash/branches/remove-group2/src/business/business-reports/invoice.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-reports/invoice.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,7 +29,6 @@
(use-modules (gnucash gnc-module))
(require 'hash-table)
-(require 'record)
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/business-utils" 0)
Modified: gnucash/branches/remove-group2/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/business-utils/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-utils/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -19,8 +19,10 @@
noinst_HEADERS = \
business-options.h
+libgncmod_business_utils_la_LDFLAGS = -avoid-version
+
libgncmod_business_utils_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${GUILE_LIBS} \
${GLIB_LIBS} \
@@ -64,3 +66,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.utils\"
Modified: gnucash/branches/remove-group2/src/business/business-utils/gncmod-business-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/business/business-utils/gncmod-business-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/business-utils/gncmod-business-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
/*********************************************************************
* gncmod-business-utils.c
* module definition/initialization for the Business Utilitizes module
- *
+ *
* Copyright (c) 2003 Derek Atkins <warlord at MIT.EDU>
*
* This program is free software; you can redistribute it and/or
@@ -23,41 +23,35 @@
*********************************************************************/
#include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <glib.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_business_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_business_utils_LTX_gnc_module_current = 0;
-int libgncmod_business_utils_LTX_gnc_module_revision = 0;
-int libgncmod_business_utils_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_business_utils_LTX_gnc_module_path(void);
-char *libgncmod_business_utils_LTX_gnc_module_description(void);
-int libgncmod_business_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_business_utils_LTX_gnc_module_end(int refcount);
char *
-libgncmod_business_utils_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/business-utils");
}
-char *
-libgncmod_business_utils_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("The GnuCash business utilities module");
}
int
-libgncmod_business_utils_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
/* load the business-core (we depend on it) */
if (!gnc_module_load("gnucash/business-core", 0)) {
@@ -69,17 +63,17 @@
return FALSE;
}
- if(refcount == 0)
+ if(refcount == 0)
{
/* initialize known types */
}
-
+
scm_c_eval_string("(use-modules (gnucash business-utils))");
return TRUE;
}
int
-libgncmod_business_utils_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/business/dialog-tax-table/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/dialog-tax-table/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,3 @@
-PWD := $(shell pwd)
-
pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
AM_CFLAGS = \
@@ -27,12 +25,14 @@
noinst_HEADERS = \
dialog-tax-table.h
+libgncmod_dialog_tax_table_la_LDFLAGS = -avoid-version
+
libgncmod_dialog_tax_table_la_LIBADD = \
${top_builddir}/src/business/business-core/libgncmod-business-core.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GLADE_LIBS} \
${GUILE_LIBS} \
${GNOME_LIBS} \
@@ -77,3 +77,5 @@
noinst_DATA = .scm-links
CLEANFILES = gnucash .scm-links ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-dialog-tax-table.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.tax\"
Modified: gnucash/branches/remove-group2/src/business/dialog-tax-table/gncmod-dialog-tax-table.c
===================================================================
--- gnucash/branches/remove-group2/src/business/dialog-tax-table/gncmod-dialog-tax-table.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/dialog-tax-table/gncmod-dialog-tax-table.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
/*********************************************************************
* gncmod-dialog-tax-table.c
* module definition/initialization for the Business Tax Table Dialog module
- *
+ *
* Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
*
* This program is free software; you can redistribute it and/or
@@ -23,43 +23,36 @@
*********************************************************************/
#include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <glib.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
extern SCM scm_init_sw_dialog_tax_table_module(void);
/* version of the gnc module system interface we require */
-int libgncmod_dialog_tax_table_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_dialog_tax_table_LTX_gnc_module_current = 0;
-int libgncmod_dialog_tax_table_LTX_gnc_module_revision = 0;
-int libgncmod_dialog_tax_table_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_dialog_tax_table_LTX_gnc_module_path(void);
-char *libgncmod_dialog_tax_table_LTX_gnc_module_description(void);
-int libgncmod_dialog_tax_table_LTX_gnc_module_init(int refcount);
-int libgncmod_dialog_tax_table_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_dialog_tax_table_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/dialog-tax-table");
}
-char *
-libgncmod_dialog_tax_table_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("The GnuCash tax-table GNOME UI module");
}
int
-libgncmod_dialog_tax_table_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
/* load business-core: we depend on it -- and it depends on the engine */
if (!gnc_module_load ("gnucash/business-core", 0)) {
@@ -80,7 +73,6 @@
}
int
-libgncmod_dialog_tax_table_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
-
Modified: gnucash/branches/remove-group2/src/business/dialog-tax-table/tax-tables.glade
===================================================================
--- gnucash/branches/remove-group2/src/business/dialog-tax-table/tax-tables.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/business/dialog-tax-table/tax-tables.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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>
<property name="has_separator">True</property>
<signal name="destroy" handler="tax_table_window_destroy_cb" last_modification_time="Mon, 08 Sep 2003 03:25:07 GMT"/>
@@ -78,6 +79,10 @@
<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>
@@ -115,6 +120,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -205,6 +212,10 @@
<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>
@@ -242,6 +253,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -347,6 +360,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -438,6 +452,10 @@
<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="left_attach">0</property>
@@ -462,6 +480,10 @@
<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="left_attach">0</property>
@@ -486,6 +508,10 @@
<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="left_attach">0</property>
@@ -522,6 +548,10 @@
<property name="yalign">0</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>
</child>
</widget>
@@ -560,6 +590,10 @@
<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>
</child>
</widget>
@@ -599,6 +633,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">type_combobox</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>
@@ -677,6 +715,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">name_entry</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>
@@ -695,6 +737,7 @@
<property name="visible">True</property>
<property name="items" translatable="yes">Value $
Percent %</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
Modified: gnucash/branches/remove-group2/src/calculation/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/calculation/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/calculation/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,6 +2,8 @@
pkglib_LTLIBRARIES = libgncmod-calculation.la
+libgncmod_calculation_la_LDFLAGS = -avoid-version
+
libgncmod_calculation_la_LIBADD = \
${GLIB_LIBS} ${GUILE_LIBS} \
${QOF_LIBS}
@@ -27,6 +29,7 @@
numeric_ops.h
AM_CFLAGS = \
+ -I${top_srcdir}/lib/libc \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} \
Modified: gnucash/branches/remove-group2/src/calculation/fin.c
===================================================================
--- gnucash/branches/remove-group2/src/calculation/fin.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/calculation/fin.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1196,10 +1196,13 @@
#include <time.h>
#include <stdio.h>
+#include <glib.h>
#include <math.h>
+#ifdef G_OS_WIN32
+#include <pow.h>
+#endif
#include <string.h>
#include <stdlib.h>
-#include <glib.h>
#define FIN_STATICS
#include "finvar.h"
Modified: gnucash/branches/remove-group2/src/calculation/gncmod-calculation.c
===================================================================
--- gnucash/branches/remove-group2/src/calculation/gncmod-calculation.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/calculation/gncmod-calculation.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,47 +1,41 @@
/*********************************************************************
* gncmod-calculation.c
- * module definition/initialization for the calculation module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the calculation module
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_calculation_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_calculation_LTX_gnc_module_current = 0;
-int libgncmod_calculation_LTX_gnc_module_revision = 0;
-int libgncmod_calculation_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_calculation_LTX_gnc_module_path(void);
-char *libgncmod_calculation_LTX_gnc_module_description(void);
-int libgncmod_calculation_LTX_gnc_module_init(int refcount);
-int libgncmod_calculation_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_calculation_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/calculation");
}
-char *
-libgncmod_calculation_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("GnuCash calculation module");
}
int
-libgncmod_calculation_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
return TRUE;
}
int
-libgncmod_calculation_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/calculation/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/calculation/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/calculation/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
TESTS=test-link
-noinst_PROGRAMS=test-link
+check_PROGRAMS=test-link
test_link_SOURCES=test-link.c
test_link_LDADD= \
Modified: gnucash/branches/remove-group2/src/core-utils/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
-lib_LTLIBRARIES = libcore-utils.la
+lib_LTLIBRARIES = libgnc-core-utils.la
-libcore_utils_la_SOURCES = \
+libgnc_core_utils_la_SOURCES = \
gnc-main.c \
gnc-gconf-utils.c \
gnc-gdate-utils.c \
@@ -10,7 +10,7 @@
swig-core-utils.c \
gnc-gtk-utils.c
-libcore_utils_la_LIBADD = \
+libgnc_core_utils_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS} \
${GCONF_LIBS} \
@@ -61,3 +61,5 @@
EXTRA_DIST = $(gncmod_DATA) core-utils.i
CLEANFILES = gnucash .scm-links
MAINTAINERCLEANFILES = swig-core-utils.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.core-utils\"
Modified: gnucash/branches/remove-group2/src/core-utils/core-utils.scm
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/core-utils.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/core-utils.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -6,7 +6,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash core-utils))
-(load-extension "libcore-utils" "scm_init_sw_core_utils_module")
+(load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")
(use-modules (sw_core_utils))
(re-export gnc-is-debugging)
Modified: gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,7 +37,7 @@
#include "config.h"
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
@@ -97,7 +97,7 @@
contents = g_key_file_to_data(key_file, NULL, NULL);
length = strlen(contents);
- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+ fd = g_open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (fd == -1) {
if (error) {
*error = g_error_new(G_FILE_ERROR, g_file_error_from_errno(errno),
Modified: gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.h
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/gnc-gkeyfile-utils.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,11 +37,7 @@
#ifndef GNC_GKEYFILE_UTILS_H
#define GNC_GKEYFILE_UTILS_H
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
-
/** Open and read a key/value file from disk into memory.
*
* @param file The name of the file to load. This should be a fully
Modified: gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -27,7 +27,7 @@
#include "gnc-glib-utils.h"
-int
+int
safe_utf8_collate (const char * da, const char * db)
{
if (da && !(*da))
@@ -222,3 +222,31 @@
gnc_utf8_strip_invalid (result);
return result;
}
+
+GList*
+gnc_g_list_map(GList* list, GncGMapFunc fn, gpointer user_data)
+{
+ GList *rtn = NULL;
+ for (; list != NULL; list = list->next)
+ {
+ rtn = g_list_append(rtn, (*fn)(list->data, user_data));
+ }
+ return rtn;
+}
+
+void
+gnc_g_list_cut(GList **list, GList *cut_point)
+{
+ if (list == NULL || *list == NULL)
+ return;
+
+ // if it's the first element.
+ if (cut_point->prev == NULL)
+ {
+ *list = NULL;
+ return;
+ }
+
+ cut_point->prev->next = NULL;
+ cut_point->prev = NULL;
+}
Modified: gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.h
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/gnc-glib-utils.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -81,7 +81,20 @@
* caller. */
gchar *gnc_utf8_strip_invalid_strdup (const gchar* str);
+typedef gpointer (*GncGMapFunc)(gpointer data, gpointer user_data);
+/**
+ * @return Caller-owned GList* of results of apply `fn` to `list` in order.
+ **/
+GList* gnc_g_list_map(GList* list, GncGMapFunc fn, gpointer user_data);
+
+/**
+ * Cut a GList into two parts; the {@param cut_point} is the beginning of the
+ * new list; {@param list} may need to be modified, but will be the list
+ * before the {@param cut_point}.
+ **/
+void gnc_g_list_cut(GList **list, GList *cut_point);
+
/** @} */
#endif /* GNC_GLIB_UTILS_H */
Modified: gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,25 +29,6 @@
#define CHANGED_ID "changed_id"
-#ifndef HAVE_GTK26
-/* Backwards compatability support for function introduced in gtk
- * 2.6. */
-gchar *
-gtk_combo_box_get_active_text (GtkComboBox *combo_box)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- gchar *text;
-
- if (!gtk_combo_box_get_active_iter(combo_box, &iter))
- return NULL;
- model = gtk_combo_box_get_model(combo_box);
- gtk_tree_model_get(model, &iter, 0, &text, -1);
- return text;
-}
-#endif
-
-
/** Find an entry in the GtkComboBoxEntry by its text value, and set
* the widget to that value. This function also records the index of
* that text value for use when the user leaves the widget.
@@ -190,9 +171,7 @@
model = gtk_combo_box_get_model(GTK_COMBO_BOX(cbe));
gtk_entry_completion_set_model(completion, model);
gtk_entry_completion_set_text_column(completion, 0);
-#ifdef HAVE_GTK26
gtk_entry_completion_set_inline_completion(completion, TRUE);
-#endif
gtk_entry_set_completion(entry, completion);
g_object_unref(completion);
}
Modified: gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.h
===================================================================
--- gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/core-utils/gnc-gtk-utils.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,16 +39,6 @@
#include <gtk/gtk.h>
-/** @name gtk Backwards Compatability Functions
- @{
-*/
-#ifndef HAVE_GTK26
-gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box);
-#endif
-
-/** @} */
-
-
/** @name gtk Miscellaneous Functions
@{
*/
Modified: gnucash/branches/remove-group2/src/doc/loans.txt
===================================================================
--- gnucash/branches/remove-group2/src/doc/loans.txt 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/doc/loans.txt 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,7 @@
/** \page loanhandling Handling loan repayment in GnuCash::Scheduled Transactions
+\sa The original email thread at <http://lists.gnucash.org/pipermail/gnucash-devel/2002-July/006438.html>.
-July, 2002 - jsled at asychronous.org
+July, 2002 - jsled at asynchronous.org
API: \ref SchedXaction
Copied: gnucash/branches/remove-group2/src/doc/sx.rst (from rev 15563, gnucash/trunk/src/doc/sx.rst)
Modified: gnucash/branches/remove-group2/src/doc/xml/gnucash-v2.rnc
===================================================================
--- gnucash/branches/remove-group2/src/doc/xml/gnucash-v2.rnc 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/doc/xml/gnucash-v2.rnc 2007-02-11 19:54:51 UTC (rev 15565)
@@ -336,6 +336,7 @@
attribute version { "1.0.0" },
element sx:id { attribute type { "guid" }, xsd:string { pattern = "[0-9a-f]{32}" }},
element sx:name { text },
+ element sx:enabled { "y" | "n" },
element sx:autoCreate { "y" | "n" },
element sx:autoCreateNotify { "y" | "n" },
element sx:advanceCreateDays { xsd:int },
Modified: gnucash/branches/remove-group2/src/engine/FreqSpec.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/FreqSpec.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/FreqSpec.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -87,11 +87,14 @@
#include "FreqSpecP.h"
-static QofLogModule log_module = GNC_MOD_SX;
+#define LOG_MOD "gnc.engine.freqspec"
+static QofLogModule log_module = LOG_MOD;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN LOG_MOD
+
/*
* FIXME: should be in a header file
*/
-
#ifdef HAVE_LANGINFO_D_FMT
# define GNC_D_FMT (nl_langinfo (D_FMT))
#else
@@ -753,10 +756,10 @@
{
FreqSpec *subFS;
if ( g_list_length( fs->s.composites.subSpecs ) != 5 ) {
- PERR( "Invalid Daily[M-F] structure." );
- snprintf( freqStrBuf, MAX_FREQ_STR_SIZE,
- "Daily[M-F]: error" );
- return;
+ g_critical("Invalid Daily[M-F] structure");
+ snprintf( freqStrBuf, MAX_FREQ_STR_SIZE,
+ "Daily[M-F]: error" );
+ return;
}
/* We assume that all of the weekly FreqSpecs that make up
the Daily[M-F] FreqSpec have the same interval. */
@@ -925,9 +928,9 @@
case UIFREQ_SEMI_YEARLY:
if ( fs->s.monthly.interval_months != 6 ) {
if ( (fs->s.monthly.interval_months % 6) != 0 ) {
- PERR( "ERROR: FreqSpec Semi-Yearly month-interval "
- "is not a multiple of 6 [%d]",
- fs->s.monthly.interval_months );
+ g_critical( "FreqSpec Semi-Yearly month-interval "
+ "is not a multiple of 6 [%d]",
+ fs->s.monthly.interval_months );
}
snprintf( freqStrBuf, MAX_FREQ_STR_SIZE,
/* %u is the number of intervals; %u
@@ -948,9 +951,9 @@
case UIFREQ_YEARLY:
if ( fs->s.monthly.interval_months != 12 ) {
if ( (fs->s.monthly.interval_months % 12) != 0 ) {
- PERR( "ERROR: \"Yearly\" FreqSpec month-interval "
- "is not a multiple of 12 [%d]",
- fs->s.monthly.interval_months );
+ g_critical( "Yearly FreqSpec month-interval "
+ "is not a multiple of 12 [%d]",
+ fs->s.monthly.interval_months );
}
snprintf( freqStrBuf, MAX_FREQ_STR_SIZE,
@@ -1096,18 +1099,15 @@
b->s.monthly.day_of_month );
break;
case MONTH_RELATIVE:
- DEBUG( "MONTH-RELATIVE dates not supported." );
- g_assert( FALSE );
+ g_error( "MONTH-RELATIVE dates not supported." );
break;
case COMPOSITE:
/* We shouldn't see a composite after doing the
* composite-reduction above. */
- DEBUG( "This code should not be reached." );
- g_assert( FALSE );
+ g_error( "This code should not be reached." );
break;
default:
- DEBUG( "Unknown freqspec type %d", fta );
- g_assert( FALSE );
+ g_error( "Unknown freqspec type %d", fta );
break;
}
return 0;
Modified: gnucash/branches/remove-group2/src/engine/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/engine/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,4 @@
SUBDIRS = . test-core test
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-engine.la
@@ -9,7 +8,6 @@
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/gnc-module \
- -I${top_srcdir}/src/business/business-core/ \
${QOF_CFLAGS} \
${GNUCASH_ENGINE_CFLAGS}
@@ -110,9 +108,11 @@
noinst_SCRIPTS = iso-currencies-to-c
+libgncmod_engine_la_LDFLAGS = -avoid-version
+
libgncmod_engine_la_LIBADD = \
- ../gnc-module/libgncmodule.la \
- ../core-utils/libcore-utils.la \
+ ../gnc-module/libgnc-module.la \
+ ../core-utils/libgnc-core-utils.la \
${GUILE_LIBS} \
${QOF_LIBS} \
${REGEX_LIBS} \
@@ -192,3 +192,5 @@
CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links gncla-dir.h \
${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-engine.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.engine\"
Modified: gnucash/branches/remove-group2/src/engine/SX-book-p.h
===================================================================
--- gnucash/branches/remove-group2/src/engine/SX-book-p.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/SX-book-p.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,23 +35,16 @@
#define GNC_SX_BOOK_P_H
#include "qof.h"
+#include "SX-book.h"
/* ====================================================================== */
-struct xaccSchedXactionsDef {
- GList *sx_list;
- gboolean sx_notsaved;
-};
+SchedXactions* gnc_collection_get_schedxactions(const QofCollection *col);
-void gnc_book_set_schedxactions( QofBook *book, GList *newList );
-void gnc_collection_set_schedxactions( QofCollection *col, GList *newList );
-
-
/* Associate the given template root account with a book */
void gnc_book_set_template_root (QofBook *book, Account *templateRoot);
-
gboolean gnc_sxtt_register (void);
#endif /* GNC_SX_BOOK_P_H */
Modified: gnucash/branches/remove-group2/src/engine/SX-book.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/SX-book.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/SX-book.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -44,6 +44,7 @@
#include "SchedXaction.h"
#include "SX-book.h"
#include "SX-book-p.h"
+#include "gnc-event.h"
static QofLogModule log_module = GNC_MOD_SX;
@@ -94,8 +95,8 @@
if (templateRoot && gnc_account_get_book(templateRoot) != book)
{
- PERR ("cannot mix and match books freely!");
- return;
+ g_critical("cannot mix and match books freely!");
+ return;
}
col = qof_book_get_collection (book, GNC_ID_SXTG);
@@ -124,7 +125,6 @@
gnc_book_set_template_root (book, NULL);
}
-
static gboolean
sxtg_is_dirty(const QofCollection *col)
{
@@ -175,78 +175,45 @@
/* ====================================================================== */
-SchedXactions *
-gnc_collection_get_schedxaction_list(const QofCollection *col)
-{
- return qof_collection_get_data (col);
-}
-
-GList *
+SchedXactions*
gnc_collection_get_schedxactions(const QofCollection *col)
{
- SchedXactions *list;
- list = qof_collection_get_data (col);
- if (list) return list->sx_list;
- return NULL;
+ SchedXactions *rtn = qof_collection_get_data(col);
+ // @@assert(rtn != null);
+ return rtn;
}
-GList *
+SchedXactions*
gnc_book_get_schedxactions(QofBook *book)
{
QofCollection *col;
- col = qof_book_get_collection (book, GNC_ID_SXTT);
- return gnc_collection_get_schedxactions (col);
+ col = qof_book_get_collection(book, GNC_ID_SCHEDXACTION);
+ return gnc_collection_get_schedxactions(col);
}
void
-gnc_collection_set_schedxactions( QofCollection *col, GList *newList )
+gnc_sxes_add_sx(SchedXactions *sxes, SchedXaction *sx)
{
- SchedXactions *old_list, *new_list;
- if ( col == NULL ) return;
-
- old_list = qof_collection_get_data (col);
- if (old_list && old_list->sx_list == newList)
- {
- /* Assume the worst, that any 'set' means the data has
- * changed, and needs to be saved. */
- old_list->sx_notsaved = TRUE;
- return;
- }
-
- new_list = g_new (SchedXactions, 1);
- new_list->sx_list = newList;
- new_list->sx_notsaved = TRUE;
- if (NULL == newList) new_list->sx_notsaved = FALSE;
-
- qof_collection_set_data (col, new_list);
-
- g_free (old_list);
+ if (g_list_find(sxes->sx_list, sx) != NULL)
+ return;
+ sxes->sx_list = g_list_append(sxes->sx_list, sx);
+ qof_event_gen(&sxes->inst.entity, GNC_EVENT_ITEM_ADDED, (gpointer)sx);
}
void
-gnc_book_set_schedxactions( QofBook *book, GList *newList )
+gnc_sxes_del_sx(SchedXactions *sxes, SchedXaction *sx)
{
- QofCollection *col;
- if ( book == NULL ) return;
-
- col = qof_book_get_collection (book, GNC_ID_SXTT);
- gnc_collection_set_schedxactions (col, newList);
+ GList *to_remove;
+ to_remove = g_list_find(sxes->sx_list, sx);
+ if (to_remove == NULL)
+ return;
+ sxes->sx_list = g_list_delete_link(sxes->sx_list, to_remove);
+ qof_event_gen(&sxes->inst.entity, GNC_EVENT_ITEM_REMOVED, (gpointer)sx);
}
/* ====================================================================== */
/* SX-trans stuff */
-static void
-sxtt_book_begin (QofBook *book)
-{
- gnc_book_set_schedxactions (book, NULL);
-}
-
-static void
-sxtt_book_end (QofBook *book)
-{
- gnc_book_set_schedxactions (book, NULL);
-}
static void
mark_sx_clean(gpointer data, gpointer user_data)
{
@@ -255,13 +222,28 @@
}
static void
+book_sxes_setup(QofBook *book)
+{
+ QofCollection *col;
+ SchedXactions *sxes;
+
+ col = qof_book_get_collection(book, GNC_ID_SCHEDXACTION);
+ sxes = g_new (SchedXactions, 1);
+ qof_instance_init(&sxes->inst, GNC_ID_SXES, book);
+ sxes->sx_list = NULL;
+ sxes->sx_notsaved = TRUE;
+ qof_collection_set_data(col, sxes);
+}
+
+static void
book_sxns_mark_saved(QofCollection *col)
{
SchedXactions *sxl;
-
- sxl = gnc_collection_get_schedxaction_list (col);
- if (sxl) sxl->sx_notsaved = FALSE;
- g_list_foreach(gnc_collection_get_schedxactions(col),
+ sxl = gnc_collection_get_schedxactions(col);
+ if (!sxl)
+ return;
+ sxl->sx_notsaved = FALSE;
+ g_list_foreach(sxl->sx_list,
mark_sx_clean,
NULL);
}
@@ -272,10 +254,11 @@
GList *sxlist;
SchedXactions *sxl;
- sxl = gnc_collection_get_schedxaction_list (col);
+ sxl = gnc_collection_get_schedxactions(col);
+ if (!sxl) return FALSE;
if((sxl && sxl->sx_notsaved)) return TRUE;
- for(sxlist = gnc_collection_get_schedxactions(col);
+ for(sxlist = sxl->sx_list;
sxlist != NULL;
sxlist = g_list_next(sxlist))
{
@@ -287,6 +270,21 @@
return FALSE;
}
+
+static QofObject sxes_object_def =
+{
+ interface_version: QOF_OBJECT_VERSION,
+ e_type: GNC_ID_SXES,
+ type_label: "Scheduled Transactions List",
+ create: NULL,
+ book_begin: book_sxes_setup,
+ book_end: NULL,
+ is_dirty: book_sxlist_notsaved,
+ mark_clean: book_sxns_mark_saved,
+ foreach: NULL,
+ printable: NULL,
+ version_cmp: NULL
+};
static QofObject sxtt_object_def =
{
@@ -294,10 +292,10 @@
e_type: GNC_ID_SXTT,
type_label: "Scheduled Transaction Templates",
create: NULL,
- book_begin: sxtt_book_begin,
- book_end: sxtt_book_end,
- is_dirty: book_sxlist_notsaved,
- mark_clean: book_sxns_mark_saved,
+ book_begin: NULL,
+ book_end: NULL,
+ is_dirty: NULL,
+ mark_clean: NULL,
foreach: NULL,
printable: NULL,
version_cmp: NULL,
@@ -306,8 +304,11 @@
gboolean
gnc_sxtt_register (void)
{
- return qof_object_register (&sxtg_object_def);
- return qof_object_register (&sxtt_object_def);
+ if (!qof_object_register(&sxes_object_def))
+ return FALSE;
+ if (!qof_object_register(&sxtg_object_def))
+ return FALSE;
+ return qof_object_register(&sxtt_object_def);
}
GList*
@@ -315,7 +316,7 @@
{
GList *rtn = NULL;
const GUID *acct_guid = xaccAccountGetGUID(acct);
- GList *sx_list = gnc_book_get_schedxactions(book);
+ GList *sx_list = gnc_book_get_schedxactions(book)->sx_list;
for (; sx_list != NULL; sx_list = sx_list->next)
{
SchedXaction *sx = (SchedXaction*)sx_list->data;
Modified: gnucash/branches/remove-group2/src/engine/SX-book.h
===================================================================
--- gnucash/branches/remove-group2/src/engine/SX-book.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/SX-book.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,6 +30,7 @@
* @brief Anchor Scheduled Transaction info in a book.
* See src/doc/books.txt for design overview.
* @author Copyright (c) 2003 Linas Vepstas <linas at linas.org>
+ * @author Copyright (c) 2006 Joshua Sled <jsled at asynchronous.org>
*
* XXX currently, this is crufty, it should be modified to use
* entities a bit more whole-heartedly than it does.
@@ -39,14 +40,25 @@
#define GNC_SX_BOOK_H
#include <glib.h>
+#include "SchedXaction.h"
#include "qof.h"
typedef struct xaccSchedXactionsDef SchedXactions;
-SchedXactions * gnc_collection_get_schedxaction_list(const QofCollection *col);
-GList * gnc_collection_get_schedxactions(const QofCollection *col);
-GList * gnc_book_get_schedxactions(QofBook *book);
+struct xaccSchedXactionsDef {
+ QofInstance inst;
+ GList* sx_list;
+ gboolean sx_notsaved;
+};
+#define GNC_IS_SXES(obj) (QOF_CHECK_TYPE((obj), GNC_ID_SXES))
+#define GNC_SXES(obj) (QOF_CHECK_CAST((obj), GNC_ID_SXES, SchedXactions))
+
+SchedXactions* gnc_book_get_schedxactions(QofBook* book);
+
+void gnc_sxes_add_sx(SchedXactions* sxes, SchedXaction* sx);
+void gnc_sxes_del_sx(SchedXactions* sxes, SchedXaction* sx);
+
/** Returns the template group from the book. **/
Account *gnc_book_get_template_root(QofBook *book);
Modified: gnucash/branches/remove-group2/src/engine/SchedXaction.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/SchedXaction.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/SchedXaction.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,7 +39,10 @@
#include "Transaction.h"
#include "gnc-engine.h"
-static QofLogModule log_module = GNC_MOD_SX;
+#define LOG_MOD "gnc.engine.sx"
+static QofLogModule log_module = LOG_MOD;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN LOG_MOD
/* Local Prototypes *****/
@@ -58,6 +61,7 @@
g_date_clear( &sx->start_date, 1 );
g_date_clear( &sx->end_date, 1 );
+ sx->enabled = 1;
sx->num_occurances_total = 0;
sx->autoCreateOption = FALSE;
sx->autoCreateNotify = FALSE;
@@ -187,16 +191,21 @@
static void commit_err (QofInstance *inst, QofBackendError errcode)
{
- PERR ("Failed to commit: %d", errcode);
+ g_critical("Failed to commit: %d", errcode);
}
-static void noop (QofInstance *inst) {}
+static void commit_done(QofInstance *inst)
+{
+ qof_event_gen (&inst->entity, QOF_EVENT_MODIFY, NULL);
+}
+static void noop(QofInstance *inst) {}
+
void
gnc_sx_commit_edit (SchedXaction *sx)
{
if (!qof_commit_edit (QOF_INSTANCE(sx))) return;
- qof_commit_edit_part2 (&sx->inst, commit_err, noop, noop);
+ qof_commit_edit_part2 (&sx->inst, commit_err, commit_done, noop);
}
/* ============================================================ */
@@ -368,13 +377,30 @@
gnc_sx_commit_edit(sx);
}
+gboolean
+xaccSchedXactionGetEnabled( SchedXaction *sx )
+{
+ return sx->enabled;
+}
+
void
+xaccSchedXactionSetEnabled( SchedXaction *sx, gboolean newEnabled)
+{
+ gnc_sx_begin_edit(sx);
+ sx->enabled = newEnabled;
+ qof_instance_set_dirty(&sx->inst);
+ gnc_sx_commit_edit(sx);
+}
+
+void
xaccSchedXactionGetAutoCreate( SchedXaction *sx,
gboolean *outAutoCreate,
gboolean *outNotify )
{
- *outAutoCreate = sx->autoCreateOption;
- *outNotify = sx->autoCreateNotify;
+ if (outAutoCreate != NULL)
+ *outAutoCreate = sx->autoCreateOption;
+ if (outNotify != NULL)
+ *outNotify = sx->autoCreateNotify;
return;
}
@@ -466,14 +492,14 @@
if ( xaccSchedXactionHasEndDate( sx ) ) {
GDate *end_date = xaccSchedXactionGetEndDate( sx );
if ( g_date_compare( &next_occur, end_date ) > 0 ) {
- PINFO( "next_occur past end date" );
+ g_debug("next_occur past end date");
g_date_clear( &next_occur, 1 );
}
} else if ( xaccSchedXactionHasOccurDef( sx ) ) {
if ( stateData ) {
temporalStateData *tsd = (temporalStateData*)stateData;
if ( tsd->num_occur_rem == 0 ) {
- PINFO( "no more occurances remain" );
+ g_debug("no more occurances remain");
g_date_clear( &next_occur, 1 );
}
} else {
Modified: gnucash/branches/remove-group2/src/engine/SchedXaction.h
===================================================================
--- gnucash/branches/remove-group2/src/engine/SchedXaction.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/SchedXaction.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -42,6 +42,9 @@
#include "FreqSpec.h"
#include "gnc-engine.h"
+#define GNC_IS_SX(obj) (QOF_CHECK_TYPE((obj), GNC_ID_SCHEDXACTION))
+#define GNC_SX(obj) (QOF_CHECK_CAST((obj), GNC_ID_SCHEDXACTION, SchedXaction))
+
/**
* The SchedXaction data.
*/
@@ -121,6 +124,9 @@
GList *xaccSchedXactionGetSplits( SchedXaction *sx );
void xaccSchedXactionSetSplits( SchedXaction *sx, GList *newSplits );
+gboolean xaccSchedXactionGetEnabled( SchedXaction *sx );
+void xaccSchedXactionSetEnabled( SchedXaction *sx, gboolean newEnabled );
+
void xaccSchedXactionGetAutoCreate( SchedXaction *sx,
gboolean *outAutoCreate,
gboolean *outNotify );
@@ -196,7 +202,7 @@
This is a date-sorted state-data instance list.
The list should not be modified by the caller; use the
- gnc_sx_{add,remove}_defer_instance() functions to modifiy the list.
+ gnc_sx_{add,remove}_defer_instance() functions to modify the list.
*/
GList *gnc_sx_get_defer_instances( SchedXaction *sx );
Modified: gnucash/branches/remove-group2/src/engine/SchedXactionP.h
===================================================================
--- gnucash/branches/remove-group2/src/engine/SchedXactionP.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/SchedXactionP.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -68,6 +68,7 @@
/* the current instance-count of the SX. */
gint instance_num;
+ gboolean enabled;
gboolean autoCreateOption;
gboolean autoCreateNotify;
gint advanceCreateDays;
Modified: gnucash/branches/remove-group2/src/engine/Split.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/Split.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/Split.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -727,7 +727,7 @@
mark_split (s);
qof_instance_set_dirty(QOF_INSTANCE(s));
xaccTransCommitEdit(s->parent);
-
+ LEAVE("");
}
void
Modified: gnucash/branches/remove-group2/src/engine/TransLog.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/TransLog.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/TransLog.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,7 +25,7 @@
#include <errno.h>
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <string.h>
#include "Account.h"
@@ -156,7 +156,7 @@
filename = g_strconcat (log_base_name, ".", timestamp, ".log", NULL);
- trans_log = fopen (filename, "a");
+ trans_log = g_fopen (filename, "a");
if (!trans_log) {
int norr = errno;
printf ("Error: xaccOpenLog(): cannot open journal \n"
Modified: gnucash/branches/remove-group2/src/engine/gnc-commodity.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/gnc-commodity.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/gnc-commodity.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -84,7 +84,7 @@
const char *old_code;
const char *new_code;
} gnc_new_iso_codes[] = {
- {"RUB", "RUR"}, /* Russian Ruble */
+ {"RUR", "RUB"}, /* Russian Ruble: RUR through 1997-12, RUB from 1998-01 onwards; see bug #393185 */
{"PLZ", "PLN"}, /* Polish Zloty */
{"UAG", "UAH"}, /* Ukraine Hryvnia */
{"ILS", "NIS"}, /* New Israeli Shekel */
@@ -245,7 +245,7 @@
{
gnc_quote_source *new_source;
- DEBUG("Creating new source %s", source_name);
+ DEBUG("Creating new source %s", (source_name == NULL ? "(null)" : source_name));
new_source = malloc(sizeof(gnc_quote_source));
new_source->supported = supported;
new_source->type = SOURCE_UNKNOWN;
@@ -1257,7 +1257,9 @@
if (!table) return NULL;
if (!comm) return NULL;
- ENTER ("(table=%p, comm=%p) %s %s", table, comm, comm->mnemonic, comm->fullname);
+ ENTER ("(table=%p, comm=%p) %s %s", table, comm,
+ (comm->mnemonic == NULL ? "(null)" : comm->mnemonic),
+ (comm->fullname == NULL ? "(null)" : comm->fullname));
ns_name = gnc_commodity_namespace_get_name(comm->namespace);
c = gnc_commodity_table_lookup (table, ns_name, comm->mnemonic);
Modified: gnucash/branches/remove-group2/src/engine/gnc-engine.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/gnc-engine.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/gnc-engine.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -38,14 +38,14 @@
#include "gnc-pricedb-p.h"
/** gnc file backend library name */
-#define GNC_LIB_NAME "gnc-backend-file"
+#define GNC_LIB_NAME "gncmod-backend-file"
/* gnc-backend-file location */
#include "gnc-path.h"
static GList * engine_init_hooks = NULL;
static int engine_is_initialized = 0;
-//static QofLogModule log_module = GNC_MOD_ENGINE;
+// static QofLogModule log_module = GNC_MOD_ENGINE;
/* GnuCash version functions */
unsigned int
@@ -84,21 +84,10 @@
{ NULL, FALSE } }, *lib;
gnc_engine_init_hook_t hook;
GList * cur;
- gchar *tracefilename;
- gchar *libdir;
+ gchar *pkglibdir;
if (1 == engine_is_initialized) return;
- /* initialize logging to our file. */
- tracefilename = g_build_filename(g_get_tmp_dir(), "gnucash.trace",
- (gchar *)NULL);
- qof_log_init_filename(tracefilename);
- g_free(tracefilename);
- /* Only set the core log_modules here the rest can be set locally. */
- qof_log_set_level(GNC_MOD_ENGINE, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_IO, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_GUI, QOF_LOG_WARNING);
- qof_log_set_default(QOF_LOG_WARNING);
/* initialize QOF */
qof_init();
qof_set_alt_dirty_mode(TRUE);
@@ -106,24 +95,24 @@
/* Now register our core types */
cashobjects_register();
- libdir = gnc_path_get_libdir ();
+ pkglibdir = gnc_path_get_pkglibdir ();
for (lib = libs; lib->lib ; lib++)
{
- if (qof_load_backend_library(libdir, lib->lib))
+ if (qof_load_backend_library(pkglibdir, lib->lib))
{
engine_is_initialized = 1;
}
else
{
- g_message("failed to load %s from %s\n", lib->lib, libdir);
- /* If this is a required library, stop now! */
- if (lib->required)
- {
- g_message("required library %s not found.\n", lib->lib);
- }
+ g_warning("failed to load %s from %s\n", lib->lib, pkglibdir);
+ /* If this is a required library, stop now! */
+ if (lib->required)
+ {
+ g_critical("required library %s not found.\n", lib->lib);
+ }
}
}
- g_free (libdir);
+ g_free (pkglibdir);
/* call any engine hooks */
for (cur = engine_init_hooks; cur; cur = cur->next)
@@ -172,27 +161,7 @@
void gnc_log_default(void)
{
qof_log_set_default(QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_ENGINE, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_ACCOUNT, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_SX, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_QUERY, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_SCRUB, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_LOT, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_COMMODITY, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_BACKEND, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_PRICE, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_BUSINESS, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_IO, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_BOOK, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_GUI, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_GUILE, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_LEDGER, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_REGISTER, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_HTML, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_PREFS, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_IMPORT, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_DRUID, QOF_LOG_WARNING);
- qof_log_set_level(GNC_MOD_TEST, QOF_LOG_TRACE);
- qof_log_set_level(GNC_MOD_BUDGET, QOF_LOG_WARNING);
+ qof_log_set_level(GNC_MOD_ROOT, QOF_LOG_WARNING);
+ qof_log_set_level(GNC_MOD_TEST, QOF_LOG_DEBUG);
}
Modified: gnucash/branches/remove-group2/src/engine/gnc-engine.h
===================================================================
--- gnucash/branches/remove-group2/src/engine/gnc-engine.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/gnc-engine.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,28 +41,30 @@
/** \name QofLogModule identifiers */
// @{
-#define GNC_MOD_ENGINE "gnucash-engine-objects"
-#define GNC_MOD_ACCOUNT "gnucash-account"
-#define GNC_MOD_SX "gnucash-schedX"
-#define GNC_MOD_QUERY "gnucash-query"
-#define GNC_MOD_SCRUB "gnucash-scrub"
-#define GNC_MOD_LOT "gnucash-lots"
-#define GNC_MOD_COMMODITY "gnucash-commodity"
-#define GNC_MOD_BACKEND "gnucash-backend-general"
-#define GNC_MOD_PRICE "gnucash-pricedb"
-#define GNC_MOD_BUSINESS "gnucash-business"
-#define GNC_MOD_IO "gnucash-inputoutput"
-#define GNC_MOD_BOOK "gnucash-book-period"
-#define GNC_MOD_GUI "gnucash-gui"
-#define GNC_MOD_GUILE "gnucash-guile"
-#define GNC_MOD_LEDGER "gnucash-ledger"
-#define GNC_MOD_REGISTER "gnucash-register"
-#define GNC_MOD_HTML "gnucash-html"
-#define GNC_MOD_PREFS "gnucash-preferences"
-#define GNC_MOD_IMPORT "gnucash-import-export"
-#define GNC_MOD_DRUID "gnucash-druids"
-#define GNC_MOD_TEST "gnucash-tests"
-#define GNC_MOD_BUDGET "gnucash-budget"
+#define GNC_MOD_ROOT "gnc"
+#define GNC_MOD_ENGINE "gnc.engine"
+#define GNC_MOD_ACCOUNT "gnc.account"
+#define GNC_MOD_SX "gnc.engine.sx"
+#define GNC_MOD_QUERY "gnc.query"
+#define GNC_MOD_SCRUB "gnc.scrub"
+#define GNC_MOD_LOT "gnc.lots"
+#define GNC_MOD_COMMODITY "gnc.commodity"
+#define GNC_MOD_BACKEND "gnc.backend"
+#define GNC_MOD_PRICE "gnc.pricedb"
+#define GNC_MOD_BUSINESS "gnc.business"
+#define GNC_MOD_IO "gnc.io"
+#define GNC_MOD_BOOK "gnc.book-period"
+#define GNC_MOD_GUI "gnc.gui"
+#define GNC_MOD_GUI_SX "gnc.gui.sx"
+#define GNC_MOD_GUILE "gnc.guile"
+#define GNC_MOD_LEDGER "gnc.ledger"
+#define GNC_MOD_REGISTER "gnc.register"
+#define GNC_MOD_HTML "gnc.html"
+#define GNC_MOD_PREFS "gnc.pref"
+#define GNC_MOD_IMPORT "gnc.import"
+#define GNC_MOD_DRUID "gnc.druids"
+#define GNC_MOD_TEST "gnc.tests"
+#define GNC_MOD_BUDGET "gnc.budget"
//@}
/** @brief IDENTIFIERS
@@ -97,8 +99,9 @@
#define GNC_ID_PRICE "Price"
#define GNC_ID_PRICEDB "PriceDB"
#define GNC_ID_SPLIT "Split"
+#define GNC_ID_BUDGET "Budget"
#define GNC_ID_SCHEDXACTION "SchedXaction"
-#define GNC_ID_BUDGET "Budget"
+#define GNC_ID_SXES "SchedXactions"
#define GNC_ID_SXTG "SXTGroup"
#define GNC_ID_SXTT "SXTTrans"
#define GNC_ID_TRANS "Trans"
Modified: gnucash/branches/remove-group2/src/engine/gnc-filepath-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/gnc-filepath-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/gnc-filepath-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,11 +35,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
-#ifdef HAVE_GLIB26
#include <glib/gstdio.h>
-#else
-#define g_mkdir(a,b) mkdir(a,b)
-#endif
#include <stdlib.h>
#include <stdio.h>
@@ -63,8 +59,6 @@
static void
MakeHomeDir (void)
{
- int rc;
- struct stat statbuf;
const gchar *home;
char *path;
char *data;
@@ -75,19 +69,15 @@
path = g_build_filename(home, ".gnucash", (gchar *)NULL);
- rc = stat (path, &statbuf);
- if (rc)
+ if (!g_file_test(path, G_FILE_TEST_EXISTS))
{
- /* assume that the stat failed only because the dir is absent,
- * and not because its read-protected or other error.
- * Go ahead and make it. Don't bother much with checking mkdir
+ /* Go ahead and make it. Don't bother much with checking mkdir
* for errors; seems pointless. */
g_mkdir (path, S_IRWXU); /* perms = S_IRWXU = 0700 */
}
data = g_build_filename (path, "data", (gchar *)NULL);
- rc = stat (data, &statbuf);
- if (rc)
+ if (!g_file_test(data, G_FILE_TEST_EXISTS))
g_mkdir (data, S_IRWXU);
g_free (path);
@@ -186,7 +176,6 @@
char *
xaccResolveFilePath (const char * filefrag)
{
- struct stat statbuf;
char pathbuf[PATH_MAX];
pathGenerator gens[4];
char *filefrag_dup;
@@ -230,8 +219,7 @@
{
gchar *fullpath = g_build_filename(pathbuf, filefrag, (gchar *)NULL);
- int rc = stat (fullpath, &statbuf);
- if ((!rc) && (S_ISREG(statbuf.st_mode)))
+ if (g_file_test(fullpath, G_FILE_TEST_IS_REGULAR))
{
return fullpath;
}
@@ -318,7 +306,7 @@
struct stat statbuf;
gint rc;
- rc = stat (dirname, &statbuf);
+ rc = g_stat (dirname, &statbuf);
if (rc) {
switch (errno) {
case ENOENT:
@@ -332,7 +320,7 @@
dirname, strerror(errno), errno);
exit(1);
}
- stat (dirname, &statbuf);
+ g_stat (dirname, &statbuf);
break;
case EACCES:
Modified: gnucash/branches/remove-group2/src/engine/gnc-hooks.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/gnc-hooks.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/gnc-hooks.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -91,7 +91,7 @@
ENTER("name %s", name);
if (gnc_hooks_list == NULL) {
- LEAVE("no hook lists");
+ PINFO("no hook lists");
gnc_hooks_init();
}
@@ -268,7 +268,7 @@
{
GncHook *hook;
- ENTER("list %s, data %p", name, data);
+ ENTER("list %s, data %p", (name == NULL ? "(null)" : name), data);
hook = gnc_hook_lookup(name);
if (!hook) {
LEAVE("No such hook list");
Modified: gnucash/branches/remove-group2/src/engine/gncmod-engine.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/gncmod-engine.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/gncmod-engine.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,41 +1,34 @@
/*********************************************************************
* gnc-mod-engine.c
* module definition/initialization for the Engine module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-engine.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_engine_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_engine_LTX_gnc_module_current = 0;
-int libgncmod_engine_LTX_gnc_module_revision = 0;
-int libgncmod_engine_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_engine_LTX_gnc_module_path(void);
-char *libgncmod_engine_LTX_gnc_module_description(void);
-int libgncmod_engine_LTX_gnc_module_init(int refcount);
-int libgncmod_engine_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_engine_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/engine");
}
-char *
-libgncmod_engine_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("The GnuCash accounting engine");
}
@@ -43,14 +36,14 @@
extern SCM scm_init_sw_engine_module(void);
int
-libgncmod_engine_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
- if(refcount == 0)
+ if(refcount == 0)
{
/* initialize the engine on the first load */
gnc_engine_init(0, NULL);
}
-
+
scm_init_sw_engine_module();
scm_c_eval_string("(use-modules (sw_engine))");
scm_c_eval_string("(use-modules (gnucash engine))");
@@ -59,7 +52,6 @@
}
int
-libgncmod_engine_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
-
Modified: gnucash/branches/remove-group2/src/engine/iso-4217-currencies.scm
===================================================================
--- gnucash/branches/remove-group2/src/engine/iso-4217-currencies.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/iso-4217-currencies.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -145,7 +145,7 @@
( "Qatari Rial" "rial" "dirham" "ISO4217" "QAR" "634" 100 100 )
( "Romanian Leu" "leu" "bani" "ISO4217" "ROL" "642" 100 100 ) ;; through 2005-06
( "Romanian Leu" "leu" "bani" "ISO4217" "RON" "946" 100 100 ) ;; from 2005-07
-( "Russian Rouble" "rouble" "kopek" "ISO4217" "RUR" "810" 100 100 )
+( "Russian Rouble" "rouble" "kopek" "ISO4217" "RUB" "643" 100 100 ) ;; RUR through 1997-12, RUB from 1998-01 onwards; see bug #393185
( "Rwanda Franc" "franc" "centime" "ISO4217" "RWF" "646" 100 100 )
( "Samoan Tala" "tala" "sene" "ISO4217" "WST" "882" 100 100 )
( "Sao Tome and Principe Dobra" "Dobra" "centimo" "ISO4217" "STD" "678" 100 100 )
Modified: gnucash/branches/remove-group2/src/engine/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -8,21 +8,20 @@
-I${top_srcdir}/src/engine/test-core \
${GUILE_INCS} \
${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
LDADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libgncmod-test.la \
../libgncmod-engine.la \
../test-core/libgncmod-test-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${GLIB_LIBS} \
- ${QOF_LIBS} \
- -lltdl
+ ${QOF_LIBS}
# these tests are ordered kind more or less in the order
# that they should be executed, with more basic tests coming first.
-#
+#
TESTS = \
test-link \
test-load-engine \
@@ -45,23 +44,22 @@
test-freq-spec \
test-recurrence \
test-scm-query \
- test-book-merge
+ test-book-merge
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --library-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/backend/file \
- --guile-load-dir ${top_srcdir}/src/engine/test
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/engine
TESTS_ENVIRONMENT := \
SRCDIR=${srcdir} \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-link \
test-commodities \
test-date \
Modified: gnucash/branches/remove-group2/src/engine/test/test-book-merge.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-book-merge.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-book-merge.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -472,5 +472,5 @@
test_merge();
print_test_results();
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-commodities.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-commodities.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-commodities.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -43,7 +43,7 @@
com = gnc_commodity_new(book, NULL, NULL, NULL, NULL, 0);
gnc_commodity_destroy(com);
- qof_book_destroy (book);
+ qof_book_destroy (book);
success("commodity new and destroy");
}
@@ -184,15 +184,15 @@
int
main (int argc, char **argv)
{
- guid_init ();
- qof_object_initialize ();
- qof_query_init ();
+ qof_init();
+
qof_book_register ();
gnc_commodity_table_register();
+
test_commodity();
+
print_test_results();
- qof_query_shutdown();
- guid_shutdown();
- qof_object_shutdown ();
+
+ qof_close();
return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-freq-spec.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-freq-spec.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-freq-spec.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -52,7 +52,7 @@
"once off" );
}
}
- fprintf (stdout, " FreqSpec: Single test OK, continuing . . . \r");
+ fprintf(stdout, " FreqSpec: Single test OK, continuing . . . \r");
fflush(stdout);
xaccFreqSpecFree(fs);
}
@@ -559,6 +559,50 @@
xaccFreqSpecFree(fs);
}
+static void
+test_monthly_31st_bug_104844()
+{
+ gchar date_buf[128];
+ GDate start, next, expected;
+ FreqSpec *fs = xaccFreqSpecMalloc(book);
+
+ g_date_clear(&next, 1);
+
+ g_date_clear(&start, 1);
+ g_date_set_dmy(&start, 31, 1, 2003);
+ xaccFreqSpecSetMonthly(fs, &start, 1);
+
+ //g_date_add_days(&start, 1);
+ xaccFreqSpecGetNextInstance(fs, &start, &next);
+ g_date_clear(&expected, 1);
+ g_date_set_dmy(&expected, 28, 2, 2003);
+ g_date_strftime(date_buf, 128, "%c", &next);
+ do_test(g_date_compare(&expected, &next) == 0, date_buf);
+
+ start = next;
+ xaccFreqSpecGetNextInstance(fs, &start, &next);
+ g_date_set_dmy(&expected, 31, 3, 2003);
+ g_date_strftime(date_buf, 128, "%c", &next);
+ do_test(g_date_compare(&expected, &next) == 0, date_buf);
+
+ // test...
+ g_date_set_dmy(&start, 31, 1, 2003);
+ xaccFreqSpecSetMonthly(fs, &start, 1);
+ g_date_set_dmy(&start, 31, 1, 2007);
+ xaccFreqSpecGetNextInstance(fs, &start, &next);
+ g_date_set_dmy(&expected, 28, 2, 2007);
+ g_date_strftime(date_buf, 128, "%c", &next);
+ do_test(g_date_compare(&expected, &next) == 0, date_buf);
+
+ start = next;
+ xaccFreqSpecGetNextInstance(fs, &start, &next);
+ g_date_set_dmy(&expected, 31, 3, 2007);
+ g_date_strftime(date_buf, 128, "%c", &next);
+ do_test(g_date_compare(&expected, &next) == 0, date_buf);
+
+ xaccFreqSpecFree(fs);
+}
+
int
main (int argc, char **argv)
{
@@ -568,6 +612,9 @@
g_return_val_if_fail(cashobjects_register(), -1);
session = qof_session_new ();
book = qof_session_get_book(session);
+
+ test_monthly_31st_bug_104844();
+
test_once();
test_caseA();
test_daily();
@@ -575,6 +622,7 @@
test_monthly();
test_month_relative();
test_composite();
+
print_test_results();
qof_session_end(session);
qof_close();
Modified: gnucash/branches/remove-group2/src/engine/test/test-group-vs-book.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-group-vs-book.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-group-vs-book.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -171,5 +171,5 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-guid.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-guid.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-guid.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -90,5 +90,5 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-load-engine.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-load-engine.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-load-engine.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -43,5 +43,5 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-lots.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-lots.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-lots.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -96,5 +96,5 @@
print_test_results();
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-numeric.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-numeric.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-numeric.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -54,19 +54,21 @@
/* ======================================================= */
+#define check_unary_op(eq,ex,a,i,e) check_unary_op_r(eq,ex,a,i,e,__LINE__)
static void
-check_unary_op (gboolean (*eqtest) (gnc_numeric, gnc_numeric),
- gnc_numeric expected,
- gnc_numeric actual,
- gnc_numeric input,
- const char * errmsg)
+check_unary_op_r (gboolean (*eqtest) (gnc_numeric, gnc_numeric),
+ gnc_numeric expected,
+ gnc_numeric actual,
+ gnc_numeric input,
+ const char * errmsg,
+ int line)
{
char *e = gnc_numeric_print (expected);
char *r = gnc_numeric_print (actual);
char *a = gnc_numeric_print (input);
char *str = g_strdup_printf (errmsg, e,r, a);
- do_test (eqtest(expected, actual), str);
+ do_test_call (eqtest(expected, actual), str, __FILE__, line);
g_free (a);
g_free (r);
@@ -76,12 +78,16 @@
/* ======================================================= */
+#define check_binary_op(ex,a,ia,ib,e) check_binary_op_r(ex,a,ia,ib,e,__LINE__,gnc_numeric_eq)
+#define check_binary_op_equal(ex,a,ia,ib,e) check_binary_op_r(ex,a,ia,ib,e,__LINE__,gnc_numeric_equal)
static void
-check_binary_op (gnc_numeric expected,
- gnc_numeric actual,
- gnc_numeric input_a,
- gnc_numeric input_b,
- const char * errmsg)
+check_binary_op_r (gnc_numeric expected,
+ gnc_numeric actual,
+ gnc_numeric input_a,
+ gnc_numeric input_b,
+ const char * errmsg,
+ int line,
+ gboolean (*eq)(gnc_numeric, gnc_numeric))
{
char *e = gnc_numeric_print (expected);
char *r = gnc_numeric_print (actual);
@@ -89,7 +95,7 @@
char *b = gnc_numeric_print (input_b);
char *str = g_strdup_printf (errmsg, e,r,a,b);
- do_test (gnc_numeric_eq(expected, actual), str);
+ do_test_call ((eq)(expected, actual), str, __FILE__, line);
g_free (a);
g_free (b);
@@ -215,6 +221,9 @@
mult = rand() / 2;
numer = rand() / 2;
+ /* avoid 0 */
+ if (deno == 0 || mult == 0) { i--; continue; }
+
val = gnc_numeric_create (numer, deno);
mval = gnc_numeric_create (numer*mult, deno*mult);
@@ -626,6 +635,9 @@
gint64 nb = rand();
gint64 ne;
+ /* avoid 0 */
+ if (nb/4 == 0) { i--; continue; }
+
/* avoid overflow; */
na /= 2;
nb /= 2;
@@ -634,7 +646,7 @@
a = gnc_numeric_create(na, deno);
b = gnc_numeric_create(nb, deno);
- check_binary_op (gnc_numeric_create(ne,1),
+ check_binary_op_equal (gnc_numeric_create(ne,1),
gnc_numeric_mul(a, b, GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT),
a, b, "expected %s got %s = %s * %s for mult exact");
@@ -651,7 +663,7 @@
/* Do some hokey random 128-bit division too */
b = gnc_numeric_create(deno, nb);
- check_binary_op (gnc_numeric_create(ne,1),
+ check_binary_op_equal (gnc_numeric_create(ne,1),
gnc_numeric_div(a, b, GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT),
a, b, "expected %s got %s = %s / %s for div exact");
@@ -864,7 +876,7 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
/* ======================== END OF FILE ====================== */
Modified: gnucash/branches/remove-group2/src/engine/test/test-object.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-object.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-object.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -154,5 +154,5 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-period.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-period.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-period.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -118,8 +118,6 @@
tsmiddle = tsfirst;
tsmiddle.tv_sec = (tsfirst.tv_sec + tslast.tv_sec)/2;
- qof_log_set_file (stdout);
- qof_log_set_level_registered (QOF_LOG_WARNING);
closedbook = gnc_book_close_period (openbook, tsmiddle,
equity, "this is opening balance dude");
@@ -140,15 +138,13 @@
else num_trans = 120;
qof_init();
- gnc_log_default();
- qof_log_set_level(GNC_MOD_ENGINE, QOF_LOG_WARNING);
-
g_log_set_always_fatal( G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING );
+
if(cashobjects_register()) {
srand(num_trans);
run_test ();
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-query.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-query.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-query.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -109,5 +109,5 @@
cleanup:
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-querynew.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-querynew.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-querynew.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -92,13 +92,13 @@
int
main (int argc, char **argv)
{
- qof_init();
- if(cashobjects_register()) {
- test_query_core();
- test_class();
- test_querynew();
- }
- qof_close();
- print_test_results();
- return 0;
+ qof_init();
+ if(cashobjects_register()) {
+ test_query_core();
+ test_class();
+ test_querynew();
+ }
+ qof_close();
+ print_test_results();
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-recurrence.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-recurrence.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-recurrence.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -387,6 +387,8 @@
int
main (int argc, char **argv)
{
+ qof_init();
+
g_log_set_always_fatal( G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING );
#if 0
Modified: gnucash/branches/remove-group2/src/engine/test/test-resolve-file-path.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-resolve-file-path.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-resolve-file-path.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -55,7 +55,9 @@
main(int argc, char **argv)
{
int i;
-
+
+ qof_init();
+
for(i = 0; strs[i].input != NULL; i++)
{
char *daout;
Modified: gnucash/branches/remove-group2/src/engine/test/test-split-vs-account.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-split-vs-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-split-vs-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -71,5 +71,5 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-transaction-reversal.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-transaction-reversal.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-transaction-reversal.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -123,5 +123,5 @@
print_test_results();
}
qof_close();
- return 0;
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test/test-transaction-voiding.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test/test-transaction-voiding.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test/test-transaction-voiding.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -193,14 +193,14 @@
int
main (int argc, char **argv)
{
- qof_init();
- if(cashobjects_register())
- {
- xaccLogDisable ();
- run_test ();
- success("transaction voiding seems OK");
- print_test_results();
- }
- qof_close();
- return 0;
+ qof_init();
+ if(cashobjects_register())
+ {
+ xaccLogDisable ();
+ run_test ();
+ success("transaction voiding seems OK");
+ print_test_results();
+ }
+ qof_close();
+ return get_rv();
}
Modified: gnucash/branches/remove-group2/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/engine/test-core/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test-core/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,16 +1,15 @@
-noinst_LTLIBRARIES=libgncmod-test-engine.la
+check_LTLIBRARIES=libgncmod-test-engine.la
LDADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
../libgncmod-engine.la \
${GLIB_LIBS} \
- ${QOF_LIBS} \
- -lltdl
+ ${QOF_LIBS}
libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.c
libgncmod_test_engine_la_LDFLAGS = -module
libgncmod_test_engine_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
../libgncmod-engine.la \
${QOF_LIBS} \
${GLIB_LIBS}
Modified: gnucash/branches/remove-group2/src/engine/test-core/gncmod-test-engine.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test-core/gncmod-test-engine.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test-core/gncmod-test-engine.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,47 +1,41 @@
/*********************************************************************
* gncmod-test-engine.c
- * module definition/initialization for the engine test infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the engine test infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_test_engine_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_test_engine_LTX_gnc_module_current = 0;
-int libgncmod_test_engine_LTX_gnc_module_revision = 0;
-int libgncmod_test_engine_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_test_engine_LTX_gnc_module_path(void);
-char *libgncmod_test_engine_LTX_gnc_module_description(void);
-int libgncmod_test_engine_LTX_gnc_module_init(int refcount);
-int libgncmod_test_engine_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_test_engine_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/engine/test");
}
-char *
-libgncmod_test_engine_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("GnuCash Engine test infrastructure.");
}
int
-libgncmod_test_engine_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
return TRUE;
}
int
-libgncmod_test_engine_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.c
===================================================================
--- gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,8 +30,12 @@
#include "Account.h"
#include "AccountP.h"
#include "gnc-engine.h"
+#include "gnc-session.h"
#include "Transaction.h"
#include "TransactionP.h"
+#include "FreqSpec.h"
+#include "SchedXaction.h"
+#include "SX-book.h"
#include "test-engine-stuff.h"
#include "test-stuff.h"
@@ -2133,3 +2137,61 @@
return q;
}
+
+static FreqSpec*
+daily_freq(GDate* start, int multiplier)
+{
+ QofBook *book = qof_session_get_book(gnc_get_current_session());
+ FreqSpec *freq = xaccFreqSpecMalloc(book);
+ xaccFreqSpecSetDaily(freq, start, multiplier);
+ xaccFreqSpecSetUIType(freq, UIFREQ_DAILY);
+ return freq;
+}
+
+static FreqSpec*
+once_freq(GDate *when)
+{
+ QofBook *book = qof_session_get_book(gnc_get_current_session());
+ FreqSpec *freq = xaccFreqSpecMalloc(book);
+ xaccFreqSpecSetOnceDate(freq, when);
+ xaccFreqSpecSetUIType(freq, UIFREQ_ONCE);
+ return freq;
+}
+
+static SchedXaction*
+add_sx(gchar *name, GDate *start, GDate *end, GDate *last_occur, FreqSpec *fs)
+{
+ QofBook *book = qof_session_get_book(gnc_get_current_session());
+ SchedXaction *sx = xaccSchedXactionMalloc(book);
+ xaccSchedXactionSetName(sx, name);
+ xaccSchedXactionSetStartDate(sx, start);
+ if (end != NULL)
+ xaccSchedXactionSetEndDate(sx, end);
+ if (last_occur != NULL)
+ xaccSchedXactionSetLastOccurDate(sx, last_occur);
+ xaccSchedXactionSetFreqSpec(sx, fs);
+
+ gnc_sxes_add_sx(gnc_book_get_schedxactions(book), sx);
+
+ return sx;
+}
+
+SchedXaction*
+add_daily_sx(gchar *name, GDate *start, GDate *end, GDate *last_occur)
+{
+ return add_sx(name, start, end, last_occur, daily_freq(start, 1));
+}
+
+SchedXaction*
+add_once_sx(gchar *name, GDate *when)
+{
+ return add_sx(name, when, NULL, NULL, once_freq(when));
+}
+
+void
+remove_sx(SchedXaction *sx)
+{
+ QofBook *book = qof_session_get_book(gnc_get_current_session());
+ SchedXactions *sxes = gnc_book_get_schedxactions(book);
+ gnc_sxes_del_sx(sxes, sx);
+}
Modified: gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.h
===================================================================
--- gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/engine/test-core/test-engine-stuff.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -11,6 +11,7 @@
#include "qof.h"
#include "Query.h"
#include "gnc-pricedb.h"
+#include "SchedXaction.h"
Timespec* get_random_timespec(void);
void random_timespec_zero_nsec (gboolean zero_nsec);
@@ -88,4 +89,8 @@
void make_random_changes_to_book (QofBook *book);
void make_random_changes_to_session (QofSession *session);
+SchedXaction* add_daily_sx(gchar *name, GDate *start, GDate *end, GDate *last_occur);
+SchedXaction* add_once_sx(gchar *name, GDate *when);
+void remove_sx(SchedXaction *sx);
+
#endif
Modified: gnucash/branches/remove-group2/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -6,16 +6,15 @@
-I${top_srcdir}/src/core-utils \
${GLIB_CFLAGS} ${GUILE_INCS}
-lib_LTLIBRARIES = libgncmodule.la
+lib_LTLIBRARIES = libgnc-module.la
-libgncmodule_la_SOURCES = gnc-module.c swig-gnc-module.c
+libgnc_module_la_SOURCES = gnc-module.c swig-gnc-module.c
-libgncmodule_la_LIBADD = \
- ../core-utils/libcore-utils.la \
+libgnc_module_la_LIBADD = \
+ ../core-utils/libgnc-core-utils.la \
${top_builddir}/lib/libc/libc-missing.la \
${GUILE_LIBS} \
- ${GLIB_LIBS} \
- -lltdl
+ ${GLIB_LIBS}
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = gnc-module.scm
@@ -55,3 +54,5 @@
CLEANFILES = .scm-links gnucash ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-gnc-module.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.module\"
Modified: gnucash/branches/remove-group2/src/gnc-module/gnc-module.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/gnc-module.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/gnc-module.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -8,22 +8,13 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <glib.h>
-#ifdef G_OS_WIN32
-# undef DLL_EXPORT /* Will cause warnings in ltdl.h if defined */
-# define LIBLTDL_DLL_IMPORT
-#endif
-#include <ltdl.h>
+#include <gmodule.h>
#include <guile/gh.h>
#include <sys/types.h>
#include <dirent.h>
#include "gnc-module.h"
-#ifndef lt_ptr
-# define lt_ptr lt_ptr_t
-#endif
-
static GHashTable * loaded_modules = NULL;
static GList * module_info = NULL;
@@ -36,12 +27,12 @@
int module_revision;
} GNCModuleInfo;
-typedef struct
+typedef struct
{
- lt_dlhandle handle;
+ GModule * gmodule;
gchar * filename;
int load_count;
- GNCModuleInfo * info;
+ GNCModuleInfo * info;
int (* init_func)(int refcount);
} GNCLoadedModule;
@@ -55,11 +46,11 @@
static GList *
gnc_module_system_search_dirs(void)
{
- char * spath = getenv("GNC_MODULE_PATH");
+ const char *spath = g_getenv("GNC_MODULE_PATH");
GList * list = NULL;
GString * token = g_string_new(NULL);
int escchar = 0;
- char * cpos;
+ const char *cpos;
if(!spath)
{
@@ -136,14 +127,10 @@
if(dirs)
{
- char *envt = getenv("LD_LIBRARY_PATH");
+ char *envt = g_strdup(g_getenv("LD_LIBRARY_PATH"));
- if(envt)
+ if(!envt)
{
- envt = g_strdup(envt);
- }
- else
- {
envt = g_strdup("");
}
@@ -156,7 +143,7 @@
}
g_list_free(dirs);
- if (!g_setenv("LD_LIBRARY_PATH", envt, 1))
+ if (!g_setenv("LD_LIBRARY_PATH", envt, TRUE))
{
g_warning ("gnc-module failed to set LD_LIBRARY_PATH");
}
@@ -166,29 +153,21 @@
/*************************************************************
* gnc_module_system_init
- * initialize the module system
+ * initialize the module system
*************************************************************/
void
-gnc_module_system_init(void)
+gnc_module_system_init(void)
{
- if(loaded_modules == NULL)
- {
- loaded_modules = g_hash_table_new(g_direct_hash, g_direct_equal);
-
- if(lt_dlinit() == 0)
- {
- gnc_module_system_setup_load_path();
-
- /* now crawl the GNC_MODULE_PATH to find likely libraries */
- gnc_module_system_refresh();
- }
- else
- {
- /* FIXME: there's no way to report this error to the caller. */
- g_warning ("gnc module system couldn't initialize libltdl");
- }
- }
+ if (loaded_modules)
+ return;
+
+ loaded_modules = g_hash_table_new(g_direct_hash, g_direct_equal);
+
+ gnc_module_system_setup_load_path();
+
+ /* now crawl the GNC_MODULE_PATH to find likely libraries */
+ gnc_module_system_refresh();
}
@@ -215,25 +194,27 @@
/* look in each search directory */
for(current = search_dirs; current; current = current->next)
{
- DIR *d = opendir(current->data);
- struct dirent * dent = NULL;
+ GDir *d = g_dir_open(current->data, 0,NULL);
+ const gchar *dent = NULL;
char * fullpath = NULL;
- int namelen;
GNCModuleInfo * info;
if (!d) continue;
- while ((dent = readdir(d)) != NULL)
+ while ((dent = g_dir_read_name(d)) != NULL)
{
- namelen = strlen(dent->d_name);
-
- /* is the file a .la shared lib? */
- if((namelen > 3) && (!strncmp(dent->d_name + namelen - 3, ".la", 3)))
+ /* is the file a loadable module? */
+
+ /* Gotcha: On MacOS, G_MODULE_SUFFIX is defined as "so", but if we do
+ * not build clean libtool modules with "-module", we get dynamic
+ * libraries ending on .dylib */
+ if (g_str_has_suffix(dent, "." G_MODULE_SUFFIX) ||
+ g_str_has_suffix(dent, ".dylib"))
{
/* get the full path name, then dlopen the library and see
* if it has the appropriate symbols to be a gnc_module */
- fullpath = g_build_filename((const gchar *)(current->data),
- dent->d_name, (char*)NULL);
+ fullpath = g_build_filename((const gchar *)(current->data),
+ dent, (char*)NULL);
info = gnc_module_get_info(fullpath);
if(info)
@@ -243,7 +224,7 @@
g_free(fullpath);
}
}
- closedir(d);
+ g_dir_close(d);
}
/* free the search dir strings */
@@ -279,68 +260,62 @@
*************************************************************/
static GNCModuleInfo *
-gnc_module_get_info(const char * fullpath)
+gnc_module_get_info(const char * fullpath)
{
- lt_dlhandle handle;
- lt_ptr modsysver;
+ GModule *gmodule;
+ gpointer modsysver;
+ GNCModuleInfo *info = NULL;
+ gpointer initfunc, pathfunc, descripfunc, iface, revision, age;
+ gchar * (* f_path)(void);
+ gchar * (* f_descrip)(void);
- //printf("(init) dlopening %s\n", fullpath);
- handle = lt_dlopen(fullpath);
- if (handle == NULL) {
- g_warning ("Failed to dlopen() '%s': %s\n", fullpath, lt_dlerror());
+/* g_debug("(init) dlopening '%s'\n", fullpath); */
+ gmodule = g_module_open(fullpath, G_MODULE_BIND_MASK);
+ if (gmodule == NULL) {
+ g_warning("Failed to dlopen() '%s': %s\n", fullpath, g_module_error());
return NULL;
}
- modsysver = lt_dlsym(handle, "gnc_module_system_interface");
-
/* the modsysver tells us what the expected symbols and their
* types are */
- if (!modsysver) {
- //printf("(init) closing %s\n", fullpath);
- //lt_dlclose(handle);
- return NULL;
+ if (!g_module_symbol(gmodule, "gnc_module_system_interface", &modsysver)) {
+/* g_debug("Module '%s' does not contain 'gnc_module_system_interface'\n", */
+/* fullpath); */
+ goto get_info_close;
}
if (*(int *)modsysver != 0) {
- /* unsupported module system interface version */
- /* printf("\n** WARNING ** : module '%s' requires newer module system\n",
- fullpath); */
- //lt_dlclose(handle);
- return NULL;
+ g_warning("Module '%s' requires newer module system\n", fullpath);
+ goto get_info_close;
}
- {
- lt_ptr initfunc = lt_dlsym(handle, "gnc_module_init");
- lt_ptr pathfunc = lt_dlsym(handle, "gnc_module_path");
- lt_ptr descripfunc = lt_dlsym(handle, "gnc_module_description");
- lt_ptr iface = lt_dlsym(handle, "gnc_module_current");
- lt_ptr revision = lt_dlsym(handle, "gnc_module_revision");
- lt_ptr age = lt_dlsym(handle, "gnc_module_age");
-
- if (!(initfunc && pathfunc && descripfunc && iface &&
- revision && age)) {
- g_warning ("module '%s' does not match module signature\n",
- fullpath);
- //lt_dlclose(handle);
- return NULL;
- }
-
- {
- /* we have found a gnc_module. */
- GNCModuleInfo * info = g_new0(GNCModuleInfo, 1);
- char * (* f_path)(void) = pathfunc;
- char * (* f_descrip)(void) = descripfunc;
- info->module_path = f_path();
- info->module_description = f_descrip();
- info->module_filepath = g_strdup(fullpath);
- info->module_interface = *(int *)iface;
- info->module_age = *(int *)age;
- info->module_revision = *(int *)revision;
- //printf("(init) closing %s\n", fullpath);
- //lt_dlclose(handle);
- return info;
- }
+ if (!g_module_symbol(gmodule, "gnc_module_init", &initfunc) ||
+ !g_module_symbol(gmodule, "gnc_module_path", &pathfunc) ||
+ !g_module_symbol(gmodule, "gnc_module_description", &descripfunc) ||
+ !g_module_symbol(gmodule, "gnc_module_current", &iface) ||
+ !g_module_symbol(gmodule, "gnc_module_revision", &revision) ||
+ !g_module_symbol(gmodule, "gnc_module_age", &age)) {
+ g_warning("Module '%s' does not match module signature\n", fullpath);
+ goto get_info_close;
}
+
+ /* we have found a gnc_module. */
+ info = g_new0(GNCModuleInfo, 1);
+ f_path = pathfunc;
+ f_descrip = descripfunc;
+ info->module_path = f_path();
+ info->module_description = f_descrip();
+ info->module_filepath = g_strdup(fullpath);
+ info->module_interface = *(int *)iface;
+ info->module_age = *(int *)age;
+ info->module_revision = *(int *)revision;
+
+
+get_info_close:
+/* g_debug("(init) closing '%s'\n", fullpath); */
+ g_module_close(gmodule);
+
+ return info;
}
@@ -396,32 +371,32 @@
*l = g_list_prepend(*l, v);
}
-static GNCLoadedModule *
-gnc_module_check_loaded(const char * module_name, gint iface)
+static GNCLoadedModule *
+gnc_module_check_loaded(const char * module_name, gint iface)
{
GNCModuleInfo * modinfo = gnc_module_locate(module_name, iface);
GList * modules = NULL;
GList * p = NULL;
GNCLoadedModule * rv = NULL;
- if(modinfo == NULL)
+ if (modinfo == NULL)
{
return NULL;
}
-
- if(!loaded_modules)
+
+ if (!loaded_modules)
{
gnc_module_system_init();
}
-
+
/* turn the loaded-modules table into a list */
g_hash_table_foreach(loaded_modules, list_loaded, &modules);
/* walk the list to see if the file we want is already open */
- for(p=modules; p; p=p->next)
+ for (p=modules; p; p=p->next)
{
GNCLoadedModule * lm = p->data;
- if(!strcmp(lm->filename, modinfo->module_filepath))
+ if (!strcmp(lm->filename, modinfo->module_filepath))
{
rv = lm;
break;
@@ -434,33 +409,33 @@
/*************************************************************
* gnc_module_load
- * Ensure that the module named by "module_name" is loaded.
+ * Ensure that the module named by "module_name" is loaded.
*************************************************************/
-static GNCModule
+static GNCModule
gnc_module_load_common(char * module_name, gint iface, gboolean optional)
{
GNCLoadedModule * info;
-
- if(!loaded_modules)
+
+ if(!loaded_modules)
{
gnc_module_system_init();
}
-
+
info = gnc_module_check_loaded(module_name, iface);
-
+
/* if the module's already loaded, just increment its use count.
* otherwise, load it and check for the initializer
* "gnc_module_init". if we find that, assume it's a gnucash module
* and run the function. */
- if(info)
+ if (info)
{
/* module already loaded ... call the init thunk */
- if(info->init_func)
+ if (info->init_func)
{
- if(info->init_func(info->load_count))
+ if (info->init_func(info->load_count))
{
info->load_count++;
return info;
@@ -476,44 +451,47 @@
return NULL;
}
}
- else
+ else
{
GNCModuleInfo * modinfo = gnc_module_locate(module_name, iface);
- lt_dlhandle handle = NULL;
-
- //if(modinfo)
- //printf("(load) dlopening %s\n", modinfo->module_filepath);
+ GModule * gmodule;
- if(modinfo && ((handle = lt_dlopen(modinfo->module_filepath)) != NULL))
+/* if (modinfo) */
+/* g_debug("(init) loading '%s' from '%s'\n", module_name, */
+/* modinfo->module_filepath); */
+
+ if (modinfo &&
+ ((gmodule = g_module_open(modinfo->module_filepath, 0))
+ != NULL))
{
- lt_ptr initfunc = lt_dlsym(handle, "gnc_module_init");
-
- if(initfunc)
+ gpointer initfunc;
+
+ if (g_module_symbol(gmodule, "gnc_module_init", &initfunc))
{
- /* stick it in the hash table */
+ /* stick it in the hash table */
info = g_new0(GNCLoadedModule, 1);
- info->handle = handle;
+ info->gmodule = gmodule;
info->filename = g_strdup(modinfo->module_filepath);
info->load_count = 1;
info->init_func = initfunc;
g_hash_table_insert(loaded_modules, info, info);
-
+
/* now call its init function. this should load any dependent
* modules, too. If it doesn't return TRUE unload the module. */
- if(!info->init_func(0))
+ if (!info->init_func(0))
{
/* init failed. unload the module. */
g_warning ("Initialization failed for module %s\n", module_name);
g_hash_table_remove(loaded_modules, info);
g_free(info->filename);
g_free(info);
- //lt_dlclose(handle);
+ /* g_module_close(module); */
return NULL;
}
return info;
}
- else
+ else
{
g_warning ("Module %s (%s) is not a gnc-module.\n", module_name,
modinfo->module_filepath);
@@ -524,7 +502,7 @@
else if (!optional)
{
g_warning ("Failed to open module %s", module_name);
- if(modinfo) printf(": %s\n", lt_dlerror());
+ if(modinfo) printf(": %s\n", g_module_error());
else g_warning (": could not locate %s interface v.%d\n",
module_name, iface);
return NULL;
@@ -551,40 +529,40 @@
* unload a module (only actually unload it if the use count goes to 0)
*************************************************************/
-int
-gnc_module_unload(GNCModule module)
+int
+gnc_module_unload(GNCModule module)
{
GNCLoadedModule * info;
-
- if(!loaded_modules)
+
+ if(!loaded_modules)
{
gnc_module_system_init();
}
-
- if((info = g_hash_table_lookup(loaded_modules, module)) != NULL)
+
+ if ((info = g_hash_table_lookup(loaded_modules, module)) != NULL)
{
- lt_ptr unload_thunk = lt_dlsym(info->handle, "gnc_module_end");
- int unload_val = TRUE;
+ gpointer unload_thunk;
+ int unload_val = TRUE;
info->load_count--;
- if(unload_thunk)
+ if (g_module_symbol(info->gmodule, "gnc_module_end", &unload_thunk))
{
int (* thunk)(int) = unload_thunk;
unload_val = thunk(info->load_count);
}
-
+
/* actually unload the module if necessary */
- if(info->load_count == 0)
+ if (info->load_count == 0)
{
- /* now close the module and free the struct */
- //printf("(unload) closing %s\n", info->filename);
- //lt_dlclose(info->handle);
+ /* now close the module and free the struct */
+ /* g_debug("(unload) closing %s\n", info->filename); */
+ /* g_module_close(info->gmodule); */
g_hash_table_remove(loaded_modules, module);
g_free(info);
}
return unload_val;
}
- else
+ else
{
g_warning ("Failed to unload module %p (it is not loaded)\n", module);
return 0;
Modified: gnucash/branches/remove-group2/src/gnc-module/gnc-module.scm
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/gnc-module.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/gnc-module.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -7,7 +7,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash gnc-module))
-(load-extension "libgncmodule" "scm_init_sw_gnc_module_module")
+(load-extension "libgnc-module" "scm_init_sw_gnc_module_module")
(use-modules (sw_gnc_module))
(define gnc:module-system-init gnc-module-system-init)
Modified: gnucash/branches/remove-group2/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
SUBDIRS = mod-foo mod-bar mod-baz misc-mods
-LDADD = ../libgncmodule.la ${GLIB_LIBS} -lltdl ${GUILE_LIBS}
+LDADD = ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS}
AM_CFLAGS = \
-I${top_srcdir}/src \
@@ -28,23 +28,27 @@
--gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-bar \
--gnc-module-dir ${top_builddir}/src/gnc-module/test/mod-baz \
--gnc-module-dir ${top_builddir}/src/gnc-module/test/misc-mods \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
- --gnc-module-dir ${top_srcdir}/src/gnc-module/test/misc-mods
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \
+ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/gnc-module/test/mod-foo \
+ --library-dir ${top_builddir}/src/gnc-module/test/mod-bar \
+ --library-dir ${top_builddir}/src/gnc-module/test/mod-baz
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-load-c \
test-modsysver \
test-incompatdep \
test-agedver \
test-dynload
-test_dynload_LDFLAGS = -lltdl ${GUILE_LIBS}
+test_dynload_LDFLAGS = ${GUILE_LIBS}
EXTRA_DIST = \
test-gwrapped-c \
Modified: gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -7,25 +7,22 @@
LDADD = -L../.. -L../../.libs
PWD := $(shell pwd)
-checklibdir=${PWD}
-checklib_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la
+check_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la
libfuturemodsys_la_SOURCES=futuremodsys.c
+libfuturemodsys_la_LDFLAGS=-rpath ${PWD}
libfuturemodsys_la_LIBADD = \
$(GLIB_LIBS)
libincompatdep_la_SOURCES=incompatdep.c
-libincompatdep_la_LDFLAGS=-module
+libincompatdep_la_LDFLAGS=-module -rpath ${PWD}
libincompatdep_la_LIBADD = \
- ../../libgncmodule.la \
+ ../../libgnc-module.la \
$(GLIB_LIBS)
libagedver_la_SOURCES=agedver.c
+libagedver_la_LDFLAGS=-rpath ${PWD}
libagedver_la_LIBADD = \
$(GLIB_LIBS)
CLEANFILES = *.so* *.a
-
-# Keep automake from generating install targets for test libs
-install-checklibLTLIBRARIES:
-uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/agedver.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/agedver.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/agedver.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,31 +1,28 @@
/* agedver.c : testing module age? */
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
-int libagedver_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
-int libagedver_LTX_gnc_module_current = 12;
-int libagedver_LTX_gnc_module_age = 9;
-int libagedver_LTX_gnc_module_revision = 0;
-char* libagedver_LTX_gnc_module_path(void);
-char* libagedver_LTX_gnc_module_description(void);
-int libagedver_LTX_gnc_module_init(int refcount);
+int gnc_module_current = 12;
+int gnc_module_age = 9;
+int gnc_module_revision = 0;
+
char *
-libagedver_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/agedver");
}
char *
-libagedver_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
return g_strdup("this is a frequently extended module");
}
-int
-libagedver_LTX_gnc_module_init(int refcount) {
+int
+gnc_module_init(int refcount) {
return TRUE;
}
-
Modified: gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/futuremodsys.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/futuremodsys.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/futuremodsys.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -4,33 +4,28 @@
* version 0 so it will load all the way before failing. */
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module-api.h"
-int libfuturemodsys_LTX_gnc_module_system_interface = 123456;
+int gnc_module_system_interface = 123456;
-int libfuturemodsys_LTX_gnc_module_current = 0;
-int libfuturemodsys_LTX_gnc_module_age = 0;
-int libfuturemodsys_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
-char* libfuturemodsys_LTX_gnc_module_path(void);
-char* libfuturemodsys_LTX_gnc_module_description(void);
-int libfuturemodsys_LTX_gnc_module_init(int refcount);
-
char *
-libfuturemodsys_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/futuremodsys");
}
char *
-libfuturemodsys_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
return g_strdup("this is a broken future module");
}
-int
-libfuturemodsys_LTX_gnc_module_init(int refcount) {
+int
+gnc_module_init(int refcount) {
return TRUE;
}
-
Modified: gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/incompatdep.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/incompatdep.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/misc-mods/incompatdep.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,40 +2,36 @@
* version of another module. the initialization should fail. */
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
-int libincompatdep_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
-int libincompatdep_LTX_gnc_module_current = 0;
-int libincompatdep_LTX_gnc_module_age = 0;
-int libincompatdep_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
-char *libincompatdep_LTX_gnc_module_path(void);
-char *libincompatdep_LTX_gnc_module_description(void);
-int libincompatdep_LTX_gnc_module_init(int refcount);
char *
-libincompatdep_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/incompatdep");
}
char *
-libincompatdep_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
return g_strdup("this is a broken module");
}
-int
-libincompatdep_LTX_gnc_module_init(int refcount) {
- if (gnc_module_load("gnucash/foo", 25))
+int
+gnc_module_init(int refcount) {
+ if (gnc_module_load("gnucash/foo", 25))
{
return TRUE;
}
- else
+ else
{
return FALSE;
}
}
-
Modified: gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,10 +5,10 @@
${GLIB_CFLAGS}
PWD := $(shell pwd)
-checklibdir=${PWD}
-checklib_LTLIBRARIES = libbar.la libgncmodbar.la
+check_LTLIBRARIES = libbar.la libgncmodbar.la
libbar_la_SOURCES = bar.c
+libbar_la_LDFLAGS = -rpath ${PWD}
# Make swig-bar.c for dist. It is an automatic dependency
# of gnc-mod-bar.c
@@ -17,7 +17,7 @@
swig-bar.c
libgncmodbar_la_SOURCES=gnc-mod-bar.c
-
+libgncmodbar_la_LDFLAGS=-rpath ${PWD}
libgncmodbar_la_LIBADD=libbar.la \
$(GUILE_LIBS) \
$(GLIB_LIBS)
@@ -33,7 +33,3 @@
BUILT_SOURCES = swig-bar.c
MAINTAINERCLEANFILES = swig-bar.c
-
-# Keep automake from generating install targets for test libs
-install-checklibLTLIBRARIES:
-uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/gnc-mod-bar.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/gnc-mod-bar.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/mod-bar/gnc-mod-bar.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -3,43 +3,36 @@
#include "config.h"
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module-api.h"
#include "swig-bar.c"
-int libgncmodbar_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
-int libgncmodbar_LTX_gnc_module_current = 0;
-int libgncmodbar_LTX_gnc_module_age = 0;
-int libgncmodbar_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
-/* forward references */
-char *libgncmodbar_LTX_gnc_module_path(void);
-char *libgncmodbar_LTX_gnc_module_description(void);
-int libgncmodbar_LTX_gnc_module_init(int refcount);
-
char *
-libgncmodbar_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/bar");
}
char *
-libgncmodbar_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
return g_strdup("this is a bar module");
}
int
-libgncmodbar_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* publish the wrapped Scheme bindings for libbar */
scm_init_sw_bar_module();
scm_c_eval_string("(use-modules (sw_bar))");
-
+
/* use the Scheme "bar" module */
scm_c_eval_string("(use-modules (gnucash bar))");
return TRUE;
}
-
-
Modified: gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -6,10 +6,10 @@
${GUILE_INCS}
PWD := $(shell pwd)
-checklibdir = ${PWD}
-checklib_LTLIBRARIES = libbaz.la libgncmodbaz.la
+check_LTLIBRARIES = libbaz.la libgncmodbaz.la
libbaz_la_SOURCES = baz.c
+libbaz_la_LDFLAGS = -rpath ${PWD}
libbaz_la_LIBADD = ../mod-foo/libfoo.la
# Make swig-baz.c for dist. It is an automatic dependency
@@ -19,10 +19,10 @@
swig-baz.c
libgncmodbaz_la_SOURCES = gnc-mod-baz.c
-
+libgncmodbaz_la_LDFLAGS = -rpath ${PWD}
libgncmodbaz_la_LIBADD = \
libbaz.la \
- ../../libgncmodule.la \
+ ../../libgnc-module.la \
$(GUILE_LIBS) \
$(GLIB_LIBS)
@@ -37,7 +37,3 @@
BUILT_SOURCES = swig-baz.c
MAINTAINERCLEANFILES = swig-baz.c
-
-# Keep automake from generating install targets for test libs
-install-checklibLTLIBRARIES:
-uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/gnc-mod-baz.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/gnc-mod-baz.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/mod-baz/gnc-mod-baz.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -3,41 +3,37 @@
#include "config.h"
#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
#include "swig-baz.c"
-int libgncmodbaz_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
-int libgncmodbaz_LTX_gnc_module_current = 0;
-int libgncmodbaz_LTX_gnc_module_age = 0;
-int libgncmodbaz_LTX_gnc_module_revision = 0;
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
-/* forward references */
-char *libgncmodbaz_LTX_gnc_module_path(void);
-char *libgncmodbaz_LTX_gnc_module_description(void);
-int libgncmodbaz_LTX_gnc_module_init(int refcount);
-
-char *
-libgncmodbaz_LTX_gnc_module_path(void) {
+char *
+gnc_module_path(void) {
return g_strdup("gnucash/baz");
}
-char *
-libgncmodbaz_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("this is the baz module");
}
int
-libgncmodbaz_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load libfoo */
if(gnc_module_load("gnucash/foo", 0)) {
/* publish the wrapped Scheme bindings for libbaz */
scm_init_sw_baz_module();
scm_c_eval_string("(use-modules (sw_baz))");
-
+
/* use the Scheme "baz" module */
scm_c_eval_string("(use-modules (gnucash baz))");
@@ -47,4 +43,3 @@
return FALSE;
}
}
-
Modified: gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,10 +5,10 @@
${GLIB_CFLAGS}
PWD := $(shell pwd)
-checklibdir=${PWD}
-checklib_LTLIBRARIES=libfoo.la libgncmodfoo.la
+check_LTLIBRARIES=libfoo.la libgncmodfoo.la
libfoo_la_SOURCES = foo.c
+libfoo_la_LDFLAGS = -rpath ${PWD}
# Make swig-foo.c for dist. It is an automatic dependency
# of gnc-mod-foo.c
@@ -17,7 +17,7 @@
swig-foo.c
libgncmodfoo_la_SOURCES = gnc-mod-foo.c
-
+libgncmodfoo_la_LDFLAGS = -rpath ${PWD}
libgncmodfoo_la_LIBADD = \
libfoo.la \
$(GUILE_LIBS) \
@@ -34,7 +34,3 @@
BUILT_SOURCES = swig-foo.c
MAINTAINERCLEANFILES = swig-foo.c
-
-# Keep automake from generating install targets for test libs
-install-checklibLTLIBRARIES:
-uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/gnc-mod-foo.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/gnc-mod-foo.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/mod-foo/gnc-mod-foo.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -3,41 +3,37 @@
#include "config.h"
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module-api.h"
#include "swig-foo.c"
-int libgncmodfoo_LTX_gnc_module_system_interface = 0;
-int libgncmodfoo_LTX_gnc_module_current = 0;
-int libgncmodfoo_LTX_gnc_module_age = 0;
-int libgncmodfoo_LTX_gnc_module_revision = 0;
+int gnc_module_system_interface = 0;
-/* forward references */
-char *libgncmodfoo_LTX_gnc_module_path(void);
-char *libgncmodfoo_LTX_gnc_module_description(void);
-int libgncmodfoo_LTX_gnc_module_init(int refcount);
+int gnc_module_current = 0;
+int gnc_module_age = 0;
+int gnc_module_revision = 0;
char *
-libgncmodfoo_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/foo");
}
char *
-libgncmodfoo_LTX_gnc_module_description(void) {
+gnc_module_description(void) {
return g_strdup("this is a foo module");
}
-int
-libgncmodfoo_LTX_gnc_module_init(int refcount) {
+int
+gnc_module_init(int refcount) {
/* publish the wrapped Scheme bindings for libfoo */
scm_init_sw_foo_module();
scm_c_eval_string("(use-modules (sw_foo))");
-
+
/* use the Scheme "foo" module */
scm_c_eval_string("(use-modules (gnucash foo))");
-
+
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/gnc-module/test/test-dynload.c
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/test-dynload.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/test-dynload.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,35 +1,30 @@
/*********************************************************************
* test-dynload.c
* test the ability to dlopen the gnc_module library and initialize
- * it via dlsym
+ * it via dlsym
*********************************************************************/
#include <stdio.h>
-#ifdef G_OS_WIN32
-# undef DLL_EXPORT /* Will cause warnings in ltdl.h if defined */
-# define LIBLTDL_DLL_IMPORT
-#endif
-#include <ltdl.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
-#ifndef lt_ptr
-# define lt_ptr lt_ptr_t
-#endif
-
static void
guile_main(void *closure, int argc, char ** argv)
{
- lt_dlhandle handle;
+ GModule *gmodule;
- lt_dlinit();
+ printf(" test-dynload.c: testing dynamic linking of libgnc-module ...");
+ gmodule = g_module_open("libgnc-module", 0);
- printf(" test-dynload.c: testing dynamic linking of libgncmodule ...");
- handle = lt_dlopen("libgncmodule.la");
- if(handle) {
- lt_ptr ptr = lt_dlsym(handle, "gnc_module_system_init");
- if(ptr) {
+ /* Maybe MacOS? */
+ if (!gmodule)
+ gmodule = g_module_open("libgnc-module.dylib", 0);
+
+ if (gmodule) {
+ gpointer ptr;
+ if (g_module_symbol(gmodule, "gnc_module_system_init", &ptr)) {
void (* fn)(void) = ptr;
fn();
printf(" OK\n");
@@ -42,7 +37,7 @@
}
else {
printf(" failed to open library.\n");
- printf("%s\n", lt_dlerror());
+ printf("%s\n", g_module_error());
exit(-1);
}
}
Modified: gnucash/branches/remove-group2/src/gnc-module/test/test-scm-dynload
===================================================================
--- gnucash/branches/remove-group2/src/gnc-module/test/test-scm-dynload 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-module/test/test-scm-dynload 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,12 +1,12 @@
#! /bin/sh
-echo " test-scm-dynload: testing dynamic-link of libgncmodule from Scheme.";
+echo " test-scm-dynload: testing dynamic-link of libgnc-module from Scheme.";
exec guile -s $0 "$@"
!#
(if (or (string=? (version) "1.3")
(string=? (version) "1.3.4"))
- (dynamic-link "libgncmodule.so")
- (dynamic-link "libgncmodule"))
+ (dynamic-link "libgnc-module.so")
+ (dynamic-link "libgnc-module"))
;; LocalVariables:
;; mode: scheme
Modified: gnucash/branches/remove-group2/src/gnc-test-env
===================================================================
--- gnucash/branches/remove-group2/src/gnc-test-env 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnc-test-env 2007-02-11 19:54:51 UTC (rev 15565)
@@ -14,7 +14,10 @@
;; Are we on MS Windows here? If yes, make this a #t.
;; (utsname:sysname (uname)) wasn't available in my guile-1.6.7 on
;; mingw, so I don't know an automated way to do this so far.
-(define is-windows? #f)
+(define is-windows?
+ (let ((ostype (getenv "OSTYPE")))
+ (and ostype
+ (string=? ostype "msys"))))
(define args (cdr (command-line)))
(define display-exports? #t)
@@ -45,13 +48,12 @@
(loop (cddr rest)))
(else (usage-death))))
(set! gnc-module-dirs (reverse gnc-module-dirs))
- (set! guile-load-dirs (reverse guile-load-dirs))
- (set! library-dirs (reverse library-dirs)))
+ (set! guile-load-dirs (reverse guile-load-dirs)))
;; The character set of everything except a directory separator as
;; necessary for string-tokenize below
(define char-set-path
- (char-set-adjoin
+ (char-set-adjoin
(char-set-delete char-set:graphic #\/)
#\ ))
@@ -84,41 +86,34 @@
(process-args! args)
-(display "GNC_MODULE_PATH=${GNC_MODULE_PATH}:")
-(display (adapt-dirsep
- (string-join gnc-module-dirs
- ":")))
+(define (get-dir-adder env-name dir-list item-suffix separator)
+ (string-append env-name "=\""
+ (apply string-append
+ (map
+ (lambda (dir)
+ (string-append dir item-suffix separator))
+ dir-list))
+ "${" env-name "}\" "))
-(display " GUILE_LOAD_PATH=\"${GUILE_LOAD_PATH}")
-(display path-sep-str)
-(display (adapt-dirsep
- (string-join (append gnc-module-dirs guile-load-dirs)
- path-sep-str)))
-(display "\"")
+(display
+ (adapt-dirsep
+ (get-dir-adder "GNC_MODULE_PATH" gnc-module-dirs "/.libs" path-sep-str)))
-(display " LD_LIBRARY_PATH=${LD_LIBRARY_PATH}")
-(display (adapt-dirsep
- (apply string-append
- (map
- (lambda (dir)
- (string-append ":" dir ":" dir "/.libs"))
- (append gnc-module-dirs library-dirs)))))
+(display
+ (adapt-dirsep
+ (get-dir-adder "GUILE_LOAD_PATH" guile-load-dirs "" path-sep-str)))
-(display " LTDL_LIBRARY_PATH=${LTDL_LIBRARY_PATH}")
-(display (apply string-append
- (map
- (lambda (dir)
- (string-append ":" dir ":" dir "/.libs"))
- (append gnc-module-dirs library-dirs))))
+(display
+ (adapt-dirsep
+ (get-dir-adder "LD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
+(display
+ (adapt-dirsep
+ (get-dir-adder "DYLD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
+
(if is-windows?
- (begin
- (display " PATH=${PATH}")
- (display (apply string-append
- (map
- (lambda (dir)
- (string-append ":" dir ":" dir "/.libs"))
- (append gnc-module-dirs library-dirs))))))
+ (display
+ (get-dir-adder "PATH" library-dirs "/.libs" ":")))
(if display-exports?
(begin
@@ -126,7 +121,9 @@
(display " export GNC_MODULE_PATH;")
(display " export GUILE_LOAD_PATH;")
(display " export LD_LIBRARY_PATH;")
- (display " export LTDL_LIBRARY_PATH;")))
+ (display " export DYLD_LIBRARY_PATH;")
+ (if is-windows?
+ (display " export PATH;"))))
;; Local Variables:
;; mode: scheme
Modified: gnucash/branches/remove-group2/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnome/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,8 +1,8 @@
SUBDIRS = glade schemas ui
-lib_LTLIBRARIES = libgncgnome.la
+lib_LTLIBRARIES = libgnc-gnome.la
-libgncgnome_la_LIBADD = \
+libgnc_gnome_la_LIBADD = \
${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
${top_builddir}/src/register/register-core/libgncmod-register-core.la \
@@ -14,11 +14,11 @@
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${GLADE_LIBS} \
${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
-libgncgnome_la_SOURCES = \
+libgnc_gnome_la_SOURCES = \
swig-gnome.c \
dialog-chart-export.c \
dialog-commodities.c \
@@ -29,11 +29,11 @@
dialog-price-edit-db.c \
dialog-print-check.c \
dialog-progress.c \
+ dialog-sx-editor.c \
dialog-sx-from-trans.c \
- dialog-sxsincelast.c \
+ dialog-sx-since-last-run.c \
dialog-tax-info.c \
dialog-userpass.c \
- dialog-scheduledxaction.c \
druid-acct-period.c \
druid-hierarchy.c \
druid-merge.c \
@@ -45,8 +45,10 @@
gnc-plugin-register.c \
gnc-plugin-page-account-tree.c \
gnc-plugin-page-budget.c \
+ gnc-plugin-page-sx-list.c \
gnc-plugin-page-register.c \
gnc-split-reg.c \
+ gnc-sx-list-tree-model-adapter.c \
lot-viewer.c \
reconcile-list.c \
top-level.c \
@@ -67,9 +69,9 @@
dialog-new-user.h \
dialog-print-check.h \
dialog-progress.h \
+ dialog-sx-editor.h \
dialog-sx-from-trans.h \
- dialog-sxsincelast.h \
- dialog-scheduledxaction.h \
+ dialog-sx-since-last-run.h \
druid-acct-period.h \
druid-hierarchy.h \
druid-merge.h \
@@ -81,8 +83,10 @@
gnc-plugin-register.h \
gnc-plugin-page-account-tree.h \
gnc-plugin-page-budget.h \
+ gnc-plugin-page-sx-list.h \
gnc-plugin-page-register.h \
gnc-split-reg.h \
+ gnc-sx-list-tree-model-adapter.h \
lot-viewer.h \
reconcile-list.h \
top-level.h \
@@ -131,3 +135,5 @@
CLEANFILES = gnucash.desktop
MAINTAINERCLEANFILES = swig-gnome.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\"
Modified: gnucash/branches/remove-group2/src/gnome/dialog-chart-export.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-chart-export.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-chart-export.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -229,7 +229,6 @@
data->chart_time_t = mktime(chart_tm);
current_session = gnc_get_current_session();
book = qof_session_get_book(current_session);
- filename = g_strdup("/tmp/qsf-chartofaccounts.xml");
chart_session = qof_session_new();
filename = gnc_file_dialog(_("Export Chart of Accounts to QSF XML"),
NULL, NULL, GNC_FILE_DIALOG_EXPORT);
Modified: gnucash/branches/remove-group2/src/gnome/dialog-new-user.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-new-user.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-new-user.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -99,6 +99,7 @@
result = gtk_dialog_run (GTK_DIALOG (dialog));
switch (result) {
case GTK_RESPONSE_CANCEL:
+ case GTK_RESPONSE_DELETE_EVENT:
gnc_ui_new_user_cancel_dialog ();
break;
case GTK_RESPONSE_OK:
Deleted: gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,2595 +0,0 @@
-/********************************************************************\
- * dialog-scheduledxaction.c : dialog for scheduled transaction *
- * list and editor *
- * Copyright (C) 2001,2002,2006 Joshua Sled <jsled at asynchronous.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 <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "glib-compat.h"
-#include <locale.h>
-#include <time.h>
-
-#include "qof.h"
-#include "gnc-book.h"
-#include "Account.h"
-#include "FreqSpec.h"
-#include "SchedXaction.h"
-#include "SX-book.h"
-#include "SX-book-p.h"
-#include "dialog-preferences.h"
-#include "dialog-scheduledxaction.h"
-#include "dialog-utils.h"
-#include "gnc-book.h"
-#include "gnc-component-manager.h"
-#include "gnc-date.h"
-#include "gnc-date-edit.h"
-#include "gnc-dense-cal.h"
-#include "gnc-embedded-window.h"
-#include "gnc-engine.h"
-#include "gnc-frequency.h"
-#include "gnc-gconf-utils.h"
-#include "gnc-gui-query.h"
-#include "gnc-hooks.h"
-#include "gnc-ledger-display.h"
-#include "gnc-plugin-page.h"
-#include "gnc-plugin-page-register.h"
-#include "gnc-ui.h"
-#include "gnc-ui-util.h"
-#include "gnucash-sheet.h"
-
-#include "gnc-split-reg.h"
-
-/* FIXME: temp until variable-related-stuff settled. */
-#include "dialog-sxsincelast.h"
-
-#ifdef HAVE_LANGINFO_D_FMT
-#include <langinfo.h>
-#endif
-
-static QofLogModule log_module = GNC_MOD_SX;
-
-static gint _sx_engine_event_handler_id = -1;
-
-#define SX_LIST_GCONF_SECTION "dialogs/scheduled_trans/transaction_list"
-#define SX_LIST_WIN_PREFIX "sx_list_win"
-#define SX_LIST_GLADE_NAME "Scheduled Transaction List"
-#define SX_LIST "sched_xact_list"
-#define SX_LIST_EDIT_BUTTON "edit_button"
-#define SX_LIST_DELETE_BUTTON "delete_button"
-#define SX_LIST_UPCOMING_BOX "upcoming_cal_hbox"
-#define SX_EDITOR_GLADE_NAME "Scheduled Transaction Editor"
-
-#define SXED_WIN_PREFIX "sx_editor_win"
-#define SXED_NAME_ENTRY "sxe_name"
-#define SXED_LAST_OCCUR_LABEL "last_occur_label"
-#define AUTOCREATE_OPT "autocreate_opt"
-#define NOTIFY_OPT "notify_opt"
-#define ADVANCE_OPT "advance_opt"
-#define ADVANCE_DAYS_SPIN "advance_days"
-#define REMIND_OPT "remind_opt"
-#define REMIND_DAYS_SPIN "remind_days"
-#define END_DATE_BOX "end_date_hbox"
-#define END_SPIN "end_spin"
-#define REMAIN_SPIN "remain_spin"
-
-#define SX_GLADE_FILE "sched-xact.glade"
-
-#define END_NEVER_OPTION 0
-#define END_DATE_OPTION 1
-#define NUM_OCCUR_OPTION 2
-
-#define NUM_LEDGER_LINES_DEFAULT 6
-
-#define EX_CAL_NUM_MONTHS 6
-#define EX_CAL_MO_PER_COL 2
-
-#define GNC_D_WIDTH 25
-#define GNC_D_BUF_WIDTH 26
-
-/** Datatypes ***********************************************************/
-
-typedef enum _EndTypeEnum {
- END_NEVER,
- END_DATE,
- END_OCCUR,
-} EndType;
-
-/* Runtime/dialog information about a particular SX. */
-typedef struct _SxRuntimeInfo
-{
- SchedXaction *sx;
- // the gnc-dense-cal mark-tag
- gint markTag;
- // which row in the GTK CList this SX is.
- gint row;
-} SxRuntimeInfo;
-
-struct _SchedXactionDialog
-{
- GtkWidget *dialog;
- GladeXML *gxml;
- GncDenseCal *gdcal;
- GHashTable *sxData;
-
- gint currentSortCol;
- GtkSortType currentSortType;
-};
-
-struct _SchedXactionEditorDialog
-{
- GladeXML *gxml;
- GtkWidget *dialog;
- SchedXactionDialog *sxd;
- SchedXaction *sx;
- /* If this is a new scheduled transaction or not. */
- int newsxP;
-
- /* The various widgets in the dialog */
- GNCLedgerDisplay *ledger;
-
- GNCFrequency *gncfreq;
- GncDenseCal *example_cal;
- GDate **cal_marks;
- gint markId;
-
- GtkEditable *nameEntry;
-
- GtkLabel *lastOccurLabel;
-
- GtkToggleButton *autocreateOpt;
- GtkToggleButton *notifyOpt;
- GtkToggleButton *advanceOpt;
- GtkSpinButton *advanceSpin;
- GtkToggleButton *remindOpt;
- GtkSpinButton *remindSpin;
-
- GtkToggleButton *optEndDate;
- GtkToggleButton *optEndNone;
- GtkToggleButton *optEndCount;
- GtkEntry *endCountSpin;
- GtkEntry *endRemainSpin;
- GNCDateEdit *endDateEntry;
-
- char *sxGUIDstr;
-
- GncEmbeddedWindow *embed_window;
- GncPluginPage *plugin_page;
-};
-
-/** Prototypes **********************************************************/
-
-static void putSchedXactionInDialog( gpointer data, gpointer user_data );
-
-static void generate_instances( SchedXaction *sx,
- GDate *end, GList **instanceList );
-
-static void schedXact_populate( SchedXactionDialog * );
-static void schedXact_editor_create_freq_sel( SchedXactionEditorDialog *sxed );
-static void schedXact_editor_create_ledger( SchedXactionEditorDialog *sxed );
-static void schedXact_editor_populate( SchedXactionEditorDialog * );
-
-static void sxd_close_handler ( gpointer user_data );
-
-static void new_button_clicked( GtkButton *b, gpointer d );
-static void edit_button_clicked( GtkButton *b, gpointer d );
-static void delete_button_clicked( GtkButton *b, gpointer d );
-static void close_button_clicked( GtkButton *b, gpointer d );
-static void gnc_sxl_record_size( SchedXactionDialog *sxd );
-static void gnc_sxd_row_click_handler( GtkCList *clist,
- gint col,
- gpointer ud );
-static void gnc_sxd_set_sort_compare( GtkCList *cl, gint col );
-static gint gnc_sxd_clist_compare_sx_name( GtkCList *cl,
- gconstpointer a,
- gconstpointer b );
-static gint gnc_sxd_clist_compare_sx_freq( GtkCList *cl,
- gconstpointer a,
- gconstpointer b );
-static gint gnc_sxd_clist_compare_sx_next_occur( GtkCList *cl,
- gconstpointer a,
- gconstpointer b );
-
-static void gnc_sxed_record_size( SchedXactionEditorDialog *sxed );
-static void gnc_sxed_get_widgets( SchedXactionEditorDialog *sxed );
-static void endgroup_rb_toggled( GtkButton *b, gpointer d );
-static void set_endgroup_toggle_states( SchedXactionEditorDialog *sxed, EndType t );
-static void advance_toggle( GtkButton *b, SchedXactionEditorDialog *sxed );
-static gboolean gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed );
-static gboolean gnc_sxed_check_changed( SchedXactionEditorDialog *sxed );
-static void free_keys_and_numerics_ea( gpointer key,
- gpointer value,
- gpointer user_data );
-static void gnc_sxed_save_sx( SchedXactionEditorDialog *sxed );
-static void gnc_sxed_freq_changed( GNCFrequency *gf, gpointer ud );
-static void sxed_excal_update_adapt( GtkObject *o, gpointer ud );
-static void gnc_sxed_update_cal( SchedXactionEditorDialog *sxed );
-
-static void gnc_sxed_reg_check_close(SchedXactionEditorDialog *sxed);
-
-static gint sxed_close_event( GtkDialog *dlg, gpointer ud );
-
-static gboolean sxed_confirmed_cancel( SchedXactionEditorDialog *sxed );
-
-static gboolean editor_component_sx_equality( gpointer find_data,
- gpointer user_data );
-
-static SxRuntimeInfo* _new_sx_runtime_info( SchedXaction *sx );
-static void _clear_runtime_info_row( gpointer key, gpointer value, gpointer user_data );
-
-
-static GtkActionEntry gnc_sxed_menu_entries [] =
-{
- { "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
- { "TransactionAction", NULL, N_("_Transaction"), NULL, NULL, NULL },
- { "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
- { "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
-};
-static guint gnc_sxed_menu_n_entries = G_N_ELEMENTS (gnc_sxed_menu_entries);
-
-/** Implementations *****************************************************/
-
-static
-void
-sxd_close_handler (gpointer user_data)
-{
- SchedXactionDialog *sxd = user_data;
- gnc_sxl_record_size(sxd);
- gtk_widget_hide(sxd->dialog);
- gtk_widget_destroy(sxd->dialog);
-}
-
-static
-void
-_clear_runtime_info_row( gpointer key, gpointer value, gpointer user_data )
-{
- SxRuntimeInfo *sxri;
- sxri = (SxRuntimeInfo*)value;
- sxri->row = -1;
-}
-
-void
-gnc_sxd_list_refresh( SchedXactionDialog *sxd )
-{
- GList *sxList;
- GtkCList *cl;
- GtkWidget *widget;
-
- widget = glade_xml_get_widget( sxd->gxml, SX_LIST_EDIT_BUTTON );
- gtk_widget_set_sensitive(widget, FALSE);
- widget = glade_xml_get_widget( sxd->gxml, SX_LIST_DELETE_BUTTON );
- gtk_widget_set_sensitive(widget, FALSE);
-
- /* Update the clist. */
- cl = GTK_CLIST( glade_xml_get_widget( sxd->gxml, SX_LIST ) );
- gtk_clist_freeze( cl );
-
- gtk_clist_clear( cl );
- // Also, flush the row-numbers from storage
- g_hash_table_foreach( sxd->sxData, _clear_runtime_info_row, NULL );
- sxList = gnc_book_get_schedxactions( gnc_get_current_book() );
- g_list_foreach( sxList, putSchedXactionInDialog, sxd );
-
- gtk_clist_thaw( cl );
-}
-
-static
-void
-sxed_close_handler ( gpointer user_data )
-{
- SchedXactionEditorDialog *sxed = user_data;
-
- gnc_sxed_reg_check_close( sxed );
- gnc_sxed_record_size( sxed );
- gtk_widget_destroy( sxed->dialog );
- /* The data will be cleaned up in the destroy handler. */
-}
-
-static
-void
-close_button_clicked( GtkButton *b, gpointer d )
-{
- sxd_close_handler( d );
-}
-
-/**
- * @return TRUE if the user does want to cancel, FALSE if not. If TRUE is
- * returned, the register's changes have been cancelled.
- **/
-static
-gboolean
-sxed_confirmed_cancel( SchedXactionEditorDialog *sxed )
-{
- SplitRegister *reg;
-
- reg = gnc_ledger_display_get_split_register( sxed->ledger );
- /* check for changes */
- if ( gnc_sxed_check_changed( sxed ) ) {
- const char *sx_changed_msg =
- _( "This SX has changed; are you "
- "sure you want to cancel?" );
- if (!gnc_verify_dialog(sxed->dialog, FALSE, sx_changed_msg)) {
- return FALSE;
- }
- }
- /* cancel ledger changes */
- gnc_split_register_cancel_cursor_trans_changes( reg );
- return TRUE;
-}
-
-static
-void
-editor_cancel_button_clicked( GtkButton *b, SchedXactionEditorDialog *sxed )
-{
- /* close */
- gnc_close_gui_component_by_data( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- sxed );
-}
-
-static
-void
-editor_help_button_clicked(GtkButton *b, SchedXactionEditorDialog *sxed)
-{
- gnc_gnome_help(HF_HELP, HL_SXEDITOR);
-}
-
-static void
-set_var_to_random_value( gpointer key, gpointer value, gpointer ud )
-{
- if ( !value ) {
- value = g_new0( gnc_numeric, 1 );
- }
- *(gnc_numeric*)value =
- double_to_gnc_numeric( rand() + 2, 1,
- GNC_NUMERIC_RND_MASK
- | GNC_RND_FLOOR );
- g_hash_table_insert( ud, key, value );
-}
-
-static
-void
-free_keys_and_numerics_ea( gpointer key, gpointer val, gpointer ud )
-{
- g_assert( key );
- g_assert( val );
- g_free( (gchar*)key );
- g_free( (gnc_numeric*)val );
-}
-
-static
-void
-editor_ok_button_clicked( GtkButton *b, SchedXactionEditorDialog *sxed )
-{
- GNCBook *book;
- GList *sxList;
-
- if ( !gnc_sxed_check_consistent( sxed ) )
- return;
-
- gnc_sxed_save_sx( sxed );
-
- /* add to list */
- if ( sxed->newsxP ) {
- book = gnc_get_current_book ();
- sxList = gnc_book_get_schedxactions( book );
- sxList = g_list_append( sxList, sxed->sx );
- gnc_book_set_schedxactions( book, sxList );
- sxed->newsxP = FALSE;
- }
-
- /* update lists */
- /* We now do this by getting the list of SX Lists and updating them
- [if they exist]. Otherwise, our pointer to our SXD might not be
- valid; see Bug#103629. */
- {
- GList *listDialogs, *ldIter;
- listDialogs =
- gnc_find_gui_components( DIALOG_SCHEDXACTION_CM_CLASS,
- NULL, NULL );
- for ( ldIter = listDialogs;
- ldIter != NULL;
- ldIter = ldIter->next )
- {
- gnc_sxd_list_refresh( (SchedXactionDialog*)ldIter
- ->data );
- }
- if ( listDialogs != NULL )
- {
- g_list_free( listDialogs );
- }
- }
-
- /* cleanup */
- gnc_close_gui_component_by_data( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- sxed );
-}
-
-/**
- * Checks to see if the SX has been modified from it's previously-saved
- * state.
- * @return TRUE if this is a 'new' SX, or if the SX has changed from it's
- * previous configuration.
- **/
-static
-gboolean
-gnc_sxed_check_changed( SchedXactionEditorDialog *sxed )
-{
- if ( sxed->newsxP )
- return TRUE;
-
- /* name */
- {
- char *name;
-
- name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
- if ( strlen(name) == 0 ) {
- return TRUE;
-
- }
- if ( (xaccSchedXactionGetName(sxed->sx) == NULL)
- || (strcmp( xaccSchedXactionGetName(sxed->sx),
- name ) != 0) ) {
- return TRUE;
- }
- }
-
- /* end options */
- {
- /* dialog says... no end */
- if ( gtk_toggle_button_get_active( sxed->optEndNone ) ) {
- if ( xaccSchedXactionHasEndDate(sxed->sx)
- || xaccSchedXactionHasOccurDef(sxed->sx) ) {
- return TRUE;
- }
- }
-
- /* dialog says... end date */
- if ( gtk_toggle_button_get_active( sxed->optEndDate ) ) {
- GDate sxEndDate, dlgEndDate;
-
- if ( ! xaccSchedXactionHasEndDate( sxed->sx ) ) {
- return TRUE;
- }
- sxEndDate = *xaccSchedXactionGetEndDate( sxed->sx );
- g_date_set_time_t( &dlgEndDate,
- gnc_date_edit_get_date( sxed->
- endDateEntry ) );
-
- if ( g_date_compare( &sxEndDate, &dlgEndDate ) != 0 ) {
- return TRUE;
- }
- }
-
- /* dialog says... num occur */
- if ( gtk_toggle_button_get_active( sxed->optEndCount ) ) {
- gint sxNumOccur, sxNumRem, dlgNumOccur, dlgNumRem;
-
- if ( ! xaccSchedXactionGetNumOccur( sxed->sx ) ) {
- return TRUE;
- }
-
- dlgNumOccur =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endCountSpin) );
-
- dlgNumRem =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
-
- sxNumOccur = xaccSchedXactionGetNumOccur( sxed->sx );
- sxNumRem = xaccSchedXactionGetRemOccur( sxed->sx );
-
- if ( (dlgNumOccur != sxNumOccur)
- || (dlgNumRem != sxNumRem) ) {
- return TRUE;
- }
- }
- }
-
- /* SX options [autocreate, notify, reminder, advance] */
- {
- gboolean dlgAutoCreate, dlgNotify, sxAutoCreate, sxNotify;
- gint dlgAdvance, sxAdvance;
- gint dlgRemind, sxRemind;
-
- dlgAutoCreate =
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->
- autocreateOpt) );
- dlgNotify =
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->
- notifyOpt) );
-
- xaccSchedXactionGetAutoCreate( sxed->sx, &sxAutoCreate, &sxNotify );
- if ( ! ((dlgAutoCreate == sxAutoCreate)
- && (dlgNotify == sxNotify)) ) {
- return TRUE;
- }
-
- dlgAdvance = 0;
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->advanceOpt) ) ) {
- dlgAdvance =
- gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(sxed->
- advanceSpin) );
- }
- sxAdvance = xaccSchedXactionGetAdvanceCreation( sxed->sx );
- if ( dlgAdvance != sxAdvance ) {
- return TRUE;
- }
-
- dlgRemind = 0;
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(sxed->remindOpt) ) ) {
- dlgRemind =
- gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(sxed->remindSpin) );
- }
- sxRemind = xaccSchedXactionGetAdvanceReminder( sxed->sx );
- if ( dlgRemind != sxRemind ) {
- return TRUE;
- }
- }
-
- /* FS, startdate */
- {
- FreqSpec *dlgFS, *sxFS;
- GDate dlgStartDate, sxStartDate;
- GString *dlgFSstr, *sxFSstr;
- gboolean fsStrCmpResult;
-
- dlgFS = xaccFreqSpecMalloc( gnc_get_current_book() );
- /* save gncFreq data */
- gnc_frequency_save_state( sxed->gncfreq, dlgFS, &dlgStartDate );
- dlgFSstr = g_string_sized_new( 16 );
- xaccFreqSpecGetFreqStr( dlgFS, dlgFSstr );
- /* get SX startdate/fs data */
- sxStartDate = *xaccSchedXactionGetStartDate( sxed->sx );
- sxFS = xaccSchedXactionGetFreqSpec( sxed->sx );
- sxFSstr = g_string_sized_new( 16 );
- xaccFreqSpecGetFreqStr( sxFS, sxFSstr );
- /* compare */
-
- fsStrCmpResult = /* lame version of comparison */
- (strcmp( dlgFSstr->str, sxFSstr->str) != 0);
- g_string_free( dlgFSstr, TRUE );
- g_string_free( sxFSstr, TRUE );
- xaccFreqSpecFree( dlgFS );
-
- if ( (g_date_compare(&dlgStartDate, &sxStartDate) != 0)
- || fsStrCmpResult ) {
- return TRUE;
- }
- }
-
- /* template transactions */
- {
- SplitRegister *sr =
- gnc_ledger_display_get_split_register( sxed->ledger );
-
- if ( gnc_split_register_changed( sr ) ) {
- return TRUE;
- }
- }
- return FALSE;
-}
-
-
-/**
- * Holds the credit- and debit-sum for a given Transaction, as used in
- * gnc_sxed_check_consistent.
- **/
-typedef struct _txnCreditDebitSums {
- gnc_numeric creditSum;
- gnc_numeric debitSum;
-} txnCreditDebitSums;
-
-static
-void
-set_sums_to_zero( gpointer key,
- gpointer val,
- gpointer ud )
-{
- txnCreditDebitSums *tcds = (txnCreditDebitSums*)val;
- tcds->creditSum = gnc_numeric_zero();
- tcds->debitSum = gnc_numeric_zero();
-}
-
-static
-void
-free_sums( gpointer key,
- gpointer val,
- gpointer ud )
-{
- txnCreditDebitSums *tcds = (txnCreditDebitSums*)val;
- g_free( tcds );
-}
-
-static
-void
-check_credit_debit_balance( gpointer key,
- gpointer val,
- gpointer ud )
-{
- txnCreditDebitSums *tcds = (txnCreditDebitSums*)val;
- gboolean *unbalanced = (gboolean*)ud;
- *unbalanced |= !(gnc_numeric_zero_p(
- gnc_numeric_sub_fixed( tcds->debitSum,
- tcds->creditSum ) ));
-#if GNC_DEBUG
-
- if ( gnc_numeric_zero_p( gnc_numeric_sub_fixed( tcds->debitSum,
- tcds->creditSum ) ) ) {
- DEBUG( "%.8x | true [%s - %s = %s]",
- (unsigned int)key,
- gnc_numeric_to_string( tcds->debitSum ),
- gnc_numeric_to_string( tcds->creditSum ),
- gnc_numeric_to_string(gnc_numeric_sub_fixed( tcds->debitSum,
- tcds->creditSum )) );
- } else {
- DEBUG( "%.8x | false [%s - %s = %s]",
- (unsigned int)key,
- gnc_numeric_to_string( tcds->debitSum ),
- gnc_numeric_to_string( tcds->creditSum ),
- gnc_numeric_to_string(gnc_numeric_sub_fixed( tcds->debitSum,
- tcds->creditSum )) );
- }
-#endif /* GNC_DEBUG */
-}
-
-/**
- * Checks to make sure that the SX is in a reasonable state to save.
- * @return true if checks out okay, false otherwise.
- **/
-static
-gboolean
-gnc_sxed_check_consistent( SchedXactionEditorDialog *sxed )
-{
- gboolean multi_commodity = FALSE;
- gnc_commodity *base_cmdty = NULL;
- gint ttVarCount, splitCount;
- FreqSpec *fs;
-
- /* Do checks on validity and such, interrupting the user if
- * things aren't right.
- *
- * Features...
- * X support formulas [?!]
- * X balancing the SX if contain numeric-only formula data.
- * X agreement with create-automagically/notification controls
- * X the 'will ever be valid' check should take num-occur vals into
- * account.
- * X SX name is unique
- * X SX has a name
- * X "weekly" FS has some days set.
- * X "once" with reasonable start/end dates.
- * X This doesn't work at the time the 'weekly' one was fixed with
- * user-confirmation, below; the once SX is always valid.
- * [X more generically, creating a "not scheduled" SX is probably not
- * right... ]
- */
-
- ttVarCount = 0;
- splitCount = 0;
- {
- static const int NUM_ITERS_WITH_VARS = 5;
- static const int NUM_ITERS_NO_VARS = 1;
- int numIters, i;
- GHashTable *vars, *txns;
- GList *splitList = NULL;
- char *str;
- kvp_frame *f;
- kvp_value *v;
- Split *s;
- Transaction *t;
- gnc_numeric tmp;
- gboolean unbalanceable;
- gpointer unusedKey, unusedValue;
-
- unbalanceable = FALSE; /* innocent until proven guilty */
- vars = g_hash_table_new( g_str_hash, g_str_equal );
- txns = g_hash_table_new( g_direct_hash, g_direct_equal );
- numIters = NUM_ITERS_NO_VARS;
- /**
- * Plan:
- * . Do a first pass to get the variables.
- * . Set each variable to random values.
- * . see if we balance after that
- * . true: all good
- * . false: indicate to user, allow decision.
- */
-
- /* FIXME: This _really_ shouldn't require a modification of the
- * SX just to get the var names... */
- gnc_split_register_save ( gnc_ledger_display_get_split_register(sxed->ledger),
- FALSE );
- /* numeric-formulas-get-balanced determination */
- sxsl_get_sx_vars( sxed->sx, vars );
-
- ttVarCount = g_hash_table_size( vars );
- if ( ttVarCount != 0 ) {
- /* balance with random variable bindings some number
- * of times in an attempt to ferret out
- * un-balanceable transactions.
- *
- * NOTE: The Real Way to do this is with some
- * symbolic math to eliminate the variables. This is
- * hard, and we don't do it. This solution will
- * suffice for now, and perhaps for the lifetime of
- * the software. --jsled */
- numIters = NUM_ITERS_WITH_VARS;
- }
-
- srand(time(NULL));
- for ( i=0; i < numIters && !unbalanceable; i++ ) {
- g_hash_table_foreach( vars, set_var_to_random_value,
- (gpointer)vars );
- g_hash_table_foreach( txns, set_sums_to_zero, NULL );
- tmp = gnc_numeric_zero();
-
- splitList = xaccSchedXactionGetSplits( sxed->sx );
- splitCount += g_list_length( splitList );
-
- for ( ; splitList; splitList = splitList->next )
- {
- GUID *acct_guid;
- Account *acct;
- gnc_commodity *split_cmdty;
- txnCreditDebitSums *tcds;
-
- s = (Split*)splitList->data;
- t = xaccSplitGetParent( s );
-
- if ( !(tcds =
- (txnCreditDebitSums*)g_hash_table_lookup( txns,
- (gpointer)t )) )
- {
- tcds = g_new0( txnCreditDebitSums, 1 );
- tcds->creditSum = gnc_numeric_zero();
- tcds->debitSum = gnc_numeric_zero();
- g_hash_table_insert( txns, (gpointer)t, (gpointer)tcds );
- }
-
- f = xaccSplitGetSlots( s );
-
- /* contains the guid of the split's actual account. */
- v = kvp_frame_get_slot_path(f,
- GNC_SX_ID,
- GNC_SX_ACCOUNT,
- NULL);
- acct_guid = kvp_value_get_guid( v );
- acct = xaccAccountLookup( acct_guid, gnc_get_current_book ());
- split_cmdty = xaccAccountGetCommodity(acct);
- if (base_cmdty == NULL)
- {
- base_cmdty = split_cmdty;
- }
- multi_commodity |= !gnc_commodity_equal(split_cmdty, base_cmdty);
-
- v = kvp_frame_get_slot_path( f,
- GNC_SX_ID,
- GNC_SX_CREDIT_FORMULA,
- NULL );
- if ( v
- && (str = kvp_value_get_string(v))
- && strlen( str ) != 0 ) {
- if ( parse_vars_from_formula( str, vars, &tmp ) < 0 ) {
- GString *errStr;
-
- errStr = g_string_sized_new( 32 );
- g_string_printf( errStr,
- _( "Couldn't parse credit formula for "
- "split \"%s\"." ),
- xaccSplitGetMemo( s ) );
- gnc_error_dialog( GTK_WIDGET(sxed->dialog),
- errStr->str );
- g_string_free( errStr, TRUE );
-
- return FALSE;
- }
- tcds->creditSum =
- gnc_numeric_add( tcds->creditSum, tmp, 100,
- (GNC_DENOM_AUTO | GNC_DENOM_LCD) );
- tmp = gnc_numeric_zero();
- }
- v = kvp_frame_get_slot_path( f,
- GNC_SX_ID,
- GNC_SX_DEBIT_FORMULA,
- NULL );
- if ( v
- && (str = kvp_value_get_string(v))
- && strlen(str) != 0 ) {
- if ( parse_vars_from_formula( str, vars, &tmp ) < 0 ) {
- GString *errStr;
-
- errStr = g_string_sized_new( 32 );
- g_string_printf( errStr,
- _( "Couldn't parse debit formula for "
- "split \"%s\"." ),
- xaccSplitGetMemo( s ) );
- gnc_error_dialog( GTK_WIDGET(sxed->dialog),
- (gchar*)errStr->str );
- g_string_free( errStr, TRUE );
-
- return FALSE;
- }
- tcds->debitSum = gnc_numeric_add( tcds->debitSum, tmp, 100,
- (GNC_DENOM_AUTO | GNC_DENOM_LCD) );
- tmp = gnc_numeric_zero();
- }
- }
-
- g_hash_table_foreach( txns,
- check_credit_debit_balance,
- &unbalanceable );
- }
-
- /* Subtract out pre-defined vars */
- if ( g_hash_table_lookup_extended( vars, "i",
- &unusedKey,
- &unusedValue ) ) {
- ttVarCount -= 1;
- }
-
- g_hash_table_foreach( vars,
- free_keys_and_numerics_ea,
- NULL );
- g_hash_table_destroy( vars );
-
- g_hash_table_foreach( txns, free_sums, NULL );
- g_hash_table_destroy( txns );
-
- if ( unbalanceable
- && !gnc_verify_dialog( sxed->dialog, FALSE,
- "%s",
- _("The Scheduled Transaction Editor "
- "cannot automatically balance "
- "this transaction. "
- "Should it still be "
- "entered?") ) ) {
- return FALSE;
- }
- }
-
- /* read out data back into SchedXaction object. */
- /* FIXME: this is getting too deep; split out. */
- {
- gchar *name, *nameKey;
- gboolean nameExists, nameHasChanged;
- GList *sxList;
-
- name = gtk_editable_get_chars( GTK_EDITABLE(sxed->nameEntry), 0, -1 );
- if ( strlen(name) == 0 ) {
- const char *sx_has_no_name_msg =
- _( "Please name the Scheduled Transaction." );
- gnc_error_dialog( sxed->dialog, sx_has_no_name_msg );
- g_free( name );
- return FALSE;
-
- }
-
- nameExists = FALSE;
- nameKey = g_utf8_collate_key(name, -1);
- nameHasChanged =
- (xaccSchedXactionGetName(sxed->sx) == NULL)
- || (strcmp( xaccSchedXactionGetName(sxed->sx), name ) != 0);
- for ( sxList =
- gnc_book_get_schedxactions( gnc_get_current_book() );
- nameHasChanged && !nameExists && sxList ;
- sxList = sxList->next ) {
- char *existingName, *existingNameKey;
- existingName =
- xaccSchedXactionGetName( (SchedXaction*)sxList->
- data );
- existingNameKey = g_utf8_collate_key(existingName, -1);
- nameExists |= ( strcmp(nameKey, existingNameKey) == 0 );
- g_free( existingNameKey );
- }
- if ( nameHasChanged && nameExists ) {
- const char *sx_has_existing_name_msg =
- _( "A Scheduled Transaction with the "
- "name \"%s\" already exists. "
- "Are you sure you want to name "
- "this one the same?" );
- if ( ! gnc_verify_dialog( sxed->dialog, FALSE,
- sx_has_existing_name_msg,
- name) ) {
- g_free( nameKey );
- g_free( name );
- return FALSE;
- }
- }
- g_free( nameKey );
- g_free( name );
- }
-
- // @@fixme: similar to below, check the commodities involved, and disallow autocreation
- {
- gboolean autocreateState, notifyState;
-
- autocreateState =
- gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(sxed->autocreateOpt) );
- notifyState =
- gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(sxed->notifyOpt) );
-
- if (((ttVarCount > 0) || multi_commodity) && autocreateState) {
- gnc_warning_dialog(sxed->dialog,
- _("Scheduled Transactions with variables "
- "cannot be automatically created."));
- return FALSE;
- }
-
- /* Fix for part of Bug#121740 -- auto-create transactions are
- * only valid if there's actually a transaction to create. */
- if ( autocreateState && splitCount == 0 ) {
- gnc_warning_dialog( sxed->dialog,
- _("Scheduled Transactions without a template "
- "transaction cannot be automatically created.") );
- return FALSE;
- }
- }
-
- /* deal with time. */
- {
- GDate startDate, endDate, nextDate;
-
- if ( !gtk_toggle_button_get_active(sxed->optEndDate)
- && !gtk_toggle_button_get_active(sxed->optEndCount)
- && !gtk_toggle_button_get_active(sxed->optEndNone) ) {
- const char *sx_end_spec_msg =
- _( "Please provide a valid end selection." );
- gnc_error_dialog( sxed->dialog, sx_end_spec_msg );
- return FALSE;
- }
-
- if ( gtk_toggle_button_get_active(sxed->optEndCount)) {
- gint occur, rem;
-
- occur =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endCountSpin) );
-
- rem =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
-
- if ( occur == 0 ) {
- const char *sx_occur_count_zero_msg =
- _( "There must be some number of occurrences." );
- gnc_error_dialog( sxed->dialog,
- sx_occur_count_zero_msg );
- return FALSE;
- }
-
- if ( rem > occur ) {
- const char *sx_occur_counts_wrong_msg =
- _( "The number of remaining occurrences "
- "(%d) is greater than the number of "
- "total occurrences (%d)." );
- gnc_error_dialog( sxed->dialog,
- sx_occur_counts_wrong_msg,
- rem, occur );
- return FALSE;
- }
-
- }
-
- g_date_clear( &endDate, 1 );
- if ( gtk_toggle_button_get_active(sxed->optEndDate) ) {
- g_date_set_time_t( &endDate,
- gnc_date_edit_get_date( sxed->
- endDateEntry ) );
- }
-
- /* Now, see if the user is attempting to create a SX that can't exist
- * [will never run]. */
-
- /* get the frequency spec data */
- fs = xaccFreqSpecMalloc( gnc_get_current_book() );
- gnc_frequency_save_state( sxed->gncfreq, fs, &startDate );
- /* Replicate just a smidgen of the code in the SX
- * ...GetNextInstance routine */
- g_date_subtract_days( &startDate, 1 );
- xaccFreqSpecGetNextInstance( fs, &startDate, &nextDate );
- xaccFreqSpecFree( fs );
-
- if ( !g_date_valid( &nextDate )
- || (g_date_valid( &endDate )
- && (g_date_compare( &nextDate, &endDate ) > 0)) ) {
- const char *invalid_sx_check_msg =
- _( "You have attempted to create a Scheduled "
- "Transaction which will never run. Do you "
- "really want to do this?" );
- if ( ! gnc_verify_dialog( sxed->dialog, FALSE,
- invalid_sx_check_msg) ) {
-
- return FALSE;
- }
- }
- }
- return TRUE;
-}
-
-/**
- * Saves the contents of the SX. This assumes that gnc_sxed_check_consistent
- * has returned true.
- **/
-static
-void
-gnc_sxed_save_sx( SchedXactionEditorDialog *sxed )
-{
- /* name */
- {
- char *name;
-
- name = gtk_editable_get_chars( sxed->nameEntry, 0, -1 );
- xaccSchedXactionSetName( sxed->sx, name );
- g_free( name );
- }
-
- /* date */
- {
- GDate gdate;
-
- if ( gtk_toggle_button_get_active(sxed->optEndDate) ) {
- /* get the end date data */
- g_date_set_time_t( &gdate,
- gnc_date_edit_get_date(
- sxed->endDateEntry ) );
- xaccSchedXactionSetEndDate( sxed->sx, &gdate );
- /* set the num occurances data */
- xaccSchedXactionSetNumOccur( sxed->sx, 0 );
- } else if ( gtk_toggle_button_get_active(sxed->optEndCount) ) {
- gint num;
-
- /* get the occurances data */
- num =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endCountSpin) );
- xaccSchedXactionSetNumOccur( sxed->sx, num );
-
- num =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
- xaccSchedXactionSetRemOccur( sxed->sx, num );
-
- g_date_clear( &gdate, 1 );
- xaccSchedXactionSetEndDate( sxed->sx, &gdate );
- } else if ( gtk_toggle_button_get_active( sxed->optEndNone ) ) {
- xaccSchedXactionSetNumOccur( sxed->sx, 0 );
- g_date_clear( &gdate, 1 );
- xaccSchedXactionSetEndDate( sxed->sx, &gdate );
- } else {
- PERR( "No valid end specified\n" );
- }
- }
-
- /* Auto-create/notification states */
- {
- gboolean autocreateState, notifyState;
-
- autocreateState = gtk_toggle_button_get_active( sxed->autocreateOpt );
- notifyState = gtk_toggle_button_get_active( sxed->notifyOpt );
- /* "Notify" only makes sense if AutoCreate is actived;
- * enforce that here. */
- xaccSchedXactionSetAutoCreate( sxed->sx,
- autocreateState,
- (autocreateState & notifyState) );
- }
-
- /* days in advance */
- {
- int daysInAdvance;
-
- daysInAdvance = 0;
- if ( gtk_toggle_button_get_active( sxed->advanceOpt ) ) {
- daysInAdvance =
- gtk_spin_button_get_value_as_int( sxed->advanceSpin );
- }
- xaccSchedXactionSetAdvanceCreation( sxed->sx, daysInAdvance );
-
- daysInAdvance = 0;
- if ( gtk_toggle_button_get_active( sxed->remindOpt ) ) {
- daysInAdvance =
- gtk_spin_button_get_value_as_int( sxed->remindSpin );
- }
- xaccSchedXactionSetAdvanceReminder( sxed->sx, daysInAdvance );
- }
-
- /* start date and freq spec */
- {
- FreqSpec *fs;
- GDate gdate;
- GString *str;
-
- fs = xaccSchedXactionGetFreqSpec( sxed->sx );
- gnc_frequency_save_state( sxed->gncfreq, fs, &gdate );
-
- str = g_string_new( "" );
- xaccFreqSpecGetFreqStr( fs, str );
- DEBUG( "fs: %s", str->str );
-
- /* now that we have it, set the start date */
- xaccSchedXactionSetStartDate( sxed->sx, &gdate );
- }
-
-}
-
-static void
-autocreate_toggled( GtkObject *o, SchedXactionEditorDialog *sxed )
-{
- if ( !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(o)) ) {
- gtk_toggle_button_set_active( sxed->notifyOpt, FALSE );
- }
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->notifyOpt),
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(o) ) );
-}
-
-static void
-advance_toggle( GtkButton *o, SchedXactionEditorDialog *sxed )
-{
- gchar *spinName;
- GtkWidget *spin;
-
- spinName = (gchar*)g_object_get_data( G_OBJECT(o), "whichOneAmI" );
- spin = glade_xml_get_widget( sxed->gxml, spinName );
- if ( !spin ) {
- PERR( "Error getting widget with name \"%s\"", spinName );
- return;
- }
- gtk_widget_set_sensitive( spin,
- gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(o) ) );
- /* FIXME: this doesn't do what we want... :( */
- gtk_editable_set_editable( GTK_EDITABLE(spin), TRUE );
-}
-
-/* Local destruction of dialog */
-static void
-scheduledxaction_dialog_destroy(GtkObject *object, gpointer data)
-{
- SchedXactionDialog *sxd = data;
-
- if ( !sxd ) return;
-
- gnc_unregister_gui_component_by_data
- (DIALOG_SCHEDXACTION_CM_CLASS, sxd);
-
- // FIXME: um. We should free memory and stuff, here...
- /*
- GladeXML *gxml;
- GncDenseCal *gdcal;
- GHashTable *sxData;
- */
-
- g_free( sxd );
-}
-
-/* Local destruction of dialog */
-static void
-scheduledxaction_editor_dialog_destroy(GtkObject *object, gpointer data)
-{
- int i;
- SchedXactionEditorDialog *sxed = data;
-
- if (sxed == NULL)
- return;
-
- gnc_unregister_gui_component_by_data
- (DIALOG_SCHEDXACTION_EDITOR_CM_CLASS, sxed);
-
- gnc_embedded_window_close_page(sxed->embed_window, sxed->plugin_page);
- gtk_widget_destroy(GTK_WIDGET(sxed->embed_window));
- sxed->embed_window = NULL;
- sxed->plugin_page = NULL;
- sxed->ledger = NULL;
-
- g_free (sxed->sxGUIDstr);
- sxed->sxGUIDstr = NULL;
-
- for ( i=0; i<(EX_CAL_NUM_MONTHS*31); i++ ) {
- g_free( sxed->cal_marks[i] );
- }
- g_free( sxed->cal_marks );
-
- if ( sxed->newsxP ) {
- /* FIXME: WTF???
- *
- * "WTF" explaination: in the "new" click from the caller, we
- * set this flag. When "ok" is pressed on the dialog, we set
- * this flag to false, and thus leave the SX live. If
- * "Cancel" is clicked, the flag will still be true, and this
- * SX will be cleaned, here. -- jsled
- */
- xaccSchedXactionFree( sxed->sx );
- }
- sxed->sx = NULL;
-
- g_free (sxed);
-}
-
-SchedXactionDialog*
-gnc_ui_scheduled_xaction_dialog_create(void)
-{
- SchedXactionDialog *sxd = NULL;
- GtkObject *sxdo;
- GtkWidget *button;
- GtkWidget *w;
- SchedXactionDialog *alreadyExisting = NULL;
-
- alreadyExisting =
- (SchedXactionDialog*)
- gnc_find_first_gui_component( DIALOG_SCHEDXACTION_CM_CLASS,
- NULL,
- (gpointer)sxd );
- if ( alreadyExisting != NULL ) {
- gtk_window_present( GTK_WINDOW(alreadyExisting->dialog) );
- return alreadyExisting;
- }
-
- sxd = g_new0( SchedXactionDialog, 1 );
-
- sxd->gxml = gnc_glade_xml_new( SX_GLADE_FILE, SX_LIST_GLADE_NAME );
- sxd->dialog = glade_xml_get_widget( sxd->gxml, SX_LIST_GLADE_NAME );
-
- sxd->sxData = g_hash_table_new( NULL, NULL );
-
- sxdo = GTK_OBJECT(sxd->dialog);
-
- w = glade_xml_get_widget( sxd->gxml, SX_LIST_UPCOMING_BOX );
- sxd->gdcal = GNC_DENSE_CAL( gnc_dense_cal_new() );
- gnc_dense_cal_set_months_per_col( sxd->gdcal, 4 );
- gnc_dense_cal_set_num_months( sxd->gdcal, 12 );
- gtk_container_add( GTK_CONTAINER(w), GTK_WIDGET(sxd->gdcal) );
-
- g_signal_connect( sxdo, "destroy",
- G_CALLBACK(scheduledxaction_dialog_destroy),
- sxd );
-
- button = glade_xml_get_widget( sxd->gxml, "new_button" );
- g_signal_connect( button, "clicked",
- G_CALLBACK(new_button_clicked), sxd );
- button = glade_xml_get_widget( sxd->gxml, "edit_button" );
- g_signal_connect( button, "clicked",
- G_CALLBACK(edit_button_clicked), sxd );
- button = glade_xml_get_widget( sxd->gxml, "delete_button" );
- g_signal_connect( button, "clicked",
- G_CALLBACK(delete_button_clicked), sxd );
- button = glade_xml_get_widget( sxd->gxml, "close_button" );
- g_signal_connect( button, "clicked",
- G_CALLBACK(close_button_clicked), sxd );
-
- w = glade_xml_get_widget( sxd->gxml, SX_LIST );
- g_signal_connect( w, "select-row",
- G_CALLBACK(row_select_handler), sxd );
- g_signal_connect( w, "unselect-row",
- G_CALLBACK(row_unselect_handler), sxd );
- g_signal_connect( w, "click-column",
- G_CALLBACK(gnc_sxd_row_click_handler), sxd );
-
- // gtk_clist_column_titles_active( GTK_CLIST( w ) );
-
- /* Default to sorting by ascending next-instance date. */
- sxd->currentSortCol = 2;
- sxd->currentSortType = GTK_SORT_ASCENDING;
- gnc_sxd_set_sort_compare( GTK_CLIST(w), sxd->currentSortCol );
- gtk_clist_set_auto_sort( GTK_CLIST(w), TRUE );
-
- gnc_restore_window_size(SX_LIST_GCONF_SECTION, GTK_WINDOW(sxd->dialog));
-
- gnc_register_gui_component( DIALOG_SCHEDXACTION_CM_CLASS,
- NULL, /* no refresh_handler */
- sxd_close_handler,
- sxd );
-
- schedXact_populate( sxd );
-
- gtk_widget_show_all(sxd->dialog);
-
- return sxd;
-}
-
-static
-void
-gnc_sxl_record_size( SchedXactionDialog *sxd )
-{
- gnc_save_window_size(SX_LIST_GCONF_SECTION, GTK_WINDOW(sxd->dialog));
-}
-
-void
-row_select_handler( GtkCList *clist,
- gint row,
- gint col,
- GdkEventButton *event,
- gpointer d )
-{
- SchedXactionDialog *sxd;
- SchedXaction *sx;
- GtkWidget *widget;
-
- sxd = (SchedXactionDialog*)d;
-
- widget = glade_xml_get_widget( sxd->gxml, SX_LIST_EDIT_BUTTON );
- gtk_widget_set_sensitive(widget, TRUE);
- widget = glade_xml_get_widget( sxd->gxml, SX_LIST_DELETE_BUTTON );
- gtk_widget_set_sensitive(widget, TRUE);
-
- if ( event == NULL ) {
- /* it could be a keypress */
- return;
- }
-
- switch ( event->type ) {
- case GDK_2BUTTON_PRESS:
- sx = (SchedXaction*)gtk_clist_get_row_data( clist, row );
- gnc_ui_scheduled_xaction_editor_dialog_create( sxd, sx, FALSE );
- break;
- default:
- /* noop */
- break;
- }
-}
-
-void
-row_unselect_handler( GtkCList *clist,
- gint row,
- gint col,
- GdkEventButton *event,
- gpointer d )
-{
- SchedXactionDialog *sxd;
- GtkWidget *widget;
-
- sxd = (SchedXactionDialog*)d;
-
- widget = glade_xml_get_widget( sxd->gxml, SX_LIST_EDIT_BUTTON );
- gtk_widget_set_sensitive(widget, FALSE);
- widget = glade_xml_get_widget( sxd->gxml, SX_LIST_DELETE_BUTTON );
- gtk_widget_set_sensitive(widget, FALSE);
-}
-
-static
-void
-schedXact_populate( SchedXactionDialog *sxd )
-{
- GList *sxList;
- GtkCList *sx_clist;
- int i;
-
- sxList = gnc_book_get_schedxactions( gnc_get_current_book() );
- g_list_foreach( sxList, putSchedXactionInDialog, sxd );
-
- sx_clist = GTK_CLIST( glade_xml_get_widget( sxd->gxml,
- SX_LIST ) );
- for ( i=0; i<3; i++ ) {
- gtk_clist_set_column_auto_resize( sx_clist, i, TRUE );
- }
-}
-
-static
-gint
-sxed_close_event( GtkDialog *dlg, gpointer ud )
-{
- SchedXactionEditorDialog *sxed = (SchedXactionEditorDialog*)ud;
-
- /* We've already processed the SX, likely because of "ok" being
- * clicked. */
- if ( sxed->sx == NULL ) {
- return FALSE;
- }
-
- if ( ! sxed_confirmed_cancel( sxed ) ) {
- return TRUE;
- }
- return FALSE;
-}
-
-static
-void
-gnc_sxed_get_widgets( SchedXactionEditorDialog *sxed )
-{
- GtkWidget *w;
-
- w = glade_xml_get_widget( sxed->gxml, SXED_NAME_ENTRY );
- sxed->nameEntry = GTK_EDITABLE(w);
- w = glade_xml_get_widget( sxed->gxml, SXED_LAST_OCCUR_LABEL );
- sxed->lastOccurLabel = GTK_LABEL(w);
- w = glade_xml_get_widget( sxed->gxml, AUTOCREATE_OPT );
- sxed->autocreateOpt = GTK_TOGGLE_BUTTON(w);
- w = glade_xml_get_widget( sxed->gxml, NOTIFY_OPT );
- sxed->notifyOpt = GTK_TOGGLE_BUTTON(w);
- w = glade_xml_get_widget( sxed->gxml, ADVANCE_OPT );
- sxed->advanceOpt = GTK_TOGGLE_BUTTON(w);
- w = glade_xml_get_widget( sxed->gxml, ADVANCE_DAYS_SPIN );
- sxed->advanceSpin = GTK_SPIN_BUTTON(w);
- w = glade_xml_get_widget( sxed->gxml, REMIND_OPT );
- sxed->remindOpt = GTK_TOGGLE_BUTTON(w);
- w = glade_xml_get_widget( sxed->gxml, REMIND_DAYS_SPIN );
- sxed->remindSpin = GTK_SPIN_BUTTON(w);
-
- w = glade_xml_get_widget( sxed->gxml, "rb_enddate" );
- sxed->optEndDate = GTK_TOGGLE_BUTTON(w);
-
- w = glade_xml_get_widget( sxed->gxml, "rb_noend" );
- sxed->optEndNone = GTK_TOGGLE_BUTTON(w);
-
- w = glade_xml_get_widget( sxed->gxml, "rb_num_occur" );
- sxed->optEndCount = GTK_TOGGLE_BUTTON(w);
-
- w = glade_xml_get_widget( sxed->gxml, END_SPIN );
- sxed->endCountSpin = GTK_ENTRY(w);
-
- w = glade_xml_get_widget( sxed->gxml, REMAIN_SPIN );
- sxed->endRemainSpin = GTK_ENTRY(w);
-
-}
-
-SchedXactionEditorDialog *
-gnc_ui_scheduled_xaction_editor_dialog_create( SchedXactionDialog *sxd,
- SchedXaction *sx,
- gboolean newSX )
-{
- SchedXactionEditorDialog *sxed;
- GtkWidget *button;
- int i;
- GList *dlgExists = NULL;
-
- static struct widgetSignalCallback {
- char *name;
- char *signal;
- void (*fn)();
- gpointer objectData;
- } widgets[] = {
- { "ok_button", "clicked", editor_ok_button_clicked, NULL },
- { "cancel_button", "clicked", editor_cancel_button_clicked, NULL },
- { "help_button", "clicked", editor_help_button_clicked, NULL },
-
- { "rb_noend", "toggled", endgroup_rb_toggled, GINT_TO_POINTER(END_NEVER_OPTION) },
- { "rb_enddate", "toggled", endgroup_rb_toggled, GINT_TO_POINTER(END_DATE_OPTION) },
- { "rb_num_occur", "toggled", endgroup_rb_toggled, GINT_TO_POINTER(NUM_OCCUR_OPTION) },
-
- { REMAIN_SPIN , "value-changed", sxed_excal_update_adapt, NULL },
-
- { AUTOCREATE_OPT, "toggled", autocreate_toggled, NULL },
- { ADVANCE_OPT, "toggled", advance_toggle, (gpointer)ADVANCE_DAYS_SPIN },
- { REMIND_OPT, "toggled", advance_toggle, (gpointer)REMIND_DAYS_SPIN },
-
- { NULL, NULL, NULL, NULL }
- };
-
- dlgExists = gnc_find_gui_components( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- editor_component_sx_equality,
- sx );
- if ( dlgExists != NULL ) {
- DEBUG( "dialog already exists; using that one." );
- sxed = (SchedXactionEditorDialog*)dlgExists->data;
- gtk_window_present( GTK_WINDOW(sxed->dialog) );
- g_list_free( dlgExists );
- return sxed;
- }
-
- sxed = g_new0( SchedXactionEditorDialog, 1 );
- sxed->gxml = gnc_glade_xml_new( SX_GLADE_FILE,
- SX_EDITOR_GLADE_NAME );
- sxed->dialog = glade_xml_get_widget( sxed->gxml, SX_EDITOR_GLADE_NAME );
-
- sxed->sxd = sxd;
- sxed->sx = sx;
- sxed->newsxP = newSX;
- /* Setup dense-cal local mark storage */
- {
- sxed->cal_marks = g_new0( GDate*, EX_CAL_NUM_MONTHS * 31 );
- for( i=0; i<(EX_CAL_NUM_MONTHS * 31); i++ ) {
- sxed->cal_marks[i] = g_date_new();
- }
- sxed->markId = -1;
- }
-
- /* Setup the end-date GNC widget */
- {
- GtkWidget *endDateBox =
- glade_xml_get_widget( sxed->gxml, END_DATE_BOX );
- sxed->endDateEntry =
- GNC_DATE_EDIT(gnc_date_edit_new( time(NULL),
- FALSE, FALSE ));
- gtk_widget_show(GTK_WIDGET(sxed->endDateEntry));
- g_signal_connect( sxed->endDateEntry,
- "date-changed",
- G_CALLBACK( sxed_excal_update_adapt ),
- sxed );
- gtk_box_pack_start( GTK_BOX(endDateBox),
- GTK_WIDGET(sxed->endDateEntry),
- TRUE, TRUE, 0 );
- }
-
- /* NOTE: this must occur before processing the widget list, defined
- * above, so the gpointers stored with the advance_ and remind_opts
- * are correct. */
- gnc_sxed_get_widgets( sxed );
-
- gnc_register_gui_component( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- NULL, /* no refresh handler */
- sxed_close_handler,
- sxed );
-
- g_signal_connect( sxed->dialog, "close",
- G_CALLBACK(sxed_close_event), sxed );
- g_signal_connect( sxed->dialog, "destroy",
- G_CALLBACK(scheduledxaction_editor_dialog_destroy),
- sxed );
-
- for ( i=0; widgets[i].name != NULL; i++ ) {
- button = glade_xml_get_widget( sxed->gxml, widgets[i].name );
- if ( widgets[i].objectData != NULL ) {
- g_object_set_data( G_OBJECT(button), "whichOneAmI",
- widgets[i].objectData );
- }
- g_signal_connect( button, widgets[i].signal,
- G_CALLBACK( widgets[i].fn ), sxed );
- }
-
- /* For some reason the Glade-specified sensitivity settings are not
- * being honored... ? */
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->notifyOpt), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->advanceSpin), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->remindSpin), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endCountSpin), FALSE );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endRemainSpin), FALSE );
-
- gtk_editable_set_editable( GTK_EDITABLE(sxed->advanceSpin), TRUE );
- gtk_editable_set_editable( GTK_EDITABLE(sxed->remindSpin), TRUE );
-
- /* Allow resize */
- gtk_window_set_resizable (GTK_WINDOW(sxed->dialog), TRUE);
-
- gnc_restore_window_size(SXED_GCONF_SECTION, GTK_WINDOW(sxed->dialog));
-
- /* create the frequency-selection macrowidget and example
- * [dense-]calendar. */
- schedXact_editor_create_freq_sel( sxed );
- /* create the template-transaction ledger window */
- schedXact_editor_create_ledger( sxed );
- /* populate */
- schedXact_editor_populate( sxed );
-
- /* Do not call show_all here. Screws up the gtkuimanager code */
- gtk_widget_show(sxed->dialog);
-
- /* Refresh the cal and the ledger */
- gtk_widget_queue_resize( GTK_WIDGET( sxed->example_cal ) );
- gnc_ledger_display_refresh( sxed->ledger );
-
- return sxed;
-}
-
-static
-void
-gnc_sxed_record_size( SchedXactionEditorDialog *sxed )
-{
- gnc_save_window_size( SXED_GCONF_SECTION, GTK_WINDOW(sxed->dialog) );
-}
-
-static
-void
-schedXact_editor_create_freq_sel( SchedXactionEditorDialog *sxed )
-{
- GtkBox *b;
-
- b = GTK_BOX(glade_xml_get_widget( sxed->gxml, "gncfreq_hbox" ));
- sxed->gncfreq =
- GNC_FREQUENCY( gnc_frequency_new( xaccSchedXactionGetFreqSpec(sxed->sx),
- xaccSchedXactionGetStartDate(sxed->sx) ) );
- g_assert( sxed->gncfreq );
- g_signal_connect( sxed->gncfreq, "changed",
- G_CALLBACK(gnc_sxed_freq_changed),
- sxed );
- gtk_container_add( GTK_CONTAINER(b), GTK_WIDGET(sxed->gncfreq) );
-
- b = GTK_BOX(glade_xml_get_widget( sxed->gxml, "example_cal_hbox" ));
- sxed->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new());
- g_assert( sxed->example_cal );
- gnc_dense_cal_set_num_months( sxed->example_cal, EX_CAL_NUM_MONTHS );
- gnc_dense_cal_set_months_per_col( sxed->example_cal, EX_CAL_MO_PER_COL );
- gtk_container_add( GTK_CONTAINER(b), GTK_WIDGET(sxed->example_cal) );
- gtk_widget_show( GTK_WIDGET(sxed->example_cal) );
-}
-
-static
-void
-schedXact_editor_create_ledger( SchedXactionEditorDialog *sxed )
-{
- SplitRegister *splitreg;
- GtkWidget *main_vbox;
-
- /* Create the ledger */
- /* THREAD-UNSAFE */
- sxed->sxGUIDstr = g_strdup( guid_to_string(
- xaccSchedXactionGetGUID(sxed->sx) ) );
- sxed->ledger = gnc_ledger_display_template_gl( sxed->sxGUIDstr );
- splitreg = gnc_ledger_display_get_split_register( sxed->ledger );
-
- /* First the embedded window */
- main_vbox = glade_xml_get_widget( sxed->gxml, "register_vbox" );
- sxed->embed_window =
- gnc_embedded_window_new("SXWindowActions",
- gnc_sxed_menu_entries,
- gnc_sxed_menu_n_entries,
- "gnc-sxed-window-ui.xml",
- sxed->dialog,
- FALSE, /* no accelerators */
- sxed);
- gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET(sxed->embed_window),
- TRUE, TRUE, 0);
-
- /* Now create the register plugin page. */
- sxed->plugin_page = gnc_plugin_page_register_new_ledger (sxed->ledger);
- gnc_plugin_page_set_ui_description (sxed->plugin_page,
- "gnc-sxed-window-ui-full.xml");
- gnc_plugin_page_register_set_options (sxed->plugin_page,
- NULL, NULL,
- NUM_LEDGER_LINES_DEFAULT, FALSE );
- gnc_embedded_window_open_page (sxed->embed_window, sxed->plugin_page);
-
- /* configure... */
- /* don't use double-line */
- gnc_split_register_config(splitreg,
- splitreg->type, splitreg->style,
- FALSE);
- gnc_split_register_set_auto_complete(splitreg, FALSE);
-
- /* don't show present/future divider [by definition, not necessary] */
- gnc_split_register_show_present_divider( splitreg, FALSE );
-}
-
-static
-void
-schedXact_editor_populate( SchedXactionEditorDialog *sxed )
-{
- char *name;
- time_t tmpDate;
- SplitRegister *splitReg;
- struct tm *tmpTm;
- GDate *gd;
- gint daysInAdvance;
- gboolean autoCreateState, notifyState;
-
- name = xaccSchedXactionGetName(sxed->sx);
- if ( name != NULL ) {
- gtk_entry_set_text( GTK_ENTRY(sxed->nameEntry), name );
- }
- {
- gd = xaccSchedXactionGetLastOccurDate( sxed->sx );
- if ( g_date_valid( gd ) ) {
- gchar dateBuf[ MAX_DATE_LENGTH+1 ];
- qof_print_gdate( dateBuf,MAX_DATE_LENGTH, gd );
- gtk_label_set_text( sxed->lastOccurLabel, dateBuf );
- } else {
- gtk_label_set_text( sxed->lastOccurLabel, _( "(never)" ) );
- }
- gd = NULL;
- }
-
- gd = xaccSchedXactionGetEndDate( sxed->sx );
- if ( g_date_valid( gd ) ) {
- gtk_toggle_button_set_active( sxed->optEndDate, TRUE );
- /* fill in date data. */
- tmpTm = g_new0( struct tm, 1 );
- g_date_to_struct_tm( gd, tmpTm );
- tmpDate = mktime( tmpTm );
- g_free( tmpTm );
- gnc_date_edit_set_time( sxed->endDateEntry, tmpDate );
-
- set_endgroup_toggle_states( sxed, END_DATE );
- } else if ( xaccSchedXactionHasOccurDef( sxed->sx ) ) {
- gint numOccur = xaccSchedXactionGetNumOccur( sxed->sx );
- gint numRemain = xaccSchedXactionGetRemOccur( sxed->sx );
-
- gtk_toggle_button_set_active( sxed->optEndCount, TRUE );
-
- gtk_spin_button_set_value ( GTK_SPIN_BUTTON(sxed->endCountSpin), numOccur );
- gtk_spin_button_set_value ( GTK_SPIN_BUTTON(sxed->endRemainSpin), numRemain );
-
- set_endgroup_toggle_states( sxed, END_OCCUR );
- } else {
- gtk_toggle_button_set_active( sxed->optEndNone, TRUE );
- set_endgroup_toggle_states( sxed, END_NEVER );
- }
-
- /* Do auto-create/notify setup */
- if ( sxed->newsxP ) {
- autoCreateState =
- gnc_gconf_get_bool( SXED_GCONF_SECTION, KEY_CREATE_AUTO, NULL );
- notifyState =
- gnc_gconf_get_bool( SXED_GCONF_SECTION, KEY_NOTIFY, NULL );
- } else {
- xaccSchedXactionGetAutoCreate( sxed->sx,
- &autoCreateState,
- ¬ifyState );
- }
- gtk_toggle_button_set_active( sxed->autocreateOpt, autoCreateState );
- if ( ! autoCreateState ) {
- notifyState = FALSE;
- }
- gtk_toggle_button_set_active( sxed->notifyOpt, notifyState );
-
-
- /* Do days-in-advance-to-create widget[s] setup. */
- if ( sxed->newsxP ) {
- daysInAdvance =
- gnc_gconf_get_float( SXED_GCONF_SECTION, KEY_CREATE_DAYS, NULL );
- } else {
- daysInAdvance =
- xaccSchedXactionGetAdvanceCreation( sxed->sx );
- }
- if ( daysInAdvance != 0 ) {
- gtk_toggle_button_set_active( sxed->advanceOpt, TRUE );
- gtk_spin_button_set_value( sxed->advanceSpin,
- (gfloat)daysInAdvance );
- }
-
- /* Do days-in-advance-to-remind widget[s] setup. */
- if ( sxed->newsxP ) {
- daysInAdvance =
- gnc_gconf_get_float( SXED_GCONF_SECTION, KEY_REMIND_DAYS, NULL );
- } else {
- daysInAdvance =
- xaccSchedXactionGetAdvanceReminder( sxed->sx );
- }
- if ( daysInAdvance != 0 ) {
- gtk_toggle_button_set_active( sxed->remindOpt, TRUE );
- gtk_spin_button_set_value( sxed->remindSpin,
- (gfloat)daysInAdvance );
- }
-
- if ( sxed->newsxP ) {
- gnc_sx_set_instance_count( sxed->sx, 1 );
- }
-
- /* populate the ledger */
- {
- /* create the split list */
- GList *splitList;
-
- splitList = xaccSchedXactionGetSplits( sxed->sx );
- if ( splitList != NULL ) {
- splitReg = gnc_ledger_display_get_split_register
- ( sxed->ledger );
- gnc_split_register_load(splitReg, splitList, NULL );
- } /* otherwise, use the existing stuff. */
- }
-
- /* Update the example cal */
- gnc_sxed_update_cal( sxed );
-}
-
-static
-void
-set_endgroup_toggle_states( SchedXactionEditorDialog *sxed, EndType type )
-{
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endDateEntry), (type == END_DATE) );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endCountSpin), (type == END_OCCUR) );
- gtk_widget_set_sensitive( GTK_WIDGET(sxed->endRemainSpin), (type == END_OCCUR) );
-}
-
-static
-void
-new_button_clicked( GtkButton *b, gpointer d )
-{
- SchedXactionDialog *sxd;
- FreqSpec *fs;
- GDate *gd;
- SchedXaction *tmpSX =
- xaccSchedXactionMalloc( gnc_get_current_book ());
- SchedXactionEditorDialog *sxed;
-
- /* Give decent initial FreqSpec for SX */
- fs = xaccSchedXactionGetFreqSpec( tmpSX );
- gd = g_date_new();
- g_date_set_time_t( gd, time(NULL) );
- xaccFreqSpecSetMonthly( fs, gd, 1 );
- xaccFreqSpecSetUIType ( fs, UIFREQ_MONTHLY );
- g_date_free( gd );
-
- sxd = (SchedXactionDialog*)d;
- sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, tmpSX,
- TRUE /* newSX */ );
-}
-
-static
-void
-edit_button_clicked( GtkButton *b, gpointer d )
-{
- GList *sel;
- GtkCList *cl;
- int row;
- SchedXactionDialog *sxd;
- SchedXaction *sx;
- SchedXactionEditorDialog *sxed;
-
- sxd = (SchedXactionDialog*)d;
- cl = GTK_CLIST(glade_xml_get_widget( sxd->gxml, SX_LIST ));
- for( sel = cl->selection; sel; sel = g_list_next(sel) ) {
- row = GPOINTER_TO_INT(sel->data);
- /* get the clist row for this listitem */
- sx = (SchedXaction*)gtk_clist_get_row_data( cl, row );
- /* get the object UD */
- sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, sx, FALSE );
- }
-}
-
-static void
-delete_button_clicked( GtkButton *b, gpointer d )
-{
- GNCBook *book;
- GtkCList *cl;
- GList *sel, *sxList, *beingEditedList, *l;
- SchedXactionDialog *sxd;
- char *beingEditedMessage =
- _( "The following transactions are presently being edited; "
- "are you sure you want to delete them?" );
- char *confirmMessage =
- _( "Delete the selected Scheduled Transactions?" );
- GString *realConfDelOpenMsg, *realConfDeleteMsg;
- SchedXaction *sx;
- gboolean destroyOpenedResult = FALSE;
-
- sxd = (SchedXactionDialog*)d;
-
- cl = GTK_CLIST(glade_xml_get_widget( sxd->gxml, SX_LIST ));
- sel = cl->selection;
-
- if ( !sel ) {
- return;
- }
-
- realConfDeleteMsg = g_string_new( confirmMessage );
- realConfDelOpenMsg = g_string_new( beingEditedMessage );
- beingEditedList = NULL;
- for ( ; sel ; sel = sel->next ) {
- sx = (SchedXaction*)gtk_clist_get_row_data( cl, GPOINTER_TO_INT(sel->data));
- g_string_append_printf( realConfDeleteMsg, "\n\"%s\"",
- xaccSchedXactionGetName( sx ) );
- if ( (l = gnc_find_gui_components( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
- editor_component_sx_equality,
- sx )) ) {
- beingEditedList = g_list_append( beingEditedList, (gpointer)l );
- g_string_append_printf( realConfDelOpenMsg, "\n\"%s\"",
- xaccSchedXactionGetName( sx ) );
- }
- }
-
- if ( g_list_length( beingEditedList ) > 0 ) {
- /* Figure out the user's disposition [toward the opened
- * transactions], but if it's true, don't act on it until
- * they confirm they actually want to do the deletion
- * generically. If it's false, cleanup and return. */
- if ( ! (destroyOpenedResult =
- gnc_verify_dialog( sxd->dialog, FALSE, "%s",
- realConfDelOpenMsg->str )) ) {
- for ( l = beingEditedList; l; l = l->next ) {
- g_list_free( (GList*)l->data );
- }
- g_list_free( beingEditedList );
- goto cleanupStrings;
- return; /* unreachable, but clearer. */
- }
- }
-
- if ( gnc_verify_dialog( sxd->dialog, FALSE, "%s",
- realConfDeleteMsg->str ) ) {
- /* Close the being-edited transactions. */
- if ( destroyOpenedResult ) {
- GList *component;
- for ( l = beingEditedList; l; l = l->next ) {
- SplitRegister *reg;
- component = (GList*)l->data;
- /* We'd like to force the cancellation of
- * ledger/other changes, here. */
- reg = gnc_ledger_display_get_split_register(
- ((SchedXactionEditorDialog*)component
- ->data)
- ->ledger );
- gnc_split_register_cancel_cursor_trans_changes(
- reg );
- editor_cancel_button_clicked(
- NULL,
- (SchedXactionEditorDialog*)component
- ->data );
- g_list_free( component );
- }
- g_list_free( beingEditedList );
- }
-
- /* Now, actually do the deletions... */
- book = gnc_get_current_book ();
- sxList = gnc_book_get_schedxactions( book );
- for ( sel = cl->selection; sel; sel = sel->next ) {
- SxRuntimeInfo *sxri;
- SxRuntimeInfo **p_sxri = &sxri;
- gpointer unused;
- gboolean foundP;
-
- sx = (SchedXaction*)gtk_clist_get_row_data( cl, GPOINTER_TO_INT(sel->data));
- sxList = g_list_remove( sxList, (gpointer)sx );
- gnc_book_set_schedxactions( book, sxList );
-
- foundP = g_hash_table_lookup_extended( sxd->sxData, sx,
- &unused,
- (gpointer*)p_sxri );
- g_assert( foundP );
- if ( sxri->markTag != -1 ) {
- gnc_dense_cal_mark_remove( sxd->gdcal, sxri->markTag );
- }
- g_hash_table_remove( sxd->sxData, sx );
- xaccSchedXactionFree( sx );
- }
-
- gtk_clist_freeze( cl );
- /* Remove the selected and deleted rows from the clist in
- * reverse order so each index is valid. */
- sel = g_list_copy( cl->selection );
- sel = g_list_reverse( sel );
- gtk_clist_unselect_all( cl );
- for ( ; sel; sel = sel->next ) {
- gtk_clist_remove( cl, GPOINTER_TO_INT(sel->data) );
- }
- g_list_free( sel );
- sel = NULL;
- gtk_clist_thaw( cl );
- }
-
- cleanupStrings:
- g_string_free( realConfDeleteMsg, TRUE );
- g_string_free( realConfDelOpenMsg, TRUE );
-}
-
-static
-void
-endgroup_rb_toggled( GtkButton *b, gpointer d )
-{
- /* figure out which one */
- SchedXactionEditorDialog *sxed;
- gint id;
-
- sxed = (SchedXactionEditorDialog*)d;
- id = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(b), "whichOneAmI" ));
-
- switch (id) {
- case END_NEVER_OPTION:
- set_endgroup_toggle_states( sxed, END_NEVER );
- break;
- case END_DATE_OPTION:
- set_endgroup_toggle_states( sxed, END_DATE );
- break;
- case NUM_OCCUR_OPTION:
- set_endgroup_toggle_states( sxed, END_OCCUR );
- break;
- default:
- g_error( "Unknown id %d", id );
- break;
- }
-
- gnc_sxed_update_cal( sxed );
-}
-
-/**
- * This is a copy of more complex code from dialog-sxsincelast.c. They
- * should probably be combined into a single useful function somewhere.
- **/
-static
-void
-generate_instances( SchedXaction *sx,
- GDate *end, GList **instanceList )
-{
- GDate gd, *gdToReturn;
- void *seqStateData;
-
- /* Process valid next instances */
- seqStateData = gnc_sx_create_temporal_state( sx );
- gd = xaccSchedXactionGetNextInstance( sx, seqStateData );
- while ( g_date_valid(&gd)
- && g_date_compare( &gd, end ) <= 0 ) {
-
- gdToReturn = g_date_new();
- *gdToReturn = gd;
- *instanceList = g_list_append( *instanceList, gdToReturn );
-
- gnc_sx_incr_temporal_state( sx, seqStateData );
- gd = xaccSchedXactionGetInstanceAfter( sx, &gd, seqStateData );
- }
- gnc_sx_destroy_temporal_state( seqStateData );
- seqStateData = NULL;
-}
-
-static
-void
-_gnc_sxd_free_dates( gpointer data, gpointer user_data )
-{
- g_date_free( (GDate*)data );
-}
-
-static
-SxRuntimeInfo*
-_new_sx_runtime_info( SchedXaction *sx )
-{
- SxRuntimeInfo *sxri;
-
- sxri = g_new0( SxRuntimeInfo, 1 );
- sxri->sx = sx;
- sxri->row = -1;
- sxri->markTag = -1;
- return sxri;
-}
-
-static
-void
-putSchedXactionInDialog( gpointer data, gpointer user_data )
-{
- SchedXaction *sx;
- SchedXactionDialog *sxd;
- GtkCList *clist;
- char *text[3];
- GString *freqStr;
- GString *nextDate;
- int i;
- GDate *nextInstDate = NULL, *calEndDate;
- int instArraySize;
- GDate **instArray;
- GList *instList;
- gpointer unused;
- SxRuntimeInfo *sxri = NULL;
- SxRuntimeInfo **p_sxri = &sxri;
- gboolean foundP;
- gint gdcMarkTag;
- gint row;
-
- sx = (SchedXaction*)data;
- sxd = (SchedXactionDialog*)user_data;
-
- freqStr = g_string_new( "" );
- nextDate = g_string_new( "" );
-
- xaccFreqSpecGetFreqStr( xaccSchedXactionGetFreqSpec(sx), freqStr );
-
- calEndDate = g_date_new_dmy( 1,
- gnc_dense_cal_get_month(sxd->gdcal),
- gnc_dense_cal_get_year(sxd->gdcal) );
- g_date_add_months( calEndDate,
- gnc_dense_cal_get_num_months(sxd->gdcal) );
-
- instList = NULL;
- generate_instances( sx, calEndDate, &instList );
- g_date_free( calEndDate );
-
- if ( instList == NULL ) {
- /* This was a bug [#90326]; while we do want to generate
- * instances within the visible calendar range, we also want
- * to generate the first, next SX instance regardless of the
- * calendar range. Thus, if the generate_instances above
- * returns nothing, double-check with the SX. */
- nextInstDate = g_date_new();
- *nextInstDate = xaccSchedXactionGetNextInstance( sx, NULL );
- if ( g_date_valid( nextInstDate ) ) {
- instList = g_list_append( instList,
- (gpointer)nextInstDate );
- }
- }
-
- if ( instList == NULL ) {
- g_string_printf( nextDate, _("Not scheduled") );
- } else {
- char tmpBuf[ MAX_DATE_LENGTH+1 ];
- char dowBuf[ 25 ]; /* <- FIXME: appropriate length? */
- nextInstDate = (GDate*)instList->data;
- qof_print_gdate( tmpBuf, MAX_DATE_LENGTH, nextInstDate );
- g_date_strftime( dowBuf, 25, "%A", nextInstDate );
- g_string_printf( nextDate, "%s (%s)", tmpBuf, dowBuf );
- }
-
- /* Add markings to GncDenseCal */
- gdcMarkTag = -1;
- if ( instList != NULL ) {
- GList *l;
- FreqSpec *fs;
- GString *freqDesc;
-
- instArraySize = g_list_length( instList );
- instArray = g_new0( GDate*, instArraySize );
- for ( i=0, l=instList; l; l = l->next ) {
- instArray[i++] = (GDate*)l->data;
- }
- freqDesc = g_string_sized_new(64);
- fs = xaccSchedXactionGetFreqSpec(sx);
- xaccFreqSpecGetFreqStr(fs, freqDesc );
- gdcMarkTag = gnc_dense_cal_mark( sxd->gdcal,
- instArraySize, instArray,
- xaccSchedXactionGetName(sx),
- freqDesc->str );
- g_string_free( freqDesc, TRUE );
- g_free( instArray );
- g_list_foreach( instList, _gnc_sxd_free_dates, NULL );
- g_list_free( instList );
- nextInstDate = NULL;
- }
-
- foundP = g_hash_table_lookup_extended( sxd->sxData,
- (gpointer)sx,
- &unused,
- (gpointer*)p_sxri );
- if ( ! foundP )
- {
- // new SX -- create runtime storage for it
- sxri = _new_sx_runtime_info( sx );
- sxri->markTag = gdcMarkTag;
- }
- else
- {
- // existing SX; remove it's
- if ( sxri->markTag != -1 ) {
- gnc_dense_cal_mark_remove( sxd->gdcal, sxri->markTag );
- sxri->markTag = gdcMarkTag;
- }
- }
-
-
- text[0] = xaccSchedXactionGetName( sx );
- text[1] = freqStr->str;
- text[2] = nextDate->str;
-
- clist = GTK_CLIST( glade_xml_get_widget( sxd->gxml, SX_LIST ) );
- gtk_clist_freeze( clist );
-
- row = gtk_clist_find_row_from_data( clist, (gpointer)sx );
- if ( sxri->row == -1 ) {
- /* new item to be inserted */
- sxri->row = gtk_clist_append( clist, text );
- gtk_clist_set_row_data( clist, sxri->row, sx );
- } else {
- for ( i=0; i<3; i++ ) {
- gtk_clist_set_text( clist, sxri->row, i, text[i] );
- }
- }
- gtk_clist_sort( clist );
- gtk_clist_thaw( clist );
- g_hash_table_insert( sxd->sxData, (gpointer)sx, (gpointer)sxri );
- sxri = NULL;
-
- g_string_free( freqStr, TRUE );
- g_string_free( nextDate, TRUE );
-}
-
-/********************************************************************\
- * gnc_register_check_close *
- * *
- * Args: regData - the data struct for this register *
- * Return: none *
-\********************************************************************/
-static void
-gnc_sxed_reg_check_close(SchedXactionEditorDialog *sxed)
-{
- gboolean pending_changes;
- SplitRegister *reg;
- const char *message =
- _("The current template transaction "
- "has been changed. "
- "Would you like to record the changes?");
-
- reg = gnc_ledger_display_get_split_register (sxed->ledger);
- pending_changes = gnc_split_register_changed (reg);
- if (!pending_changes) {
- return;
- }
-
- if (gnc_verify_dialog(sxed->dialog, TRUE, message)) {
- Transaction *trans;
- trans = gnc_split_register_get_current_trans( reg );
- if ( !gnc_split_register_save( reg, TRUE ) )
- return;
-
- gnc_split_register_redraw( reg );
- } else {
- gnc_split_register_cancel_cursor_trans_changes (reg);
- }
-}
-
-static gboolean
-editor_component_sx_equality( gpointer find_data,
- gpointer user_data )
-{
- return ( (SchedXaction*)find_data
- == ((SchedXactionEditorDialog*)user_data)->sx );
-}
-
-static
-void
-gnc_sxd_row_click_handler( GtkCList *clist,
- gint col,
- gpointer ud )
-{
- SchedXactionDialog *sxd = (SchedXactionDialog*)ud;
-
- if ( col == sxd->currentSortCol ) {
- g_assert( sxd->currentSortType == GTK_SORT_ASCENDING
- || sxd->currentSortType == GTK_SORT_DESCENDING );
- switch ( sxd->currentSortType ) {
- case GTK_SORT_ASCENDING:
- sxd->currentSortType = GTK_SORT_DESCENDING;
- break;
- case GTK_SORT_DESCENDING:
- sxd->currentSortType = GTK_SORT_ASCENDING;
- break;
- default:
- PERR( "Unknown current sort type %d",
- sxd->currentSortType );
- }
- /* By defn, the current sort_compare method is correct. */
- gtk_clist_set_sort_column( clist, col );
- gtk_clist_set_sort_type( clist, sxd->currentSortType );
- gtk_clist_sort( clist );
- return;
- }
-
- sxd->currentSortCol = col;
- gnc_sxd_set_sort_compare( clist, sxd->currentSortCol );
- sxd->currentSortType = GTK_SORT_ASCENDING;
- gtk_clist_set_sort_column( clist, sxd->currentSortCol );
- gtk_clist_set_sort_type( clist, sxd->currentSortType );
- gtk_clist_sort( clist );
-}
-
-static
-gint
-gnc_sxd_clist_compare_sx_name( GtkCList *cl, gconstpointer a, gconstpointer b )
-{
- SchedXaction *sxa, *sxb;
-
- sxa = (SchedXaction*)(((GtkCListRow*)a)->data);
- sxb = (SchedXaction*)(((GtkCListRow*)b)->data);
- g_assert( sxa || sxb );
- if ( !sxa ) {
- return 1;
- }
- if ( !sxb ) {
- return -1;
- }
- return strcmp( xaccSchedXactionGetName( sxa ),
- xaccSchedXactionGetName( sxb ) );
-}
-
-static
-gint
-gnc_sxd_clist_compare_sx_freq( GtkCList *cl,
- gconstpointer a,
- gconstpointer b )
-{
- SchedXaction *sxa, *sxb;
-
- g_assert( a || b );
- if ( !a ) return 1;
- if ( !b ) return -1;
- sxa = (SchedXaction*)((GtkCListRow*)a)->data;
- sxb = (SchedXaction*)((GtkCListRow*)b)->data;
- g_assert( sxa || sxb );
- if ( !sxa ) return 1;
- if ( !sxb ) return -1;
- return gnc_freq_spec_compare( xaccSchedXactionGetFreqSpec( sxa ),
- xaccSchedXactionGetFreqSpec( sxb ) );
-}
-
-static
-gint
-gnc_sxd_clist_compare_sx_next_occur( GtkCList *cl,
- gconstpointer a,
- gconstpointer b )
-{
- SchedXaction *sxa, *sxb;
- GDate gda, gdb;
-
- sxa = (SchedXaction*)((GtkCListRow*)a)->data;
- sxb = (SchedXaction*)((GtkCListRow*)b)->data;
-
- g_assert( sxa || sxb );
- if ( !sxa ) {
- return 1;
- }
- if ( !sxb ) {
- return -1;
- }
- g_assert( sxa && sxb );
-
- gda = xaccSchedXactionGetNextInstance( sxa, NULL );
- gdb = xaccSchedXactionGetNextInstance( sxb, NULL );
-
- if ( ! ( g_date_valid(&gda) && g_date_valid(&gdb) ) ) {
- return 0;
- }
- if ( !g_date_valid(&gda) ) {
- return 1;
- }
- if ( !g_date_valid(&gdb) ) {
- return -1;
- }
- return g_date_compare( &gda, &gdb );
-}
-
-
-static
-void
-gnc_sxd_set_sort_compare( GtkCList *cl, gint col )
-{
- gint (*fn)( GtkCList *, gconstpointer, gconstpointer );
-
- fn = NULL;
- switch ( col ) {
- case 0: /* SX name */
- fn = gnc_sxd_clist_compare_sx_name;
- break;
- case 1: /* SX frequency */
- fn = gnc_sxd_clist_compare_sx_freq;
- break;
- case 2: /* next-occur date */
- fn = gnc_sxd_clist_compare_sx_next_occur;
- break;
- default: /* ?? */
- DEBUG( "invalid column value %d", col );
- g_assert( FALSE );
- }
- gtk_clist_set_compare_func( cl, NULL );
- gtk_clist_set_compare_func( cl, fn );
-}
-
-typedef enum { NO_END, DATE_END, COUNT_END } END_TYPE;
-
-static
-void
-gnc_sxed_update_cal( SchedXactionEditorDialog *sxed )
-{
- int i;
- FreqSpec *fs;
- GDate d;
- END_TYPE endType;
- GDate endDate;
- int numRemain;
-
- endType = NO_END;
- numRemain = -1;
- /* figure out the end restriction */
- if ( gtk_toggle_button_get_active( sxed->optEndDate ) ) {
- time_t tt;
- struct tm *tmpTm;
- endType = DATE_END;
- tt = gnc_date_edit_get_date( sxed->endDateEntry );
- tmpTm = g_new0( struct tm, 1 );
- *tmpTm = *(localtime( &tt ));
- g_date_set_day( &endDate, tmpTm->tm_mday );
- g_date_set_month( &endDate, tmpTm->tm_mon+1 );
- g_date_set_year( &endDate, tmpTm->tm_year + 1900 );
- g_free( tmpTm );
- } else if ( gtk_toggle_button_get_active( sxed->optEndNone ) ) {
- endType = NO_END;
- } else if ( gtk_toggle_button_get_active( sxed->optEndCount ) ) {
- endType = COUNT_END;
- numRemain =
- gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(sxed->endRemainSpin) );
-
- } else {
- g_assert( FALSE );
- }
-
- if ( sxed->markId != -1 ) {
- gnc_dense_cal_mark_remove( sxed->example_cal, sxed->markId );
- sxed->markId = -1;
- }
-
- fs = xaccFreqSpecMalloc( gnc_get_current_book() );
- gnc_frequency_save_state( sxed->gncfreq, fs, &d );
- g_date_subtract_days( &d, 1 );
- xaccFreqSpecGetNextInstance( fs, &d, &d );
-
- /* Deal with the fact that this SX may have been run before [the
- * calendar should only show upcoming instances]... */
- {
- GDate *lastInst;
-
- lastInst = xaccSchedXactionGetLastOccurDate( sxed->sx );
- if ( g_date_valid( lastInst )
- && g_date_valid( &d )
- && g_date_compare( lastInst, &d ) != 0 ) {
- d = *lastInst;
- xaccFreqSpecGetNextInstance( fs, &d, &d );
- }
- }
-
- if ( !g_date_valid( &d ) ) {
- /* Nothing to do. */
- xaccFreqSpecFree( fs );
- return;
- }
-
- i = 0;
- gnc_dense_cal_set_month( sxed->example_cal, g_date_get_month( &d ) );
- gnc_dense_cal_set_year( sxed->example_cal, g_date_get_year( &d ) );
- while ( (i < EX_CAL_NUM_MONTHS * 31)
- && g_date_valid( &d )
- /* Restrict based on end date */
- && ( endType == NO_END
- || ( endType == DATE_END
- && g_date_compare( &d, &endDate ) <= 0 )
- || ( endType == COUNT_END
- && i < numRemain ) ) ) {
- *(sxed->cal_marks[i++]) = d;
- xaccFreqSpecGetNextInstance( fs, &d, &d );
- }
- if ( i <= 0 ) {
- xaccFreqSpecFree( fs );
- return;
- }
-
- {
- gchar *name;
- GString *info;
-
- name = gtk_editable_get_chars( sxed->nameEntry, 0, -1 );
- if ( strlen( name ) == 0 ) {
- g_free(name);
- name = NULL;
- }
- info = g_string_sized_new( 16 );
- xaccFreqSpecGetFreqStr( fs, info );
- sxed->markId = gnc_dense_cal_mark( sxed->example_cal, i,
- sxed->cal_marks,
- name, info->str );
- gtk_widget_queue_draw( GTK_WIDGET( sxed->example_cal ) );
-
- g_string_free( info, TRUE );
- if ( name != NULL )
- {
- g_free( name );
- }
- }
-
- xaccFreqSpecFree( fs );
-}
-
-static
-void
-gnc_sxed_freq_changed( GNCFrequency *gf, gpointer ud )
-{
- gnc_sxed_update_cal( (SchedXactionEditorDialog*)ud );
-}
-
-static
-void
-sxed_excal_update_adapt( GtkObject *o, gpointer ud )
-{
- gnc_sxed_update_cal( (SchedXactionEditorDialog*)ud );
-}
-
-void on_sx_check_toggled (GtkWidget *togglebutton, gpointer user_data);
-
-void
-on_sx_check_toggled (GtkWidget *togglebutton,
- gpointer user_data)
-{
- GtkWidget *widget;
- gboolean create; // , notify;
-
- /* The gnc_glade_lookup_widget() function works because all of these
- * widgets come from the same glade file. */
- widget = gnc_glade_lookup_widget(togglebutton,
- "gconf/dialogs/scheduled_trans/transaction_editor/create_auto");
- create = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- widget = gnc_glade_lookup_widget(togglebutton,
- "gconf/dialogs/scheduled_trans/transaction_editor/notify");
- gtk_widget_set_sensitive(widget, create);
-}
-
-typedef struct _acct_deletion_handler_data
-{
- GList *affected_sxes;
- GtkWidget *dialog;
-} acct_deletion_handler_data;
-
-static void
-_open_editors(GtkDialog *dialog, gint response_code, gpointer data)
-{
- acct_deletion_handler_data *adhd = (acct_deletion_handler_data *)data;
- gtk_widget_hide_all(adhd->dialog);
- {
- GList *sx_iter;
- for (sx_iter = adhd->affected_sxes; sx_iter; sx_iter = sx_iter->next)
- {
- gnc_ui_scheduled_xaction_editor_dialog_create(NULL,
- (SchedXaction*)sx_iter->data,
- FALSE);
- }
- }
- g_list_free(adhd->affected_sxes);
- gtk_widget_destroy(GTK_WIDGET(adhd->dialog));
- g_free(adhd);
-}
-
-static void
-_sx_engine_event_handler(QofEntity *ent, QofEventId event_type, gpointer user_data, gpointer evt_data)
-{
- Account *acct;
- QofBook *book;
- GList *affected_sxes;
-
- if (!(event_type & QOF_EVENT_DESTROY))
- return;
- if (!GNC_IS_ACCOUNT(ent))
- return;
- acct = GNC_ACCOUNT(ent);
- book = qof_instance_get_book(QOF_INSTANCE(acct));
- affected_sxes = gnc_sx_get_sxes_referencing_account(book, acct);
-
- if (g_list_length(affected_sxes) == 0)
- return;
-
- {
- GList *sx_iter;
- acct_deletion_handler_data *data;
- GladeXML *xml;
- GtkWidget *dialog;
- GtkListStore *name_list;
- GtkTreeView *list;
- GtkTreeViewColumn *name_column;
- GtkCellRenderer *renderer;
-
- xml = gnc_glade_xml_new("sched-xact.glade", "Account Deletion");
- dialog = glade_xml_get_widget(xml, "Account Deletion");
- list = GTK_TREE_VIEW(glade_xml_get_widget(xml, "sx_list"));
-
- data = (acct_deletion_handler_data*)g_new0(acct_deletion_handler_data, 1);
- data->dialog = dialog;
- data->affected_sxes = affected_sxes;
- name_list = gtk_list_store_new(1, G_TYPE_STRING);
- for (sx_iter = affected_sxes; sx_iter != NULL; sx_iter = sx_iter->next)
- {
- SchedXaction *sx;
- GtkTreeIter iter;
- gchar *sx_name;
-
- sx = (SchedXaction*)sx_iter->data;
- sx_name = xaccSchedXactionGetName(sx);
- gtk_list_store_append(name_list, &iter);
- gtk_list_store_set(name_list, &iter, 0, sx_name, -1);
- }
- gtk_tree_view_set_model(list, GTK_TREE_MODEL(name_list));
- g_object_unref(G_OBJECT(name_list));
-
- renderer = gtk_cell_renderer_text_new();
- name_column = gtk_tree_view_column_new_with_attributes(_("Name"),
- renderer,
- "text", 0, NULL);
- gtk_tree_view_append_column(list, name_column);
-
- g_signal_connect(G_OBJECT(dialog), "response",
- G_CALLBACK(_open_editors), data);
-
- gtk_widget_show_all(GTK_WIDGET(dialog));
- }
-}
-
-void
-gnc_ui_sx_initialize (void)
-{
- _sx_engine_event_handler_id = qof_event_register_handler(_sx_engine_event_handler, NULL);
-
- gnc_hook_add_dangler(HOOK_BOOK_OPENED,
- (GFunc)gnc_sx_sxsincelast_book_opened, NULL);
- gnc_preferences_add_page (SX_GLADE_FILE,
- "sx_prefs",
- _("Scheduled Transactions"));
-}
Deleted: gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-scheduledxaction.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,67 +0,0 @@
-/********************************************************************\
- * dialog-scheduledxaction.h : dialogs for scheduled transactions *
- * Copyright (C) 2001 Joshua Sled <jsled at asynchronous.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 *
-\********************************************************************/
-
-#ifndef DIALOG_SCHEDULEDXACTION_H
-#define DIALOG_SCHEDULEDXACTION_H
-
-#include "SchedXaction.h"
-
-#define DIALOG_SCHEDXACTION_CM_CLASS "dialog-scheduledtransactions"
-#define DIALOG_SCHEDXACTION_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor"
-
-#define SXED_GCONF_SECTION "dialogs/scheduled_trans/transaction_editor"
-#define KEY_CREATE_AUTO "create_auto"
-#define KEY_NOTIFY "notify"
-#define KEY_CREATE_DAYS "create_days"
-#define KEY_REMIND_DAYS "remind_days"
-
-struct _SchedXactionDialog;
-struct _SchedXactionEditorDialog;
-
-typedef struct _SchedXactionDialog SchedXactionDialog;
-typedef struct _SchedXactionEditorDialog SchedXactionEditorDialog;
-
-SchedXactionDialog * gnc_ui_scheduled_xaction_dialog_create(void);
-void gnc_ui_scheduled_xaction_dialog_destroy(SchedXactionDialog *sxd);
-#ifdef __GTK_CLIST_H__
-void row_select_handler( GtkCList *clist, gint row, gint col,
- GdkEventButton *event, gpointer d );
-void row_unselect_handler( GtkCList *clist, gint row, gint col,
- GdkEventButton *event, gpointer d );
-#endif
-
-void gnc_sxd_list_refresh( SchedXactionDialog *sxd );
-
-SchedXactionEditorDialog *
-gnc_ui_scheduled_xaction_editor_dialog_create( SchedXactionDialog *sxd,
- SchedXaction *sx,
- gboolean newSX );
-
-void gnc_ui_scheduled_xaction_editor_dialog_destroy( SchedXactionEditorDialog *sxd );
-
-/**
- * Sets up a book opened hook. The function called may open a "since
- * last run" dialog based upon the user's preferences.
- **/
-void gnc_ui_sx_initialize (void);
-
-#endif
Copied: gnucash/branches/remove-group2/src/gnome/dialog-sx-editor.c (from rev 15563, gnucash/trunk/src/gnome/dialog-sx-editor.c)
Copied: gnucash/branches/remove-group2/src/gnome/dialog-sx-editor.h (from rev 15563, gnucash/trunk/src/gnome/dialog-sx-editor.h)
Modified: gnucash/branches/remove-group2/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-sx-from-trans.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-sx-from-trans.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,26 +25,25 @@
#include "config.h"
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-#include "glib-compat.h"
-
-#include "gnc-engine.h"
-#include "SX-book.h"
-#include "SX-book-p.h"
-#include "SX-ttinfo.h"
-#include "SchedXaction.h"
-#include "gnc-component-manager.h"
-#include "dialog-scheduledxaction.h"
+#include "dialog-sx-editor.h"
#include "dialog-sx-from-trans.h"
#include "dialog-utils.h"
+#include "glib-compat.h"
+#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
-#include "qof.h"
+#include "gnc-dense-cal-store.h"
+#include "gnc-dense-cal.h"
+#include "gnc-engine.h"
#include "gnc-gconf-utils.h"
-#include "gnc-ui.h"
#include "gnc-ui-util.h"
-#include "gnc-dense-cal.h"
+#include "gnc-ui.h"
+#include "qof.h"
+#include "SchedXaction.h"
+#include "SX-book.h"
+#include "SX-ttinfo.h"
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
#define SX_GLADE_FILE "sched-xact.glade"
#define SXFTD_DIALOG_GLADE_NAME "sx_from_real_trans"
@@ -71,18 +70,18 @@
#define SXFTD_RESPONSE_ADVANCED 100 /* 'Advanced' button response code */
-static QofLogModule log_module = GNC_MOD_SX;
+static QofLogModule log_module = GNC_MOD_GUI_SX;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN GNC_MOD_GUI_SX
+
static void sxftd_freq_combo_changed( GtkWidget *w, gpointer user_data );
static void gnc_sx_trans_window_response_cb(GtkDialog *dialog, gint response, gpointer data);
static void sxftd_destroy( GtkWidget *w, gpointer user_data );
-typedef enum { NEVER_END, END_ON_DATE, END_AFTER_N_OCCS, BAD_END } endType;
-
typedef enum { FREQ_DAILY = 0, /* I know the =0 is redundant, but I'm using
- * the numeric equivalences explicitly here
- */
+ * the numeric equivalences explicitly here */
FREQ_WEEKLY,
FREQ_BIWEEKLY,
FREQ_MONTHLY,
@@ -97,11 +96,8 @@
Transaction *trans;
SchedXaction *sx;
+ GncDenseCalStore *dense_cal_model;
GncDenseCal *example_cal;
- /** Storage for the maximum possible number of marks we could put on the
- * calendar. */
- GDate **cal_marks;
- gint mark_id;
GNCDateEdit *startDateGDE, *endDateGDE;
@@ -109,7 +105,7 @@
typedef struct
{
- endType type;
+ gdcs_end_type type;
GDate end_date;
guint n_occurrences;
} getEndTuple;
@@ -117,9 +113,6 @@
static void sxftd_update_example_cal( SXFromTransInfo *sxfti );
static void sxftd_update_excal_adapt( GObject *o, gpointer ud );
-/* Stolen from jsled - nice and neat, actually (if a little light on
- * for typechecking, but we'll be careful) . . .
- */
typedef struct
{
gchar *name;
@@ -127,11 +120,9 @@
void (*handlerFn)();
} widgetSignalHandlerTuple;
-
static void sxftd_ok_clicked(SXFromTransInfo *sxfti);
static void sxftd_advanced_clicked(SXFromTransInfo *sxfti);
-
static void
sxfti_attach_callbacks(SXFromTransInfo *sxfti)
{
@@ -144,7 +135,6 @@
{ SXFTD_END_ON_DATE_BUTTON, "clicked", sxftd_update_excal_adapt },
{ SXFTD_N_OCCURRENCES_BUTTON, "clicked", sxftd_update_excal_adapt },
{ SXFTD_N_OCCURRENCES_ENTRY, "changed", sxftd_update_excal_adapt },
-
{ NULL, NULL, NULL }
};
@@ -339,9 +329,8 @@
break;
default:
- PERR("Nonexistent frequency selected. This is a bug.");
- g_assert( FALSE );
- break;
+ g_critical("nonexistent frequency selected");
+ break;
}
}
@@ -370,20 +359,19 @@
/* Setup the example calendar and related data structures. */
{
- int i;
+ int num_marks = SXFTD_EXCAL_NUM_MONTHS * 31;
w = GTK_WIDGET(glade_xml_get_widget( sxfti->gxml, SXFTD_EX_CAL_FRAME ));
- sxfti->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new());
- g_assert( sxfti->example_cal );
+ sxfti->dense_cal_model = gnc_dense_cal_store_new(num_marks);
+ sxfti->example_cal = GNC_DENSE_CAL(gnc_dense_cal_new_with_model(GNC_DENSE_CAL_MODEL(sxfti->dense_cal_model)));
+ // gobject-2.10: g_object_ref_sink(sxfti->example_cal);
+ g_object_ref(G_OBJECT(sxfti->example_cal));
+ gtk_object_sink(GTK_OBJECT(sxfti->example_cal));
+
+ g_assert(sxfti->example_cal);
gnc_dense_cal_set_num_months( sxfti->example_cal, SXFTD_EXCAL_NUM_MONTHS );
gnc_dense_cal_set_months_per_col( sxfti->example_cal, SXFTD_EXCAL_MONTHS_PER_COL );
gtk_container_add( GTK_CONTAINER(w), GTK_WIDGET(sxfti->example_cal) );
-
- sxfti->mark_id = -1;
- sxfti->cal_marks = g_new0( GDate*, (SXFTD_EXCAL_NUM_MONTHS * 31) );
- for ( i=0; i < SXFTD_EXCAL_NUM_MONTHS * 31; i++ ) {
- sxfti->cal_marks[i] = g_date_new();
- }
}
/* Setup the start and end dates as GNCDateEdits */
@@ -507,9 +495,9 @@
gnc_sx_set_instance_count( sx, 1 );
/* Set the autocreate, days-in-advance and remind-in-advance values from
- options. */
- {
- gboolean autoCreateState, notifyState;
+ * options. */
+ {
+ gboolean autoCreateState, notifyState;
gint daysInAdvance;
autoCreateState =
@@ -551,31 +539,24 @@
sxftd_ok_clicked(SXFromTransInfo *sxfti)
{
QofBook *book;
- GList *sx_list;
+ SchedXactions *sxes;
guint sx_error = sxftd_compute_sx(sxfti);
if (sx_error != 0
- && sx_error != SXFTD_ERRNO_UNBALANCED_XACTION) {
- PERR( "Error in sxftd_compute_sx after ok_clicked [%d]", sx_error );
+ && sx_error != SXFTD_ERRNO_UNBALANCED_XACTION)
+ {
+ g_critical("sxftd_compute_sx after ok_clicked [%d]", sx_error);
}
- else {
- SchedXactionDialog *sxd;
-
+ else
+ {
if ( sx_error == SXFTD_ERRNO_UNBALANCED_XACTION ) {
gnc_error_dialog( gnc_ui_get_toplevel(),
_( "The Scheduled Transaction is unbalanced. "
"You are strongly encouraged to correct this situation." ) );
}
book = gnc_get_current_book ();
- sx_list = gnc_book_get_schedxactions(book);
- sx_list = g_list_append(sx_list, sxfti->sx);
- gnc_book_set_schedxactions(book, sx_list);
- sxd = (SchedXactionDialog*)
- gnc_find_first_gui_component(
- DIALOG_SCHEDXACTION_CM_CLASS, NULL, NULL );
- if ( sxd ) {
- gnc_sxd_list_refresh( sxd );
- }
+ sxes = gnc_book_get_schedxactions(book);
+ gnc_sxes_add_sx(sxes, sxfti->sx);
}
sxftd_close(sxfti, FALSE);
@@ -617,27 +598,24 @@
sxftd_advanced_clicked(SXFromTransInfo *sxfti)
{
guint sx_error = sxftd_compute_sx(sxfti);
- SchedXactionDialog *adv_dlg;
- SchedXactionEditorDialog *adv_edit_dlg;
+ GncSxEditorDialog *adv_edit_dlg;
GMainContext *context;
if ( sx_error != 0
&& sx_error != SXFTD_ERRNO_UNBALANCED_XACTION )
{
- // unbalanced-xaction is "okay", since this is also checked for by
- // the advanced editor.
- PWARN( "something bad happened in sxftd_compute_sx [%d]", sx_error );
- return;
+ // unbalanced-xaction is "okay", since this is also checked for by
+ // the advanced editor.
+ g_warning("something bad happened in sxftd_compute_sx [%d]", sx_error);
+ return;
}
gtk_widget_hide( sxfti->dialog );
/* force a gui update. */
context = g_main_context_default();
while (g_main_context_iteration(context, FALSE));
- adv_dlg = gnc_ui_scheduled_xaction_dialog_create();
adv_edit_dlg =
- gnc_ui_scheduled_xaction_editor_dialog_create(adv_dlg,
- sxfti->sx,
+ gnc_ui_scheduled_xaction_editor_dialog_create(sxfti->sx,
TRUE /* newSX */);
/* close ourself, since advanced editing entails us, and there are sync
* issues otherwise. */
@@ -647,28 +625,21 @@
static void
sxftd_destroy( GtkWidget *w, gpointer user_data )
{
- int i;
SXFromTransInfo *sxfti = (SXFromTransInfo*)user_data;
- for ( i=0; i<SXFTD_EXCAL_NUM_MONTHS*31; i++ ) {
- g_date_free( sxfti->cal_marks[i] );
- }
- g_free( sxfti->cal_marks );
-
if ( sxfti->sx ) {
xaccSchedXactionFree(sxfti->sx);
sxfti->sx = NULL;
}
+ g_object_unref(G_OBJECT(sxfti->dense_cal_model));
+ g_object_unref(G_OBJECT(sxfti->example_cal));
+
/* FIXME: do we need to clean up the GladeXML pointer? */
g_free(sxfti);
}
-
-/**
- *
- **/
static void
gnc_sx_trans_window_response_cb (GtkDialog *dialog,
gint response,
@@ -677,26 +648,25 @@
SXFromTransInfo *sxfti = (SXFromTransInfo *)data;
ENTER(" dialog %p, response %d, sx %p", dialog, response, sxfti);
- switch (response) {
- case GTK_RESPONSE_OK:
- DEBUG(" OK");
- sxftd_ok_clicked(sxfti);
- break;
- case SXFTD_RESPONSE_ADVANCED:
- DEBUG(" ADVANCED");
- sxftd_advanced_clicked(sxfti);
- break;
- case GTK_RESPONSE_CANCEL:
- default:
- DEBUG(" CANCEL");
- sxftd_close(sxfti, TRUE);
- break;
+ switch (response) {
+ case GTK_RESPONSE_OK:
+ g_debug(" OK");
+ sxftd_ok_clicked(sxfti);
+ break;
+ case SXFTD_RESPONSE_ADVANCED:
+ g_debug(" ADVANCED");
+ sxftd_advanced_clicked(sxfti);
+ break;
+ case GTK_RESPONSE_CANCEL:
+ default:
+ g_debug(" CANCEL");
+ sxftd_close(sxfti, TRUE);
+ break;
}
LEAVE(" ");
}
-
/**
* Update the example calendar; make sure to take into account the end
* specification.
@@ -707,11 +677,8 @@
struct tm *tmpTm;
time_t tmp_tt;
GDate date, startDate;
- unsigned int i;
FreqSpec *fs;
getEndTuple get;
- gchar *name;
- GString *info;
fs = xaccFreqSpecMalloc( gnc_get_current_book() );
get = sxftd_get_end_info( sxfti );
@@ -733,43 +700,27 @@
xaccFreqSpecGetNextInstance( fs, &date, &date );
startDate = date;
- i = 0;
- while ( (i < (SXFTD_EXCAL_NUM_MONTHS * 31))
- && g_date_valid( &date )
- /* Do checking against end restriction. */
- && ( ( get.type == NEVER_END )
- || ( get.type == END_ON_DATE
- && g_date_compare( &date, &(get.end_date) ) <= 0 )
- || ( get.type == END_AFTER_N_OCCS
- && i < get.n_occurrences ) ) ) {
-
- *sxfti->cal_marks[i++] = date;
- xaccFreqSpecGetNextInstance( fs, &date, &date );
+ switch (get.type)
+ {
+ case NEVER_END:
+ gnc_dense_cal_store_update_no_end(sxfti->dense_cal_model, &startDate, fs);
+ break;
+ case END_ON_DATE:
+ gnc_dense_cal_store_update_date_end(sxfti->dense_cal_model, &startDate, fs, &get.end_date);
+ break;
+ case END_AFTER_N_OCCS:
+ gnc_dense_cal_store_update_count_end(sxfti->dense_cal_model, &startDate, fs, get.n_occurrences);
+ break;
+ default:
+ g_warning("unknown get.type [%d]\n", get.type);
+ break;
}
- /* remove old marks */
- if ( sxfti->mark_id != -1 ) {
- gnc_dense_cal_mark_remove( sxfti->example_cal, sxfti->mark_id );
- sxfti->mark_id = -1;
- }
- if ( i > 0 ) {
- GtkWidget *w;
- gnc_dense_cal_set_month( sxfti->example_cal,
- g_date_get_month( &startDate ) );
- gnc_dense_cal_set_year( sxfti->example_cal,
- g_date_get_year( &startDate ) );
- w = glade_xml_get_widget( sxfti->gxml, SXFTD_NAME_ENTRY );
- name = gtk_editable_get_chars( GTK_EDITABLE(w), 0, -1 );
- info = g_string_sized_new( 16 );
- xaccFreqSpecGetFreqStr( fs, info );
- sxfti->mark_id =
- gnc_dense_cal_mark( sxfti->example_cal,
- i, sxfti->cal_marks,
- name, info->str );
- gtk_widget_queue_draw( GTK_WIDGET(sxfti->example_cal) );
- g_free( name );
- g_string_free( info, TRUE );
- }
+ gnc_dense_cal_set_month( sxfti->example_cal,
+ g_date_get_month( &startDate ) );
+ gnc_dense_cal_set_year( sxfti->example_cal,
+ g_date_get_year( &startDate ) );
+
xaccFreqSpecFree( fs );
}
@@ -784,10 +735,6 @@
sxftd_update_example_cal( sxfti );
}
-
-/**
- *
- **/
void
gnc_sx_create_from_trans( Transaction *trans )
{
@@ -817,7 +764,7 @@
}
else
{
- PERR( "Error in sxftd_init: %d", errno );
+ g_error("sxftd_init: %d", errno);
}
}
Copied: gnucash/branches/remove-group2/src/gnome/dialog-sx-since-last-run.c (from rev 15563, gnucash/trunk/src/gnome/dialog-sx-since-last-run.c)
Copied: gnucash/branches/remove-group2/src/gnome/dialog-sx-since-last-run.h (from rev 15563, gnucash/trunk/src/gnome/dialog-sx-since-last-run.h)
Deleted: gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,4027 +0,0 @@
-/********************************************************************\
- * dialog-sxsincelast.c - "since last run" dialog. *
- * Copyright (c) 2001,2002 Joshua Sled <jsled at asynchronous.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 *
-\********************************************************************/
-
-/**
- * . Page 1: reminders list
- * . backed by: sxsld->reminderList
- * . Page 2: auto-create notify ledger
- * . backed by: sxsld->autoCreateList
- * . Page 3: to-create variable bindings
- * . backed by: sxsld->toCreateData [s/Data/List/]
- * . Page 4: created ledger
- * . backed by: sxsld->createdList
- * . Page 5: obsolete list
- * . backed by: sxsld->toRemoveList
- *
- * Detail regarding 'back' processing support.
- * . reminders
- * . selected
- * . <standard policy>
- * . unselected
- * . if auto-created : delete
- * . if to-create : remove
- * . auto-create : display
- * . to-create variable bindings
- * . if bindings changed : reeval/fill credit/debit cells
- * . if made incomplete : delete transaction
- * . created : display
- * . obsolete : select status [easy]
- **/
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include "glib-compat.h"
-#include <limits.h>
-
-#include "Account.h"
-#include "Query.h"
-#include "QueryNew.h"
-#include "SchedXaction.h"
-#include "Transaction.h"
-#include "Scrub.h"
-#include "SX-book.h"
-#include "SX-book-p.h"
-#include "dialog-utils.h"
-#include "finvar.h"
-#include "gnc-date.h"
-#include "gnc-component-manager.h"
-#include "gnc-engine.h"
-#include "gnc-exp-parser.h"
-#include "gnc-embedded-window.h"
-#include "gnc-gconf-utils.h"
-#include "gnc-main-window.h"
-#include "gnc-numeric.h"
-#include "gnc-plugin-page.h"
-#include "gnc-plugin-page-register.h"
-#include "gnc-ui-util.h"
-#include "gnc-ui.h"
-#include "gnc-gui-query.h"
-#include "split-register.h"
-#include "gnc-ledger-display.h"
-#include "gnucash-sheet.h"
-#include "gnc-split-reg.h"
-
-#include "dialog-sxsincelast.h"
-#include "dialog-scheduledxaction.h"
-
-#ifdef HAVE_LANGINFO_D_FMT
-#include <langinfo.h>
-#endif
-
-#define DIALOG_SXSINCELAST_CM_CLASS "dialog-sxsincelast"
-#define DIALOG_SXSINCELAST_REMIND_CM_CLASS "dialog-sxsincelast-remind"
-#define DIALOG_SXSINCELAST_OBSOLETE_CM_CLASS "dialog-sxsincelast-obsolete"
-
-#define DIALOG_SXSINCELAST_GLADE_NAME "Since Last Run Druid"
-#define SXSLD_DRUID_GLADE_NAME "sincelast_druid"
-#define SXSLD_WIN_PREFIX "sx_sincelast_win"
-#define GCONF_SECTION "dialogs/scheduled_trans/since_last_run"
-
-#define SINCELAST_DRUID "sincelast_druid"
-#define WHAT_TO_DO_PG "what_to_do"
-#define REMINDERS_PG "reminders_page"
-#define AUTO_CREATE_NOTIFY_PG "auto_create_notify_page"
-#define TO_CREATE_PG "to_create_page"
-#define CREATED_PG "created_page"
-#define OBSOLETE_PG "obsolete_page"
-#define COMMIT_PG "commit_page"
-
-#define SX_OBSOLETE_CLIST "sx_obsolete_clist"
-#define TO_CREATE_LIST "to_create_list"
-#define REMINDER_LIST "reminders_list"
-#define SX_GLADE_FILE "sched-xact.glade"
-
-#define TO_CREATE_STATUS "to_create_status"
-
-#define SELECT_ALL_BUTTON "select_all_button"
-#define UNSELECT_ALL_BUTTON "unselect_all_button"
-#define OK_BUTTON "ok_button"
-#define CANCEL_BUTTON "cancel_button"
-#define VARIABLE_TABLE "variables_table"
-#define AUTO_CREATE_VBOX "ac_vbox"
-#define TO_CREATE_TXN_VBOX "to_create_txn_vbox"
-#define CREATED_VBOX "created_vbox"
-#define WHAT_TO_DO_VBOX "what_to_do_vbox"
-#define WHAT_TO_DO_PROGRESS "creation_progress"
-#define SX_DISPOSITION_OPT "disposition_opt"
-
-#define TO_CREATE_LIST_WIDTH 2
-#define REMINDER_LIST_WIDTH 3
-#define SX_OBSOLETE_CLIST_WIDTH 3
-
-#define COERCE_VOID_TO_GBOOLEAN(x) ((gboolean)(*#x))
-
-#define IGNORE_TEXT "Ignored"
-#define POSTPONE_TEXT "Postponed"
-#define READY_TEXT "Ready to create"
-#define NEEDS_BINDINGS_TEXT "Needs values for variables"
-
-static QofLogModule log_module = GNC_MOD_SX;
-
-/**
- * Directions for {forward,back}-page determining.
- * @see gnc_sxsld_get_appropriate_page
- **/
-typedef enum {
- FORWARD, BACK
-} Direction;
-
-/**
- * The states a to-be-created SX can be in...
- * SX_TO_CREATE : The SX is ready to be created, depending on variable-binding
- * requirements.
- * SX_IGNORE : Drop the SX on the floor forever.
- * SX_POSTPONE : Bring this SX up in the future, but we're not going to
- * create it right now.
- * SX_[MAX_STATE] : The maximum real value.
- * SX_UNDEF : Only used for prevState, to indicate that we haven't
- * processed this instance, yet.
- **/
-typedef enum {
- SX_TO_CREATE,
- SX_IGNORE,
- SX_POSTPONE,
- SX_MAX_STATE,
- SX_UNDEF
-} ToCreateState;
-
-typedef struct toCreateTuple_ {
- SchedXaction *sx;
- GList /* <toCreateInstance*> */ *instanceList;
-} toCreateTuple;
-
-typedef struct toCreateInstance_ {
- GDate *date;
- GHashTable *varBindings;
- void *sxStateData;
- GtkCTreeNode *node;
- toCreateTuple *parentTCT;
- /* A list of the GUIDs of transactions generated from this TCI [if
- * any]; this will always be a subset of the
- * sxsld->createdTxnGUIDList. */
- GList /* <GUID*> */ *createdTxnGUIDs;
- gboolean dirty;
- /** How this was, originally -- for revert processing. **/
- ToCreateState origState;
- /** How the user would currently like to process this instance
- * [within the druid]. */
- ToCreateState state;
- /** How we've previously processed this instance [within the druid]. */
- ToCreateState prevState;
-} toCreateInstance;
-
-/**
- * A tuple of an SX and any upcoming reminders.
- **/
-typedef struct reminderTuple_ {
- SchedXaction *sx;
- GList /* <reminderInstanceTuple*> */ *instanceList;
-} reminderTuple;
-
-/**
- * An reminder instance of the containing SX.
- **/
-typedef struct reminderInstanceTuple_ {
- GDate *endDate;
- GDate *occurDate;
- void *sxStateData;
- gboolean isSelected;
- reminderTuple *parentRT;
- toCreateInstance *resultantTCI;
-} reminderInstanceTuple;
-
-typedef struct toDeleteTuple_ {
- SchedXaction *sx;
- GDate *endDate;
- gboolean isSelected;
-} toDeleteTuple;
-
-typedef struct creation_helper_userdata_ {
- /* the to-create tuple */
- toCreateInstance *tci;
- /* a pointer to a GList to append the GUIDs of newly-created
- * Transactions to, or NULL */
- GList **createdGUIDs;
- /* a pointer to a GList<GString*> of error-messages encountered while
- * creating the transactions. **/
- GList **creation_errors;
-} createData;
-
-/**
- * The since-last-run dialog is a Gnome Druid which steps through the various
- * parts of scheduled transaction since-last-run processing; these parts are:
- *
- * 1. Display and select SX reminders for creation
- * 2. Show/allow editing of auto-created + notification-request SXes
- * 3. Show to-create SXes, allowing variable binding
- * 4. Show created SXes, allowing editing
- * 5. Allow deletion of any obsolete SXes
- *
- * Pages which aren't relevant are skipped; this is handled in the 'prep'
- * signal handler: e.g., a since-last dialog with only obsolete SXes would go
- * through the 'prep' methods of all it's pages to reach the Obsolete page.
- **/
-typedef struct _sxSinceLastData {
- GtkWidget *sincelast_window;
- GnomeDruid *sincelast_druid;
- GladeXML *gxml;
-
- GtkProgressBar *prog;
- GtkStatusbar *toCreateFormula;
- guint formulaCtxId;
- GtkStatusbar *toCreateStatus;
- guint statusCtxId;
-
- /* The currently-selected to-create instance. */
- toCreateInstance *curSelTCI;
-
- /* Multi-stage processing-related stuff... */
- GList /* <toCreateTuple*> */ *autoCreateList;
- GList /* <toCreateTuple*> */ *toCreateList;
- GList /* <reminderTuple*> */ *reminderList;
- GList /* <toDeleteTuple*> */ *toRemoveList;
-
- /********** "Cancel"-related stuff... **********/
-
- /** A HashTable of SX mapped to initial temporal data. */
- GHashTable /* <SchedXaction*,void*> */ *sxInitStates;
-
- /** The list of the GUIDs of _all_ transactions we've created. */
- GList /* <GUID*> */ *createdTxnGUIDList;
-
- /* The count of selected reminders. */
- gint remindSelCount;
-
- /* The count of auto-created transactions. */
- gint autoCreatedCount;
-
- GncEmbeddedWindow *ac_window;
- GncPluginPage *ac_register;
- GNCLedgerDisplay *ac_ledger;
-
- GncEmbeddedWindow *created_window;
- GncPluginPage *created_register;
- GNCLedgerDisplay *created_ledger;
-
- GncEmbeddedWindow *to_create_window;
- GncPluginPage *to_create_register;
- GNCLedgerDisplay *to_create_ledger;
-
-} sxSinceLastData;
-
-static void sxsincelast_init( sxSinceLastData *sxsld );
-static void create_autoCreate_ledger( sxSinceLastData *sxsld );
-static void create_created_ledger( sxSinceLastData *sxsld );
-static void create_to_create_ledger( sxSinceLastData *sxsld );
-static void gnc_sxsld_commit_ledgers( sxSinceLastData *sxsld );
-
-#if 0
-static void sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld );
-#endif
-
-static gint sxsincelast_populate( sxSinceLastData *sxsld );
-static void sxsincelast_druid_cancelled( GnomeDruid *druid, gpointer ud );
-static void sxsincelast_close_handler( gpointer ud );
-
-static GnomeDruidPage* gnc_sxsld_get_appropriate_page( sxSinceLastData *sxsdl,
- GnomeDruidPage *from,
- Direction dir );
-static gboolean gnc_sxsld_wtd_appr( sxSinceLastData *sxsld );
-static gboolean gnc_sxsld_remind_appr( sxSinceLastData *sxsld );
-static gboolean gnc_sxsld_tocreate_appr( sxSinceLastData *sxsld );
-static gboolean gnc_sxsld_autocreate_appr( sxSinceLastData *sxsld );
-static gboolean gnc_sxsld_created_appr( sxSinceLastData *sxsld );
-static gboolean gnc_sxsld_obsolete_appr( sxSinceLastData *sxsld );
-static gboolean gnc_sxsld_commit_appr( sxSinceLastData *sxsld );
-
-static void sxsincelast_entry_changed( GtkEditable *e, gpointer ud );
-static void sxsincelast_destroy( GtkObject *o, gpointer ud );
-static void sxsincelast_save_size( sxSinceLastData *sxsld );
-static void create_transactions_on(SchedXaction *sx,
- GDate *gd,
- toCreateInstance *tci,
- GList **createdGUIDs,
- GList **creation_errors);
-static gint create_each_transaction_helper( Transaction *t, void *d );
-/* External for what reason ... ? */
-void sxsl_get_sx_vars( SchedXaction *sx, GHashTable *varHash );
-static void hash_to_sorted_list( GHashTable *hashTable, GList **gl );
-static void andequal_numerics_set( gpointer key,
- gpointer value,
- gpointer data );
-/* External for bad reasons, I think...? */
-void print_vars_helper( gpointer key,
- gpointer value,
- gpointer user_data );
-static void clean_sincelast_data( sxSinceLastData *sxsld );
-static void clean_variable_table( sxSinceLastData *sxsld );
-
-static void process_auto_create_list(GList *, sxSinceLastData *sxsld, GList **creation_errors);
-static void add_to_create_list_to_gui( GList *, sxSinceLastData *sxsld );
-static void add_reminders_to_gui( GList *, sxSinceLastData *sxsld );
-static void add_dead_list_to_gui( GList *, sxSinceLastData *sxsld );
-static void processSelectedReminderList( GList *, sxSinceLastData * );
-
-static void sxsincelast_tc_row_sel( GtkCTree *ct,
- GList *nodelist,
- gint column,
- gpointer user_data);
-
-static void sxsincelast_tc_row_unsel( GtkCTree *ct,
- GList *nodelist,
- gint column,
- gpointer user_data);
-
-static void sxsld_remind_row_toggle( GtkCTree *ct, GList *node,
- gint column, gpointer user_data );
-static void sxsld_obsolete_row_toggle( GtkCList *cl, gint row, gint col,
- GdkEventButton *event, gpointer ud );
-
-static void sxsld_disposition_changed( GtkMenuShell *b, gpointer d );
-static void sxsld_set_sensitive_tci_controls( sxSinceLastData *sxsld,
- gboolean sensitive );
-
-static void gnc_sxsld_revert_reminders( sxSinceLastData *sxsld,
- GList *toRevertList );
-static gboolean processed_valid_reminders_listP( sxSinceLastData *sxsld );
-static void create_bad_reminders_msg( gpointer data, gpointer ud );
-static gboolean inform_or_add( sxSinceLastData *sxsld, reminderTuple *rt, gboolean okFlag,
- GList *badList, GList **goodList );
-
-static void sx_obsolete_select_all_clicked( GtkButton *button,
- gpointer user_data );
-static void sx_obsolete_unselect_all_clicked( GtkButton *button,
- gpointer user_data );
-
-static void gnc_sxsld_free_tci( toCreateInstance *tci );
-static void gnc_sxsld_free_toCreateTuple_list( GList *l );
-static void gnc_sxsld_free_sxState( gpointer key,
- gpointer value,
- gpointer userdata );
-static void gnc_sxsld_free_entry_numeric( GObject *o, gpointer ud );
-
-static gint sxsld_process_to_create_instance(sxSinceLastData *sxsld,
- toCreateInstance *tci,
- GList **creation_errors);
-static void sxsld_revert_to_create_txns( sxSinceLastData *sxsld,
- toCreateInstance *tci );
-static gint sxsld_create_to_create_txns(sxSinceLastData *sxsld,
- toCreateInstance *tci,
- GList **creation_errors);
-static gint sxsld_get_future_created_txn_count( sxSinceLastData *sxsld );
-static void creation_errors_dialog(GList *creation_errors);
-static void creation_errors_free(GList *creation_errors);
-
-static GtkActionEntry gnc_sxsld_menu_entries [] =
-{
- /* Toplevel */
- { "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
- { "TransactionAction", NULL, N_("_Transaction"), NULL, NULL, NULL },
- { "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
- { "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
-};
-static guint gnc_sxsld_menu_n_entries = G_N_ELEMENTS (gnc_sxsld_menu_entries);
-
-/**
- * Used to wrap for the book-open hook, where the book filename is given.
- **/
-void
-gnc_sx_sxsincelast_book_opened (void)
-{
- gint ret;
-
- if (!gnc_gconf_get_bool(GCONF_SECTION, "show_at_file_open", NULL))
- return;
-
- ret = gnc_ui_sxsincelast_dialog_create();
- if ( ret < 0 ) {
- gnc_info_dialog
- (NULL,
- ngettext
- ("There are no Scheduled Transactions to be entered at this time. "
- "(%d transaction automatically created)",
- "There are no Scheduled Transactions to be entered at this time. "
- "(%d transactions automatically created)",
- -(ret)),
- -(ret));
- }
-}
-
-
-static gboolean
-show_handler (const char *class, gint component_id,
- gpointer user_data, gpointer iter_data)
-{
- GtkWidget *window = user_data;
-
- if (!window)
- return(FALSE);
- gtk_window_present (GTK_WINDOW(window));
- return(TRUE);
-}
-
-/**
- * @return The magnitude of the return value is the number of auto-created,
- * no-notification scheduled transactions created. This value is positive if
- * there are additionally other SXes which need user interaction and the
- * Druid has been displayed, or negative if there are not, and no Druid
- * window was realized. In the case where there the dialog has been
- * displayed but no auto-create-no-notify transactions have been created,
- * INT_MAX [limits.h] is returned. 0 is treated as negative, with no
- * transactions created and no dialog displayed. The caller can use this
- * value as appropriate to inform the user.
- *
- * [e.g., for book-open-hook: do nothing; for menu-selection: display an info
- * dialog stating there's nothing to do.]
- **/
-gint
-gnc_ui_sxsincelast_dialog_create()
-{
- int autoCreateCount;
- sxSinceLastData *sxsld;
-
- if (gnc_forall_gui_components (DIALOG_SXSINCELAST_CM_CLASS,
- show_handler, NULL))
- return 0;
-
-
- sxsld = g_new0( sxSinceLastData, 1 );
-
- sxsld->toCreateList = sxsld->reminderList = sxsld->toRemoveList = NULL;
- sxsld->sxInitStates = g_hash_table_new( g_direct_hash, g_direct_equal );
-
- autoCreateCount = sxsincelast_populate( sxsld );
- if ( autoCreateCount <= 0 ) {
- g_free( sxsld );
- return autoCreateCount;
- }
-
- sxsld->gxml = gnc_glade_xml_new( SX_GLADE_FILE,
- DIALOG_SXSINCELAST_GLADE_NAME );
- sxsld->sincelast_window =
- glade_xml_get_widget( sxsld->gxml,
- DIALOG_SXSINCELAST_GLADE_NAME );
- sxsld->sincelast_druid =
- GNOME_DRUID( glade_xml_get_widget( sxsld->gxml,
- SXSLD_DRUID_GLADE_NAME ) );
- sxsincelast_init( sxsld );
- return autoCreateCount;
-}
-
-static void
-clist_set_all_cols_autoresize( GtkCList *cl, guint n_cols )
-{
- guint col;
- for( col = 0; col< n_cols; col++ ) {
- gtk_clist_set_column_auto_resize (cl, col, TRUE);
- }
- return;
-}
-
-typedef struct {
- char *name;
- char *signal;
- void (*handlerFn)();
-} widgetSignalHandlerTuple;
-
-typedef struct {
- char *pageName;
- void (*prepareHandlerFn)();
- gboolean (*backHandlerFn)();
- gboolean (*nextHandlerFn)();
- void (*finishHandlerFn)();
- gboolean (*cancelHandlerFn)();
-} druidSignalHandlerTuple;
-
-static void
-dialog_widgets_attach_handlers(GladeXML *dialog_xml,
- widgetSignalHandlerTuple *handler_info,
- sxSinceLastData *sxsld)
-{
- int i;
- GtkWidget *w;
-
- for (i = 0; handler_info[i].name != NULL; i++)
- {
- w = glade_xml_get_widget(dialog_xml, handler_info[i].name);
- g_signal_connect( G_OBJECT(w), handler_info[i].signal,
- G_CALLBACK(handler_info[i].handlerFn),
- sxsld);
- }
-}
-
-static void
-druid_pages_attach_handlers( GladeXML *dialog_xml,
- druidSignalHandlerTuple *handler_info,
- sxSinceLastData *sxsld )
-{
- int i;
- GtkWidget *w;
-
- for(i = 0; handler_info[i].pageName != NULL; i++)
- {
- w = glade_xml_get_widget(dialog_xml, handler_info[i].pageName);
- if ( handler_info[i].prepareHandlerFn ) {
- g_signal_connect( G_OBJECT(w), "prepare",
- G_CALLBACK(handler_info[i].
- prepareHandlerFn),
- sxsld);
- }
- if ( handler_info[i].backHandlerFn ) {
- g_signal_connect( G_OBJECT(w), "back",
- G_CALLBACK(handler_info[i].
- backHandlerFn),
- sxsld);
- }
- if ( handler_info[i].nextHandlerFn ) {
- g_signal_connect( G_OBJECT(w), "next",
- G_CALLBACK(handler_info[i].
- nextHandlerFn),
- sxsld);
- }
- if ( handler_info[i].finishHandlerFn ) {
- g_signal_connect( G_OBJECT(w), "finish",
- G_CALLBACK(handler_info[i].
- finishHandlerFn),
- sxsld);
- }
- if ( handler_info[i].cancelHandlerFn ) {
- g_signal_connect( G_OBJECT(w), "cancel",
- G_CALLBACK(handler_info[i].
- cancelHandlerFn),
- sxsld);
- }
- }
-}
-
-static void
-sxsincelast_druid_cancelled( GnomeDruid *druid, gpointer ud )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- gtk_widget_hide( sxsld->sincelast_window );
- sxsincelast_close_handler( sxsld );
-}
-
-/**
- * Using the specified direction, gets the next appropriate page. Returns
- * NULL if there is no approrpiate page to go to.
- **/
-static
-GnomeDruidPage*
-gnc_sxsld_get_appropriate_page( sxSinceLastData *sxsld,
- GnomeDruidPage *from,
- Direction dir )
-{
- static struct {
- gchar *pageName;
- gboolean (*pageAppropriate)( sxSinceLastData *sxsld );
- } pages[] = {
- { WHAT_TO_DO_PG, gnc_sxsld_wtd_appr },
- { REMINDERS_PG, gnc_sxsld_remind_appr },
- { AUTO_CREATE_NOTIFY_PG, gnc_sxsld_autocreate_appr },
- { TO_CREATE_PG, gnc_sxsld_tocreate_appr },
- { CREATED_PG, gnc_sxsld_created_appr },
- { OBSOLETE_PG, gnc_sxsld_obsolete_appr },
- { COMMIT_PG, gnc_sxsld_commit_appr },
- { NULL, NULL }
- };
- int modifier;
- int cur;
- GtkWidget *pg;
-
- pg = NULL;
- /* get the current page index via lame linear search. */
- for ( cur = 0; pages[cur].pageName != NULL; cur++ ) {
- pg = glade_xml_get_widget( sxsld->gxml, pages[cur].pageName );
- if ( GTK_WIDGET(from) == pg ) {
- break;
- }
- }
- g_assert( pages[cur].pageName != NULL );
-
- modifier = ( dir == FORWARD ? 1 : -1 );
- /* Find the approrpriate "next" page; start trying the first possible
- * "next" page. */
- cur += modifier;
- while ( cur >= 0
- && pages[cur].pageName != NULL
- && !(*pages[cur].pageAppropriate)( sxsld ) ) {
- cur += modifier;
- }
-
- if ( cur < 0
- || pages[cur].pageName == NULL ) {
- return NULL;
- }
- return GNOME_DRUID_PAGE( glade_xml_get_widget( sxsld->gxml,
- pages[cur].pageName ) );
-}
-
-static
-gboolean
-gnc_sxsld_wtd_appr( sxSinceLastData *sxsld )
-{
- /* It's never appropriate to return here. */
- return FALSE;
-}
-
-static
-gboolean
-gnc_sxsld_remind_appr( sxSinceLastData *sxsld )
-{
- return (g_list_length( sxsld->reminderList ) != 0);
-}
-
-static
-gboolean
-gnc_sxsld_tocreate_appr( sxSinceLastData *sxsld )
-{
- return (g_list_length( sxsld->toCreateList ) != 0);
-}
-
-static
-gboolean
-gnc_sxsld_autocreate_appr( sxSinceLastData *sxsld )
-{
- return (sxsld->autoCreatedCount > 0);
-}
-
-static
-gboolean
-gnc_sxsld_created_appr( sxSinceLastData *sxsld )
-{
- return ((g_list_length(sxsld->createdTxnGUIDList)
- - sxsld->autoCreatedCount) > 0);
-}
-
-static
-gboolean
-gnc_sxsld_obsolete_appr( sxSinceLastData *sxsld )
-{
- return (g_list_length( sxsld->toRemoveList ) != 0);
-}
-
-static
-gboolean
-gnc_sxsld_commit_appr( sxSinceLastData *sxsld )
-{
- /* Always show this page */
- return TRUE;
-}
-
-static
-gboolean
-gen_back( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GnomeDruidPage *gdp;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- if ( !(gdp = gnc_sxsld_get_appropriate_page( sxsld, druid_page, BACK )) ) {
- DEBUG( "No appropriate page to go to." );
- return TRUE;
- }
- gnome_druid_set_page( sxsld->sincelast_druid, gdp );
- return TRUE;
-}
-
-static
-gboolean
-gen_next( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GnomeDruidPage *gdp;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- if ( !(gdp = gnc_sxsld_get_appropriate_page( sxsld, druid_page, FORWARD )) ) {
- DEBUG( "No appropriate page to go to." );
- return TRUE;
- }
- gnome_druid_set_page( sxsld->sincelast_druid, gdp );
- return TRUE;
-}
-
-static void
-whattodo_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
-}
-
-static
-void
-reminders_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GtkWidget *w;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- w = glade_xml_get_widget( sxsld->gxml, REMINDER_LIST );
- gtk_clist_freeze( GTK_CLIST(w) );
- gtk_clist_clear( GTK_CLIST(w) );
- add_reminders_to_gui( sxsld->reminderList, sxsld );
- gtk_clist_thaw( GTK_CLIST(w) );
- gnome_druid_set_buttons_sensitive(
- sxsld->sincelast_druid,
- ( gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )
- != NULL ),
- TRUE, TRUE, TRUE );
- /* FIXME: this isn't quite right; see the comment in
- * sxsld_remind_row_toggle */
- gnome_druid_set_show_finish( sxsld->sincelast_druid,
- !gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- FORWARD ) );
-}
-
-static
-gboolean
-reminders_next( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GnomeDruidPage *gdp;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- if ( !processed_valid_reminders_listP( sxsld ) ) {
- return TRUE;
- }
- if ( !(gdp = gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- FORWARD )) ) {
- DEBUG( "no valid page to switch to" );
- return TRUE;
- }
- gnome_druid_set_page( sxsld->sincelast_druid, gdp );
- return TRUE;
-}
-
-static
-gboolean
-reminders_back( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GnomeDruidPage *gdp;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- if ( !processed_valid_reminders_listP( sxsld ) ) {
- return TRUE;
- }
- if ( !(gdp = gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )) ) {
- DEBUG( "no valid page to switch to" );
- return TRUE;
- }
- gnome_druid_set_page( sxsld->sincelast_druid, gdp );
- return TRUE;
-}
-
-static
-gboolean
-created_back( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld;
-
- sxsld = (sxSinceLastData*)ud;
- gnc_split_register_save(
- gnc_ledger_display_get_split_register(sxsld->created_ledger),
- TRUE );
- return gen_back( druid_page, arg1, ud );
-}
-
-static
-gboolean
-created_next( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld;
-
- sxsld = (sxSinceLastData*)ud;
- gnc_split_register_save(
- gnc_ledger_display_get_split_register(sxsld->created_ledger),
- TRUE );
- return gen_next( druid_page, arg1, ud );
-}
-
-static
-void
-created_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GList *tctList, *tciList, *guidList;
- toCreateTuple *tct;
- toCreateInstance *tci;
- Query *bookQuery, *guidQuery, *q;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- bookQuery = xaccMallocQuery();
- guidQuery = xaccMallocQuery();
- xaccQuerySetBook( bookQuery, gnc_get_current_book() );
- /* Create the appropriate query for the Created ledger; go through
- * the to-create list's instances and add all the created Txn
- * GUIDs. */
- for ( tctList = sxsld->toCreateList;
- tctList;
- tctList = tctList->next ) {
- tct = (toCreateTuple*)tctList->data;
- for ( tciList = tct->instanceList;
- tciList;
- tciList = tciList->next ) {
- tci = (toCreateInstance*)tciList->data;
- for ( guidList = tci->createdTxnGUIDs;
- guidList;
- guidList = guidList->next ) {
- xaccQueryAddGUIDMatch( guidQuery,
- (GUID*)guidList->data,
- GNC_ID_TRANS,
- QUERY_OR );
- }
- }
- }
- q = xaccQueryMerge( bookQuery, guidQuery, QUERY_AND );
- gnc_suspend_gui_refresh();
- gnc_ledger_display_set_query( sxsld->created_ledger, q );
- gnc_ledger_display_refresh( sxsld->created_ledger );
- gnc_resume_gui_refresh();
- xaccFreeQuery( q );
- xaccFreeQuery( bookQuery );
- xaccFreeQuery( guidQuery );
-
- gnome_druid_set_buttons_sensitive(
- sxsld->sincelast_druid,
- ( gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )
- != NULL ),
- TRUE, TRUE, TRUE );
-
- if ( !gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- FORWARD ) ) {
- gnome_druid_set_show_finish( sxsld->sincelast_druid, TRUE );
- }
-}
-
-static void
-obsolete_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
- add_dead_list_to_gui( sxsld->toRemoveList, sxsld );
-
- gnome_druid_set_buttons_sensitive(
- sxsld->sincelast_druid,
- ( gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )
- != NULL ),
- TRUE, TRUE, TRUE );
-}
-
-static void
-commit_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- gnome_druid_set_buttons_sensitive(
- sxsld->sincelast_druid,
- ( gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )
- != NULL ),
- TRUE, TRUE, TRUE );
-}
-
-static
-gboolean
-auto_create_back( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld;
-
- sxsld = (sxSinceLastData*)ud;
- gnc_split_register_save(
- gnc_ledger_display_get_split_register(sxsld->ac_ledger),
- TRUE );
- return gen_back( druid_page, arg1, ud );
-}
-
-static
-gboolean
-auto_create_next( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld;
-
- sxsld = (sxSinceLastData*)ud;
- gnc_split_register_save(
- gnc_ledger_display_get_split_register(sxsld->ac_ledger),
- TRUE );
- return gen_next( druid_page, arg1, ud );
-}
-
-static
-void
-auto_create_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GList *tctList, *tciList, *guidList;
- toCreateTuple *tct;
- toCreateInstance *tci;
- Query *bookQuery, *guidQuery, *q;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- bookQuery = xaccMallocQuery();
- guidQuery = xaccMallocQuery();
- xaccQuerySetBook( bookQuery, gnc_get_current_book() );
- /* Create the appropriate query for the auto-create-notify ledger; go
- * through the auto-create list's instances and add all the created
- * Txn GUIDs. */
- for ( tctList = sxsld->autoCreateList;
- tctList;
- tctList = tctList->next ) {
- gboolean unused, notifyState;
-
- tct = (toCreateTuple*)tctList->data;
- xaccSchedXactionGetAutoCreate( tct->sx, &unused, ¬ifyState );
- if ( !notifyState ) {
- continue;
- }
-
- for ( tciList = tct->instanceList;
- tciList;
- tciList = tciList->next ) {
- tci = (toCreateInstance*)tciList->data;
- for ( guidList = tci->createdTxnGUIDs;
- guidList;
- guidList = guidList->next ) {
- xaccQueryAddGUIDMatch( guidQuery,
- (GUID*)guidList->data,
- GNC_ID_TRANS,
- QUERY_OR );
- }
- }
- }
- q = xaccQueryMerge( bookQuery, guidQuery, QUERY_AND );
- gnc_suspend_gui_refresh();
- gnc_ledger_display_set_query( sxsld->ac_ledger, q );
- gnc_ledger_display_refresh( sxsld->ac_ledger );
- gnc_resume_gui_refresh();
- xaccFreeQuery( q );
- xaccFreeQuery( bookQuery );
- xaccFreeQuery( guidQuery );
-
- gnome_druid_set_buttons_sensitive(
- sxsld->sincelast_druid,
- ( gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )
- != NULL ),
- TRUE, TRUE, TRUE );
-
- if ( !gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- FORWARD ) ) {
- gnome_druid_set_show_finish( sxsld->sincelast_druid, TRUE );
- }
-}
-
-static
-void
-to_create_prep( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GtkWidget *w;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- w = glade_xml_get_widget( sxsld->gxml, TO_CREATE_LIST );
- gtk_clist_freeze( GTK_CLIST(w) );
- gtk_clist_clear( GTK_CLIST(w) );
- clean_variable_table( sxsld );
- add_to_create_list_to_gui( sxsld->toCreateList, sxsld );
- gtk_clist_thaw( GTK_CLIST(w) );
-
- gnome_druid_set_buttons_sensitive(
- sxsld->sincelast_druid,
- ( gnc_sxsld_get_appropriate_page( sxsld,
- druid_page,
- BACK )
- != NULL ),
- TRUE, TRUE, TRUE );
- /* Setup next/finish button based on the number of ready-to-go
- * to-create transactions */
- gnome_druid_set_show_finish(
- sxsld->sincelast_druid,
- ( (sxsld_get_future_created_txn_count(sxsld)
- - sxsld->autoCreatedCount) == 0 ) );
-}
-
-static
-void
-sxsld_revert_to_create_txns( sxSinceLastData *sxsld,
- toCreateInstance *tci )
-{
- GList *l = NULL;
-
- gnc_suspend_gui_refresh();
- for ( l = tci->createdTxnGUIDs;
- l; l = l->next ) {
- Transaction *t;
- t = xaccTransLookup( (GUID*)l->data,
- gnc_get_current_book() );
- g_assert( t );
- xaccTransBeginEdit( t );
- xaccTransDestroy( t );
- xaccTransCommitEdit( t );
-
- /* Remove from master list, too. */
- sxsld->createdTxnGUIDList =
- g_list_remove(
- sxsld->createdTxnGUIDList,
- l->data );
- }
- g_list_free( tci->createdTxnGUIDs );
- tci->createdTxnGUIDs = NULL;
- gnc_resume_gui_refresh();
-}
-
-/**
- * @return The count of created transactions.
- **/
-static
-gint
-sxsld_create_to_create_txns(sxSinceLastData *sxsld,
- toCreateInstance *tci,
- GList **creation_errors)
-{
- gint toRet = 0;
- GList *l = NULL;
- GList *created = NULL;
-
- /* Don't process instances we've already created transactions for
- * [list_length > 0], which haven't otherwise changed [!dirty]. */
- if ( g_list_length( tci->createdTxnGUIDs ) != 0 ) {
- /* If we've created it and the variables
- * haven't changed, skip it. */
- if ( ! tci->dirty ) {
- return toRet;
- }
- /* Otherwise, destroy the transactions and
- * re-create them below. */
-
- /* FIXME: this would be better if we could
- * re-used the existing txns we've already
- * gone through the pain of creating. */
- sxsld_revert_to_create_txns( sxsld, tci );
- }
-
- create_transactions_on(tci->parentTCT->sx,
- tci->date,
- tci,
- &created,
- creation_errors);
- tci->dirty = FALSE;
-
- /* Add to the Query for that register. */
- for ( l = created; l; l = l->next ) {
- tci->createdTxnGUIDs =
- g_list_append( tci->createdTxnGUIDs,
- (GUID*)l->data );
- toRet++;
- }
- sxsld->createdTxnGUIDList =
- g_list_concat( sxsld->createdTxnGUIDList, created );
- return toRet;
-}
-
-/**
- * Do the correct thing for the given toCreateInstance, taking into account
- * what we've done to it before [tci->prevState]. That is: if we previously
- * processed the instance as to-create/as-scheduled, and now we're postponing
- * it, we should remove the previously-created transactions and now add the
- * instance to the postponed list. See the code for full details on the
- * policy here.
- *
- * @return The count of created transactions.
- **/
-static
-gint
-sxsld_process_to_create_instance(sxSinceLastData *sxsld,
- toCreateInstance *tci,
- GList **creation_errors)
-{
- gint toRet = 0;
-
- /* Undo the previous work. */
- switch ( tci->prevState ) {
- case SX_IGNORE:
- switch ( tci->state ) {
- case SX_IGNORE:
- /* Keep ignoring. */
- break;
- case SX_POSTPONE:
- /* remove from postponed list. */
- gnc_sx_remove_defer_instance( tci->parentTCT->sx,
- tci->sxStateData );
- break;
- case SX_TO_CREATE:
- /* del prev txns. */
- sxsld_revert_to_create_txns( sxsld, tci );
- break;
- default:
- g_assert( FALSE );
- }
- break;
- case SX_POSTPONE:
- if ( tci->state != SX_POSTPONE ) {
- /* remove from postponed list. */
- gnc_sx_remove_defer_instance( tci->parentTCT->sx,
- tci->sxStateData );
- }
- break;
- case SX_TO_CREATE:
- if ( tci->state != SX_TO_CREATE ) {
- /* del prev txns. */
- sxsld_revert_to_create_txns( sxsld, tci );
- }
- break;
- case SX_UNDEF:
- /* Fine; do nothing. */
- break;
- default:
- g_assert( FALSE );
- break;
- }
-
- /* Now, process the currently-requested state. */
- switch ( tci->state ) {
- case SX_IGNORE:
- /* Fine ... just ignore it. */
- break;
- case SX_POSTPONE:
- if ( tci->prevState == SX_POSTPONE ) {
- break;
- }
- /* add to the postponed list. */
- {
- char tmpBuf[ MAX_DATE_LENGTH+1 ];
- qof_print_gdate( tmpBuf, MAX_DATE_LENGTH, tci->date );
- DEBUG( "Adding defer instance on %s for %s",
- tmpBuf,
- xaccSchedXactionGetName( tci->parentTCT->sx ) );
- }
- gnc_sx_add_defer_instance( tci->parentTCT->sx, tci->sxStateData );
- break;
- case SX_TO_CREATE:
- /* Go ahead and create... */
- toRet = sxsld_create_to_create_txns(sxsld, tci, creation_errors);
- break;
- default:
- g_assert( FALSE );
- break;
- }
-
- tci->prevState = tci->state;
-
- /* Increment the SX state regardless of what happens above. The last
- * generated SX instance is the new final state of the SX in all
- * cases [ignored, postponed or created]. */
- {
- gint tmp;
- GDate *last_occur;
- SchedXaction *sx;
-
- sx = tci->parentTCT->sx;
-
- /* Only set the last-occur-date, instance count and remaining
- * occurances if this instance is later than presently-last
- * definition in the SX; no matter what happens in the SX
- * dialog, the last instance processed sets the last-occur
- * date [and other params] to its instance date [and other
- * params]. */
- last_occur = xaccSchedXactionGetLastOccurDate( sx );
- /* If we don't have anything to do, then just return. */
- if ( g_date_valid( last_occur )
- && g_date_compare( last_occur, tci->date ) > 0 ) {
- return toRet;
- }
- xaccSchedXactionSetLastOccurDate( sx, tci->date );
-
- /* Handle an interesting corner case of postponing or
- * ignoring the first instance. We only want to incrment the
- * counters for newly-discovered-as-to-be-created SXes.
- */
- if ( tci->origState == SX_UNDEF ) {
- tmp = gnc_sx_get_instance_count( sx, NULL );
- gnc_sx_set_instance_count( sx, tmp+1 );
- if ( xaccSchedXactionHasOccurDef( sx ) ) {
- tmp = xaccSchedXactionGetRemOccur(sx);
- xaccSchedXactionSetRemOccur( sx, tmp-1 );
- }
- }
- }
-
- return toRet;
-}
-
-static
-gboolean
-sxsld_process_to_create_page( sxSinceLastData *sxsld )
-{
- GtkCTree *ct;
- GList *tcList, *tcInstList, *creation_errors;
- gboolean allVarsBound;
- toCreateTuple *tct;
- toCreateInstance *tci;
-
- ct = GTK_CTREE( glade_xml_get_widget( sxsld->gxml, TO_CREATE_LIST ) );
-
- /* First: check to make sure all TCTs are 'ready' [and return if not].
- * Second: create the entries based on the variable bindings. */
- tcList = sxsld->toCreateList;
- if ( tcList == NULL ) {
- DEBUG( "No transactions to create..." );
- return FALSE;
- }
-
- for ( ; tcList ; tcList = tcList->next ) {
- tct = (toCreateTuple*)tcList->data;
- for ( tcInstList = tct->instanceList;
- tcInstList;
- tcInstList = tcInstList->next ) {
- tci = (toCreateInstance*)tcInstList->data;
-
- if ( tci->state == SX_IGNORE
- || tci->state == SX_POSTPONE ) {
- continue;
- }
-
- allVarsBound = TRUE;
- g_hash_table_foreach( tci->varBindings,
- andequal_numerics_set,
- &allVarsBound );
- if ( !allVarsBound ) {
- char tmpBuf[ MAX_DATE_LENGTH+1 ];
- qof_print_gdate( tmpBuf, MAX_DATE_LENGTH, tci->date );
- /* FIXME: this should be better-presented to the user. */
- DEBUG( "SX %s on date %s still has unbound variables.",
- xaccSchedXactionGetName(tci->parentTCT->sx), tmpBuf );
- gtk_ctree_select( ct, tci->node );
- return TRUE;
- }
- }
- }
-
- /* At this point we can assume there are to-create transactions and
- * either the instances are being postponed/ignored, or all variables
- * are bound. */
-
- tcList = sxsld->toCreateList;
- g_assert( tcList != NULL );
-
- creation_errors = NULL;
- gnc_suspend_gui_refresh();
- for ( ; tcList ; tcList = tcList->next ) {
- tct = (toCreateTuple*)tcList->data;
-
- for ( tcInstList = tct->instanceList;
- tcInstList;
- tcInstList = tcInstList->next ) {
-
- tci = (toCreateInstance*)tcInstList->data;
- sxsld_process_to_create_instance(sxsld, tci, &creation_errors);
- }
- }
- gnc_resume_gui_refresh();
- if (g_list_length(creation_errors) > 0)
- {
- creation_errors_dialog(creation_errors);
- creation_errors_free(creation_errors);
- }
- return FALSE;
-}
-
-static
-gboolean
-to_create_next( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld;
- GnomeDruidPage *nextPg;
-
- sxsld = (sxSinceLastData*)ud;
-
- /* Do the actual work processing the page. */
- if ( sxsld_process_to_create_page( sxsld ) ) {
- return TRUE;
- }
-
- /* Figure out the next page, now, given the changes we've made above.
- * This will get us a fix for Bug#95734. */
- nextPg = gnc_sxsld_get_appropriate_page( sxsld,
- GNOME_DRUID_PAGE( druid_page ),
- FORWARD );
- /* We've made the "adjust buttons on disposition-change" fix
- * which will make this assertion true. */
- g_assert( nextPg != NULL );
- gnome_druid_set_page( sxsld->sincelast_druid, nextPg );
-
- return TRUE;
-}
-
-static void
-gnc_sxsld_finish( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
- GList *sxList, *toDelPtr, *elt;
- GtkCList *cl;
- gint row;
- toDeleteTuple *tdt;
-
- gtk_widget_hide( sxsld->sincelast_window );
-
- gnc_sxsld_commit_ledgers( sxsld );
-
- /* If we're finishing from the to-create page, then process the page
- * contents. */
- if ( druid_page ==
- GNOME_DRUID_PAGE( glade_xml_get_widget( sxsld->gxml,
- TO_CREATE_PG ) ) ) {
- DEBUG( "Stopped on to-create-pg" );
- sxsld_process_to_create_page( sxsld );
- }
-
- /* Deal with the selected obsolete list elts. */
- cl = GTK_CLIST( glade_xml_get_widget( sxsld->gxml,
- SX_OBSOLETE_CLIST ) );
-
- if ( g_list_length( cl->selection ) > 0 ) {
- SchedXactionDialog *sxd;
- sxList = gnc_book_get_schedxactions( gnc_get_current_book() );
-
- gnc_suspend_gui_refresh();
- for ( toDelPtr = cl->selection;
- toDelPtr;
- toDelPtr = toDelPtr->next ) {
-
- row = GPOINTER_TO_INT(toDelPtr->data);
- tdt = (toDeleteTuple*)gtk_clist_get_row_data( cl, row );
- elt = g_list_find( sxList, tdt->sx );
- sxList = g_list_remove_link( sxList, elt );
-
- xaccSchedXactionFree( (SchedXaction*)elt->data );
- }
- gnc_resume_gui_refresh();
-
- gnc_book_set_schedxactions( gnc_get_current_book(), sxList );
-
- sxd = (SchedXactionDialog*)
- gnc_find_first_gui_component(
- DIALOG_SCHEDXACTION_CM_CLASS, NULL, NULL );
- if ( sxd ) {
- gnc_sxd_list_refresh( sxd );
- }
- }
-
- sxsincelast_close_handler( sxsld );
-}
-
-static void
-restore_sx_temporal_state( gpointer key,
- gpointer value,
- gpointer user_data )
-{
- SchedXaction *sx;
- sxSinceLastData *sxsld;
-
- sxsld = (sxSinceLastData*)user_data;
-
- sx = (SchedXaction*)key;
- gnc_sx_revert_to_temporal_state( sx, (void*)value );
-}
-
-static gboolean
-cancel_check( GnomeDruidPage *druid_page,
- gpointer arg1, gpointer ud )
-{
- GList *l;
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
- char *lastrun_cancel_check_msg =
- _( "Canceling the Since-Last-Run dialog "
- "will revert all changes. "
- "Are you sure you want to lose all "
- "Scheduled Transaction changes?" );
-
- /* FIXME: This may now be a bug, as we might have changed the SX
- * states. */
- if ( g_list_length( sxsld->createdTxnGUIDList ) == 0 ) {
- /* There's nothing to cancel, so just do so... */
- return FALSE;
- }
-
- if ( !gnc_verify_dialog( sxsld->sincelast_window, TRUE,
- lastrun_cancel_check_msg ) ) {
- return TRUE;
- }
-
- /* Cancel policy:
- * . deleted SXes
- * . reborn
- * . created transactions
- * . deleted
- * . SXes reset
- * . auto-created transactions
- * . deleted
- * . SXes reset
- * . reminders -> created
- * . Trans deleted
- * . SXes reset
- * SXes reset [we use the temporal-state-data to take care of this]
- * . end_date || num_remain_instances
- * . last_occur_date
- */
-
- gnc_suspend_gui_refresh();
-
- /* destroy created transactions */
- if ( g_list_length( sxsld->createdTxnGUIDList ) > 0 ) {
- Transaction *t = NULL;
- for ( l = sxsld->createdTxnGUIDList; l; l = l->next ) {
- t = xaccTransLookup( (GUID*)l->data,
- gnc_get_current_book() );
- /* we used to assert, but since we allow the user a
- * register, they may have deleted 't' from their
- * view. Thus, if we can't find it, don't die; fixes
- * Bug#103182. */
- if ( t != NULL )
- {
- xaccTransBeginEdit( t );
- xaccTransDestroy( t );
- xaccTransCommitEdit( t );
- t = NULL;
- }
- }
- }
-
- /* Remove postponed SXes from their postponed lists, unless they were
- * originally postponed. */
- {
- GList *tcList, *tciList;
- toCreateTuple *tct;
- toCreateInstance *tci;
-
- for ( tcList = sxsld->toCreateList;
- tcList;
- tcList = tcList->next ) {
- tct = (toCreateTuple*)tcList->data;
- for ( tciList = tct->instanceList;
- tciList;
- tciList = tciList->next ) {
- tci = (toCreateInstance*)tciList->data;
- if ( tci->prevState == SX_POSTPONE
- && tci->origState != SX_POSTPONE ) {
- /* Any valid [non-null] 'prevState !=
- * SX_POSTPONE' sx temporal state
- * pointers will be destroyed at the
- * destruction of the dialog [the
- * non-cancel case], so if we need to
- * deal with those here, we should do
- * so.
- */
- gnc_sx_remove_defer_instance( tct->sx, tci->sxStateData );
- gnc_sx_destroy_temporal_state( tci->sxStateData );
- tci->sxStateData = NULL;
- }
- }
- }
- }
-
- /* Restore the temporal state of all SXes.
- * This is in sxInitStates [a bunch of opaque void *'s ... which
- * should be freed when we're done to prevent a memory leak.] */
- g_hash_table_foreach( sxsld->sxInitStates,
- restore_sx_temporal_state,
- (gpointer)sxsld );
- /* This will get destroyed when the dialog is, which will happen
- * shortly after this return. */
-
- gnc_resume_gui_refresh();
- return FALSE;
-}
-
-
-static void
-sxsincelast_init( sxSinceLastData *sxsld )
-{
- GtkWidget *w;
- GObject *o;
- GnomeDruidPage *nextPage;
- GList *creation_errors;
- int i;
- static widgetSignalHandlerTuple widgets[] = {
- { SINCELAST_DRUID, "cancel", sxsincelast_druid_cancelled },
-
- { REMINDER_LIST, "tree-select-row", sxsld_remind_row_toggle },
- { REMINDER_LIST, "tree-unselect-row", sxsld_remind_row_toggle },
-
- { TO_CREATE_LIST, "tree-select-row", sxsincelast_tc_row_sel },
- { TO_CREATE_LIST, "tree-unselect-row", sxsincelast_tc_row_unsel },
-
- { SX_OBSOLETE_CLIST, "select-row", sxsld_obsolete_row_toggle },
- { SX_OBSOLETE_CLIST, "unselect-row", sxsld_obsolete_row_toggle },
-
- { SELECT_ALL_BUTTON, "clicked",
- sx_obsolete_select_all_clicked },
- { UNSELECT_ALL_BUTTON, "clicked",
- sx_obsolete_unselect_all_clicked },
-
- { NULL, NULL, NULL }
- };
-
- static druidSignalHandlerTuple pages[] = {
- { WHAT_TO_DO_PG,
- whattodo_prep, NULL, NULL,
- NULL, cancel_check },
-
- { REMINDERS_PG,
- reminders_prep, reminders_back, reminders_next,
- gnc_sxsld_finish, cancel_check },
-
- { AUTO_CREATE_NOTIFY_PG,
- auto_create_prep, auto_create_back, auto_create_next,
- gnc_sxsld_finish, cancel_check },
-
- { TO_CREATE_PG,
- to_create_prep, gen_back, to_create_next,
- gnc_sxsld_finish, cancel_check },
-
- { CREATED_PG,
- created_prep, created_back, created_next,
- gnc_sxsld_finish, cancel_check },
-
- { OBSOLETE_PG,
- obsolete_prep, gen_back, gen_next,
- gnc_sxsld_finish, cancel_check },
-
- { COMMIT_PG,
- commit_prep, gen_back, gen_next,
- gnc_sxsld_finish, cancel_check },
-
- { NULL, NULL, NULL, NULL, NULL, NULL }
- };
-
- static const struct optionMenuTuple {
- char *name;
- void (*fn)();
- } optionMenus[] = {
- { SX_DISPOSITION_OPT, sxsld_disposition_changed },
- { NULL, NULL }
- };
-
-
- gnc_register_gui_component( DIALOG_SXSINCELAST_CM_CLASS,
- NULL,
- sxsincelast_close_handler,
- sxsld->sincelast_window );
-
- g_signal_connect( G_OBJECT(sxsld->sincelast_window), "destroy",
- G_CALLBACK( sxsincelast_destroy ), sxsld );
-
- dialog_widgets_attach_handlers(sxsld->gxml, widgets, sxsld);
- druid_pages_attach_handlers( sxsld->gxml, pages, sxsld );
-
- /* gnc-init the option menu[s]. */
- for ( i=0; optionMenus[i].name != NULL; i++ ) {
- w = glade_xml_get_widget( sxsld->gxml, optionMenus[i].name );
- gnc_option_menu_init( w );
- o = G_OBJECT(gtk_option_menu_get_menu(GTK_OPTION_MENU(w)));
- g_signal_connect( o, "selection-done",
- G_CALLBACK( optionMenus[i].fn ),
- sxsld );
- }
-
- /* set all to-create clist columns to auto-resize. */
- w = glade_xml_get_widget( sxsld->gxml, TO_CREATE_LIST );
- clist_set_all_cols_autoresize(GTK_CLIST(w), TO_CREATE_LIST_WIDTH);
- w = glade_xml_get_widget( sxsld->gxml, REMINDER_LIST );
- clist_set_all_cols_autoresize(GTK_CLIST(w), REMINDER_LIST_WIDTH);
- w = glade_xml_get_widget( sxsld->gxml, SX_OBSOLETE_CLIST );
- clist_set_all_cols_autoresize(GTK_CLIST(w), SX_OBSOLETE_CLIST_WIDTH);
-
- sxsld->prog = GTK_PROGRESS_BAR(glade_xml_get_widget( sxsld->gxml,
- WHAT_TO_DO_PROGRESS ));
-
- sxsld->toCreateStatus =
- GTK_STATUSBAR(
- glade_xml_get_widget( sxsld->gxml, TO_CREATE_STATUS ) );
- sxsld->statusCtxId =
- gtk_statusbar_get_context_id( sxsld->toCreateStatus,
- /* Sure, we're overusing this
- * string, but I don't see why
- * the Statusbar even
- * cares... */
- TO_CREATE_STATUS );
-
- /* The last druid page is blank without this call. */
- gtk_widget_show_all( sxsld->sincelast_window );
-
- create_autoCreate_ledger( sxsld );
- create_created_ledger( sxsld );
- create_to_create_ledger( sxsld );
-
- gnc_restore_window_size(GCONF_SECTION, GTK_WINDOW(sxsld->sincelast_window));
-
- /* Do not call show_all here. Screws up the gtkuimanager code */
- gtk_widget_show( sxsld->sincelast_window );
-
- creation_errors = NULL;
- process_auto_create_list(sxsld->autoCreateList, sxsld, &creation_errors);
- if (g_list_length(creation_errors) > 0)
- {
- creation_errors_dialog(creation_errors);
- creation_errors_free(creation_errors);
- }
-
- w = glade_xml_get_widget( sxsld->gxml, WHAT_TO_DO_PG );
- nextPage = gnc_sxsld_get_appropriate_page( sxsld,
- GNOME_DRUID_PAGE(w),
- FORWARD );
-
- /* If there's nowhere to go, then we shouldn't have been started at
- * all [ie., ..._populate should have returned FALSE]. */
- g_assert( nextPage );
-
- gnome_druid_set_page( sxsld->sincelast_druid, nextPage );
-}
-
-static
-void
-sxsincelast_save_size( sxSinceLastData *sxsld )
-{
- gnc_save_window_size( GCONF_SECTION, GTK_WINDOW(sxsld->sincelast_window) );
-}
-
-static void
-generate_instances(SchedXaction *sx,
- GDate *end,
- GDate *reminderEnd,
- GList **instanceList,
- GList **reminderList,
- GList **deadList)
-{
- GDate gd;
- toCreateInstance *tci;
- reminderTuple *rt;
- reminderInstanceTuple *rit;
- void *seqStateData;
-
- g_assert( g_date_valid(end) );
- g_assert( g_date_valid(reminderEnd) );
-
- g_date_clear(&gd, 1);
-
- /* Process valid next instances. */
- seqStateData = gnc_sx_create_temporal_state( sx );
- //gd = xaccSchedXactionGetNextInstance( sx, seqStateData );
- gd = xaccSchedXactionGetInstanceAfter( sx, &gd, seqStateData );
- while ( g_date_valid(&gd)
- && g_date_compare( &gd, end ) <= 0 ) {
-
- tci = g_new0( toCreateInstance, 1 );
-
- tci->dirty = FALSE;
- tci->date = g_date_new();
- *tci->date = gd;
- tci->origState = SX_UNDEF;
- tci->state = SX_TO_CREATE;
- tci->prevState = SX_UNDEF;
- tci->sxStateData =
- gnc_sx_clone_temporal_state( seqStateData );
- *instanceList = g_list_append( *instanceList, tci );
-
- gnc_sx_incr_temporal_state( sx, seqStateData );
- gd = xaccSchedXactionGetInstanceAfter( sx, &gd, seqStateData );
- }
-
- /* Process reminder instances or add to dead list [if we have one] */
- if ( g_date_valid( &gd ) ) {
- rt = g_new0( reminderTuple, 1 );
- rt->sx = sx;
- rt->instanceList = NULL;
- while ( g_date_valid(&gd)
- && g_date_compare( &gd, reminderEnd ) <= 0 ) {
-
- rit = g_new0( reminderInstanceTuple, 1 );
- rit->endDate = g_date_new();
- *rit->endDate = *end;
- rit->occurDate = g_date_new();
- *rit->occurDate = gd;
- rit->isSelected = FALSE;
- rit->parentRT = rt;
- rit->sxStateData =
- gnc_sx_clone_temporal_state( seqStateData );
- rt->instanceList = g_list_append( rt->instanceList, rit );
-
- gnc_sx_incr_temporal_state( sx, seqStateData );
- gd = xaccSchedXactionGetInstanceAfter( sx, &gd, seqStateData );
- }
- if ( rt->instanceList != NULL ) {
- *reminderList = g_list_append( *reminderList, rt );
- } else {
- g_free( rt );
- }
- rt = NULL;
- } else if ( deadList ) {
- toDeleteTuple *tdt;
-
- tdt = g_new0( toDeleteTuple, 1 );
- tdt->sx = sx;
- tdt->endDate = g_date_new();
- *tdt->endDate = gd;
- *deadList = g_list_append( *deadList, tdt );
- } /* else { this else intentionally left blank: drop the SX on the
- * floor at this point. } */
-
- gnc_sx_destroy_temporal_state( seqStateData );
- seqStateData = NULL;
-}
-
-static void
-_free_varBindings_hash_elts( gpointer key, gpointer value, gpointer data )
-{
- g_assert( key );
- g_free( key );
- if ( value )
- g_free( value );
-}
-
-static void
-process_auto_create_list(GList *autoCreateList, sxSinceLastData *sxsld, GList **creation_errors)
-{
- GList *l;
- toCreateTuple *tct;
- toCreateInstance *tci;
- GList *instances;
-
- gnc_suspend_gui_refresh();
-
- for ( ; autoCreateList ; autoCreateList = autoCreateList->next ) {
- tct = (toCreateTuple*)autoCreateList->data;
-
- for ( instances = tct->instanceList;
- instances;
- instances = instances->next ) {
- tci = (toCreateInstance*)instances->data;
- sxsld->autoCreatedCount +=
- sxsld_process_to_create_instance( sxsld, tci, creation_errors );
- }
- }
- gnc_resume_gui_refresh();
-}
-
-static
-void
-add_to_create_list_to_gui( GList *toCreateList, sxSinceLastData *sxsld )
-{
- toCreateTuple *tct;
- toCreateInstance *tci;
- GtkCTree *ct;
- GtkCTreeNode *sxNode;
- GtkCTreeNode *firstToBeProcessedRow;
- char *rowText[ TO_CREATE_LIST_WIDTH ];
- GList *insts;
-
- ct = GTK_CTREE( glade_xml_get_widget( sxsld->gxml, TO_CREATE_LIST ) );
-
- firstToBeProcessedRow = NULL;
- for ( ; toCreateList ; toCreateList = toCreateList->next ) {
- tct = (toCreateTuple*)toCreateList->data;
-
- rowText[0] = xaccSchedXactionGetName( tct->sx );
- rowText[1] = "";
-
- sxNode = gtk_ctree_insert_node( ct, NULL, NULL,
- rowText,
- 0, NULL, NULL, NULL, NULL,
- FALSE, TRUE );
-
- for ( insts = tct->instanceList;
- insts;
- insts = insts->next ) {
- gboolean allVarsBound = FALSE;
-
- tci = (toCreateInstance*)insts->data;
-
- /* tct->{sx,date} are already filled in. */
- if ( ! tci->varBindings ) {
- tci->varBindings = g_hash_table_new( g_str_hash,
- g_str_equal );
-
- sxsl_get_sx_vars( tci->parentTCT->sx,
- tci->varBindings );
- }
-
- rowText[0] = g_new0( char, MAX_DATE_LENGTH+1 );
- qof_print_gdate( rowText[0], MAX_DATE_LENGTH, tci->date );
-
-
- switch ( tci->state ) {
- case SX_TO_CREATE:
- allVarsBound = TRUE;
- g_hash_table_foreach( tci->varBindings,
- andequal_numerics_set,
- &allVarsBound );
- rowText[1] = ( allVarsBound
- ? _( "Ready to create" ) /* READY_TEXT */
- : _( "Needs values for variables" ) /* NEEDS_BINDINGS_TEXT */
- );
- break;
- case SX_IGNORE:
- rowText[1] = _( "Ignored" ) /* IGNORE_TEXT */ ;
- break;
- case SX_POSTPONE:
- rowText[1] = _( "Postponed" ) /* POSTPONE_TEXT */ ;
- break;
- default:
- g_assert( FALSE );
- }
-
- tci->node = gtk_ctree_insert_node( ct, sxNode, NULL,
- rowText,
- 0, NULL, NULL, NULL, NULL,
- TRUE, FALSE );
- if ( !allVarsBound && !firstToBeProcessedRow ) {
- firstToBeProcessedRow = tci->node;
- }
- gtk_ctree_node_set_row_data( ct, tci->node, tci );
- g_free( rowText[0] );
- }
- }
-
- /* Setup the first thing to be processed, or disable controls. */
- if ( firstToBeProcessedRow ) {
- gtk_ctree_select( ct, firstToBeProcessedRow );
- sxsld_set_sensitive_tci_controls( sxsld, TRUE );
- } else {
- sxsld_set_sensitive_tci_controls( sxsld, FALSE );
- }
-}
-
-static
-void
-add_reminders_to_gui( GList *reminderList, sxSinceLastData *sxsld )
-{
- GtkCTree *ctree;
- GtkCTreeNode *sxNode, *instNode;
- char *rowText[REMINDER_LIST_WIDTH];
- reminderTuple *rt;
- GList *instances;
- reminderInstanceTuple *rit;
- FreqSpec *fs;
- GString *freqSpecStr;
-
- ctree = GTK_CTREE( glade_xml_get_widget( sxsld->gxml,
- REMINDER_LIST ) );
-
- for ( ; reminderList; reminderList = reminderList->next ) {
- rt = (reminderTuple*)reminderList->data;
-
- rowText[0] = xaccSchedXactionGetName( rt->sx );
- fs = xaccSchedXactionGetFreqSpec( rt->sx );
- freqSpecStr = g_string_sized_new( 16 );
- xaccFreqSpecGetFreqStr( fs, freqSpecStr );
- rowText[1] = freqSpecStr->str;
- rowText[2] = ""; /* Days Away */
- sxNode = gtk_ctree_insert_node( ctree, NULL, NULL, rowText,
- 0, /* spacing */
- NULL, NULL, NULL, NULL, /* pixmaps */
- FALSE, /* leafP */
- TRUE ); /* expandedP */
- g_string_free( freqSpecStr, TRUE );
-
- /* The SX node itself isn't selectable; only the
- * instances. */
- gtk_ctree_node_set_selectable( ctree, sxNode, FALSE );
- for ( instances = rt->instanceList;
- instances;
- instances = instances->next ) {
- rit = (reminderInstanceTuple*)instances->data;
-
- rowText[0] = g_new0( gchar, MAX_DATE_LENGTH+1 );
- qof_print_gdate( rowText[0], MAX_DATE_LENGTH, rit->occurDate );
- rowText[1] = "";
- rowText[2] = g_new0( gchar, 5 ); /* FIXME: appropriate size? */
- sprintf( rowText[2], "%d",
- (g_date_get_julian(rit->occurDate)
- - g_date_get_julian(rit->endDate)) );
-
- instNode = gtk_ctree_insert_node( ctree, sxNode, NULL,
- rowText,
- 0, NULL, NULL, NULL, NULL,
- TRUE, TRUE );
- gtk_ctree_node_set_row_data( ctree,
- instNode,
- (gpointer)rit );
- g_signal_handlers_block_by_func( G_OBJECT(ctree),
- sxsld_remind_row_toggle,
- sxsld );
- if ( rit->isSelected ) {
- gtk_ctree_select( ctree, instNode );
- }
- g_signal_handlers_unblock_by_func( G_OBJECT(ctree),
- sxsld_remind_row_toggle,
- sxsld );
- g_free( rowText[0] );
- g_free( rowText[2] );
- }
- }
-}
-
-static void
-add_dead_list_to_gui(GList *removeList, sxSinceLastData *sxsld)
-{
- GtkCList *cl;
- char *rowtext[3];
- int row;
- GString *tmp_str;
- toDeleteTuple *tdt;
- FreqSpec *fs;
- cl = GTK_CLIST( glade_xml_get_widget( sxsld->gxml,
- SX_OBSOLETE_CLIST ));
-
- tmp_str = g_string_new(NULL);
- rowtext[2] = g_strdup( _("Obsolete") );
-
- gtk_clist_freeze( cl );
- gtk_clist_clear( cl );
- g_signal_handlers_block_by_func( G_OBJECT(cl),
- sxsld_obsolete_row_toggle,
- sxsld );
-
- for ( row = 0; removeList;
- row++, removeList = removeList->next ) {
- tdt = (toDeleteTuple*)removeList->data;
-
- rowtext[0] = xaccSchedXactionGetName( tdt->sx );
-
- fs = xaccSchedXactionGetFreqSpec( tdt->sx );
- xaccFreqSpecGetFreqStr( fs, tmp_str );
- /* XXX are we leaking memory here, by not
- * freeing previous rrowtext[1] ?? */
- rowtext[1] = tmp_str->str;
-
- gtk_clist_insert( cl, row, rowtext );
- gtk_clist_set_row_data( cl, row, tdt );
- if ( tdt->isSelected ) {
- gtk_clist_select_row( cl, row, 0 );
- }
- }
- g_signal_handlers_unblock_by_func( G_OBJECT(cl),
- sxsld_obsolete_row_toggle,
- sxsld );
- gtk_clist_thaw( cl );
-
- g_string_free(tmp_str, TRUE);
- g_free(rowtext[2]);
-}
-
-/**
- * Moves the selected reminders to the appropriate [auto-create or to-create]
- * sections of the since-last-run dialog.
- **/
-static void
-processSelectedReminderList( GList *goodList, sxSinceLastData *sxsld )
-{
- GList *list = NULL;
- GList **containingList;
- reminderInstanceTuple *rit;
- toCreateTuple *tct;
- toCreateInstance *tci;
- gboolean autoCreateOpt, notifyOpt;
-
- tct = NULL;
- for ( ; goodList ; goodList = goodList->next ) {
- rit = (reminderInstanceTuple*)goodList->data;
-
- /* skip over reminders we've already created [in the
- * past]. */
- if ( rit->resultantTCI )
- continue;
-
- xaccSchedXactionGetAutoCreate( rit->parentRT->sx,
- &autoCreateOpt, ¬ifyOpt );
- containingList = ( autoCreateOpt
- ? &sxsld->autoCreateList
- : &sxsld->toCreateList );
- for ( list = *containingList;
- list;
- list = list->next ) {
- tct = (toCreateTuple*)list->data;
- /* Find any already-existing toCreateTuples to add to...*/
- if ( tct->sx == rit->parentRT->sx ) {
- break;
- }
- }
- if ( !list ) {
- tct = g_new0( toCreateTuple, 1 );
- tct->sx = rit->parentRT->sx;
- *containingList =
- g_list_append( *containingList, tct );
- }
-
- tci = g_new0( toCreateInstance, 1 );
- tci->dirty = FALSE;
- tci->parentTCT = tct;
- tci->date = g_date_new();
- *tci->date = *rit->occurDate;
- tci->state = SX_TO_CREATE;
- tci->prevState = SX_UNDEF;
- tci->origState = SX_UNDEF;
- tci->varBindings = NULL;
- tci->node = NULL;
- tci->sxStateData = rit->sxStateData;
-
- tct->instanceList =
- g_list_append( tct->instanceList, tci );
-
- /* special auto-create-opt processing; process it now. */
- if ( autoCreateOpt ) {
- GList *creation_errors = NULL;
- list = NULL;
- list = g_list_append( list, tct );
- process_auto_create_list( list, sxsld, &creation_errors );
- list = NULL;
- }
-
- /* save the resultant just-created TCI in the RIT in case
- * things change later. */
- rit->resultantTCI = tci;
- }
-}
-
-/**
- * @see gnc_ui_sxsincelast_dialog_create for the return value definition.
- **/
-static
-gint
-sxsincelast_populate( sxSinceLastData *sxsld )
-{
- int toRet = 0;
- gboolean onlyNoNotify = TRUE;
- GList *sxList, *instanceList, *l, **containingList;
- SchedXaction *sx;
- GDate end, endPlusReminders;
- gint daysInAdvance;
- gboolean autocreateState, notifyState;
- toCreateTuple *tct;
- toCreateInstance *tci;
-
- instanceList = NULL;
- sxList = gnc_book_get_schedxactions( gnc_get_current_book () );
-
- if ( sxList == NULL ) {
- DEBUG( "No scheduled transactions to populate." );
- return toRet;
- }
-
- for ( ; sxList; sxList = sxList->next ) {
- sx = (SchedXaction*)sxList->data;
-
- /* Store initial state of SX. */
- if ( g_hash_table_lookup( sxsld->sxInitStates, sx )
- != NULL ) {
- PERR( "Why are we able to find a SX initial state "
- "hash entry for something we're seeing for "
- "the first time?" );
- return toRet;
- }
- {
- void *sx_state;
- sx_state = gnc_sx_create_temporal_state( sx );
- g_hash_table_insert( sxsld->sxInitStates,
- sx, sx_state );
- sx_state = NULL;
- }
-
- g_date_set_time_t( &end, time(NULL) );
- daysInAdvance = xaccSchedXactionGetAdvanceCreation( sx );
- g_date_add_days( &end, daysInAdvance );
-
- endPlusReminders = end;
- daysInAdvance = xaccSchedXactionGetAdvanceReminder(sx);
- g_date_add_days(&endPlusReminders, daysInAdvance);
-
- /* Handle postponed instances.
- *
- * Postponed instances, by definition, are always at the
- * front of the instance list. As well, they're always valid
- * instances [not reminders]. */
-
- /* FIXME: postponed instances _may_ create an obsolete
- * instance. */
- {
- GList *postponed, *l;
-
- postponed = gnc_sx_get_defer_instances( sx );
-
- for ( l = postponed; l; l = l->next ) {
- onlyNoNotify = FALSE;
-
- tci = g_new0( toCreateInstance, 1 );
- tci->sxStateData = (void*)l->data;
- tci->date = g_date_new();
- *tci->date =
- xaccSchedXactionGetNextInstance(
- sx, tci->sxStateData );
- tci->dirty = FALSE;
- tci->state = SX_POSTPONE;
- tci->prevState = SX_POSTPONE;
- tci->origState = SX_POSTPONE;
-
- instanceList = g_list_append( instanceList, tci );
- tci = NULL;
- }
-
- }
-
- generate_instances(sx,
- &end,
- &endPlusReminders,
- &instanceList,
- &sxsld->reminderList,
- &sxsld->toRemoveList);
-
- if (instanceList == NULL)
- continue;
-
- xaccSchedXactionGetAutoCreate(sx, &autocreateState, ¬ifyState);
- /* Figure out the appropriate list to place the new TCT on. */
- containingList = ( autocreateState
- ? &sxsld->autoCreateList
- : &sxsld->toCreateList );
-
- tct = g_new0( toCreateTuple, 1 );
- tct->sx = sx;
- for ( l = instanceList ; l; l = l->next ) {
-
- /* only count the no-notify txns for this. */
- if ( autocreateState && !notifyState ) {
- onlyNoNotify &= (!notifyState);
- toRet++;
- }
-
- tci = (toCreateInstance*)l->data;
- tci->parentTCT = tct;
-
- tct->instanceList =
- g_list_append( tct->instanceList, tci );
- }
-
- g_list_free( instanceList );
- instanceList = NULL;
-
- /* abstractly place the TCT onto the afore-determined list. */
- *containingList = g_list_append( *containingList, tct );
- }
-
- /* Return appropriately. */
- {
- gboolean stuffToDo =
- ( g_list_length( sxsld->toRemoveList ) > 0
- || g_list_length( sxsld->reminderList ) > 0
- || g_list_length( sxsld->toCreateList ) > 0 );
- if ( onlyNoNotify && !stuffToDo ) {
- toRet = -(toRet);
- }
-
- if ( toRet == 0
- && ( stuffToDo
- || g_list_length( sxsld->autoCreateList ) > 0 ) ) {
- toRet = INT_MAX;
- }
- }
-
- /* if we're about to return a negative value [indicating only
- * auto-create no-notify txns], then actually create them. */
- if ( toRet < 0 ) {
- GList *creation_errors = NULL;
- process_auto_create_list( sxsld->autoCreateList, sxsld, &creation_errors );
- if (g_list_length(creation_errors) > 0)
- {
- creation_errors_dialog(creation_errors);
- creation_errors_free(creation_errors);
- }
- }
-
- return toRet;
-}
-
-static void
-sxsincelast_close_handler( gpointer ud )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- gtk_widget_hide( sxsld->sincelast_window );
- sxsincelast_save_size( sxsld );
- gtk_widget_destroy( sxsld->sincelast_window );
- /* The data will be cleaned up in the destroy handler. */
-}
-
-static void
-andequal_numerics_set( gpointer key, gpointer value, gpointer data )
-{
- gboolean *allVarsBound = data;
- if ( strcmp( (gchar*)key, "i" ) == 0 ) {
- return;
- }
- *allVarsBound &= (value != NULL);
-}
-
-static void
-sxsincelast_entry_changed( GtkEditable *e, gpointer ud )
-{
- sxSinceLastData *sxsld;
- gchar *varName;
- toCreateInstance *tci;
- gchar *entryText;
- gnc_numeric *num, *ourNum;
- GHashTable *dummyVarHash;
- static const int MSG_BUF_LEN = 127;
- char msgBuf[MSG_BUF_LEN+1];
-
- sxsld = (sxSinceLastData*)ud;
-
- tci = (toCreateInstance*)g_object_get_data( G_OBJECT(e), "tci" );
- g_assert( tci == sxsld->curSelTCI );
-
- varName = (gchar*)g_object_get_data( G_OBJECT(e), "varName" );
- num = (gnc_numeric*)g_object_get_data( G_OBJECT(e), "numeric" );
- entryText = gtk_editable_get_chars( e, 0, -1 );
- dummyVarHash = g_hash_table_new( NULL, NULL );
- /* FIXME?: Should be using xaccParseAmount instead of
- * parser_parse_separate_vars? */
- gtk_statusbar_pop( sxsld->toCreateStatus, sxsld->statusCtxId );
-
- if ( !gnc_exp_parser_parse_separate_vars( entryText, num,
- NULL, dummyVarHash ) ) {
- num = NULL;
- if ( entryText != NULL
- && strlen(entryText) > 0 ) {
- snprintf( msgBuf, MSG_BUF_LEN,
- "error parsing entry near \"%s\"", entryText );
- gtk_statusbar_push( sxsld->toCreateStatus,
- sxsld->statusCtxId,
- msgBuf );
- }
- } else if ( g_hash_table_size( dummyVarHash ) != 0 ) {
- num = NULL;
- snprintf( msgBuf, MSG_BUF_LEN,
- "No new variables allowed in "
- "expression \"%s\"", entryText );
- gtk_statusbar_push( sxsld->toCreateStatus,
- sxsld->statusCtxId,
- msgBuf );
- } else if ( gnc_numeric_check( *num ) != GNC_ERROR_OK ) {
- snprintf( msgBuf, MSG_BUF_LEN,
- "Entry \"%s\" is not "
- "parseable", entryText );
- gtk_statusbar_push( sxsld->toCreateStatus,
- sxsld->statusCtxId,
- msgBuf );
- num = NULL;
- } else {
- snprintf( msgBuf, MSG_BUF_LEN,
- "%f", gnc_numeric_to_double( *num ) );
- gtk_statusbar_push( sxsld->toCreateStatus,
- sxsld->statusCtxId,
- msgBuf );
- }
-
- g_hash_table_foreach( dummyVarHash,
- _free_varBindings_hash_elts,
- NULL );
- g_hash_table_destroy( dummyVarHash );
-
- {
- gpointer maybeKey, maybeValue;
-
- ourNum = NULL;
- if ( num ) {
- ourNum = g_new0( gnc_numeric, 1 );
- *ourNum = *num;
- }
- if ( g_hash_table_lookup_extended( tci->varBindings, varName,
- &maybeKey, &maybeValue ) ) {
- g_hash_table_remove( tci->varBindings, maybeKey );
- /* only if not null. */
- if ( maybeValue ) {
- g_free( maybeValue );
- }
- }
- g_hash_table_insert( tci->varBindings, varName, ourNum );
- tci->dirty = TRUE;
- }
-
-
- {
- GtkCTree *ct;
- gboolean allVarsBound = TRUE;
-
- /* If there are no un-bound variables, then set the 'ready-to-go'
- flag to 'y'. */
- g_hash_table_foreach( tci->varBindings,
- andequal_numerics_set,
- &allVarsBound );
- ct = GTK_CTREE(glade_xml_get_widget( sxsld->gxml, TO_CREATE_LIST ));
- gtk_ctree_node_set_text( ct, tci->node, 1,
- ( allVarsBound
- ? _( READY_TEXT )
- : _( NEEDS_BINDINGS_TEXT ) ) );
- }
-}
-
-static void
-sxsincelast_destroy( GtkObject *o, gpointer ud )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)ud;
-
- /* appropriate place to destroy data structures */
- clean_sincelast_data( sxsld );
-
- gnc_embedded_window_close_page(sxsld->ac_window, sxsld->ac_register);
- gtk_widget_destroy(GTK_WIDGET(sxsld->ac_window));
- sxsld->ac_window = NULL;
- sxsld->ac_register = NULL;
- sxsld->ac_ledger = NULL;
-
- gnc_embedded_window_close_page(sxsld->created_window,
- sxsld->created_register);
- gtk_widget_destroy(GTK_WIDGET(sxsld->created_window));
- sxsld->created_window = NULL;
- sxsld->created_register = NULL;
- sxsld->created_ledger = NULL;
-
- gnc_embedded_window_close_page(sxsld->to_create_window,
- sxsld->to_create_register);
- gtk_widget_destroy(GTK_WIDGET(sxsld->to_create_window));
- sxsld->to_create_window = NULL;
- sxsld->to_create_register = NULL;
- sxsld->to_create_ledger = NULL;
-
- gnc_unregister_gui_component_by_data( DIALOG_SXSINCELAST_CM_CLASS,
- sxsld->sincelast_window );
-
- g_free( sxsld );
-}
-
-/**
- * Used to copy the varBinding GHashTable.
- **/
-static
-void
-gnc_sxsl_copy_ea_hash( gpointer key,
- gpointer value,
- gpointer user_data )
-{
- gchar *name = (gchar*)key;
- gnc_numeric *val = (gnc_numeric*)value;
- gnc_numeric *newVal;
- GHashTable *table = (GHashTable*)user_data;
-
- newVal = g_new0( gnc_numeric, 1 );
- *newVal = gnc_numeric_error( -2 );
- if ( val )
- *newVal = *val;
-
- g_assert( name );
-
- g_hash_table_insert( table,
- (gpointer)g_strdup( name ),
- (gpointer)newVal );
-}
-
-static
-void
-gnc_sxsl_del_vars_table_ea( gpointer key,
- gpointer value,
- gpointer user_data )
-{
- g_assert( key );
- if ( key )
- g_free( (gchar*)key );
- if ( value )
- g_free( (gnc_numeric*)value );
-}
-
-static gint
-create_each_transaction_helper( Transaction *t, void *d )
-{
- Transaction *newT;
- GList *sList;
- GList *osList;
- Split *split;
- kvp_frame *split_kvpf;
- kvp_value *kvp_val;
- gboolean errFlag;
- createData *createUD;
- toCreateInstance *tci;
- gnc_commodity *first_cmdty = NULL;
- GHashTable *actualVars;
- gnc_numeric *varIValue;
-
- errFlag = FALSE;
-
- /* FIXME: In general, this should [correctly] deal with errors such
- as not finding the approrpiate Accounts and not being able to
- parse the formula|credit/debit strings. */
-
- /* FIXME: when we copy the trans_onto_trans, we don't want to copy
- the Split's kvp_frames... */
-
- createUD = (createData*)d;
- tci = createUD->tci;
-
- newT = xaccMallocTransaction(gnc_get_current_book ());
- xaccTransBeginEdit( newT );
- /* the action and description/memo are in the template */
- gnc_copy_trans_onto_trans( t, newT, FALSE, FALSE );
-
- xaccTransSetDate( newT,
- g_date_get_day( tci->date ),
- g_date_get_month( tci->date ),
- g_date_get_year( tci->date ) );
-
- /* the accounts and amounts are in the kvp_frames of the splits. */
- osList = xaccTransGetSplitList( t );
- sList = xaccTransGetSplitList( newT );
- if ( (osList == NULL) || (sList == NULL) ) {
- PERR( "\tseen transaction w/o splits. :(" );
- xaccTransDestroy( newT );
- xaccTransCommitEdit( newT );
- return 13;
- }
-
- /* Setup the predefined variables for credit/debit formula
- * processing. */
- actualVars = g_hash_table_new( g_str_hash, g_str_equal );
- if ( tci->varBindings != NULL ) {
- g_hash_table_foreach( tci->varBindings,
- gnc_sxsl_copy_ea_hash, actualVars );
- }
- varIValue = g_new0( gnc_numeric, 1 );
- *varIValue =
- gnc_numeric_create(
- gnc_sx_get_instance_count( tci->parentTCT->sx,
- tci->sxStateData ),
- 1 );
- /* It's really important that we strdup "i" here, so we can
- * generically cleanup with a simple 'foreach' that blindly frees the
- * keys, below. */
- g_hash_table_insert( actualVars, g_strdup("i"), varIValue );
-
- for ( ; sList && osList; sList = sList->next, osList = osList->next)
- {
- Account *acct;
- gnc_commodity *split_cmdty = NULL;
-
- split = (Split*)sList->data;
-
- /* FIXME: Ick. This assumes that the split lists will be
- ordered identically. :( I think it's fair to say they
- will, but I'd rather not have to count on it. --jsled */
- split_kvpf = xaccSplitGetSlots( (Split*)osList->data );
-
- /* from-transaction of splits */
- /* This needs to be before the value setting [below] so the
- * balance calculations can work. */
- {
- GUID *acct_guid;
- /* contains the guid of the split's actual account. */
- kvp_val = kvp_frame_get_slot_path( split_kvpf,
- GNC_SX_ID,
- GNC_SX_ACCOUNT,
- NULL );
- if (kvp_val == NULL) {
- GString *err = g_string_new("");
- g_string_printf(err, "Null account kvp value for SX [%s], cancelling creation.",
- xaccSchedXactionGetName(createUD->tci->parentTCT->sx));
- *createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
- errFlag = TRUE;
- break;
- }
- acct_guid = kvp_value_get_guid( kvp_val );
- acct = xaccAccountLookup( acct_guid, gnc_get_current_book ());
- if (acct == NULL)
- {
- const char *guidStr;
- GString *err;
- guidStr = guid_to_string((const GUID*)acct_guid);
- err = g_string_new("");
- g_string_printf(err, "Unknown account for guid [%s], cancelling SX [%s] creation.",
- guidStr, xaccSchedXactionGetName(createUD->tci->parentTCT->sx));
- g_free((char*)guidStr);
- *createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
- errFlag = TRUE;
- break;
- }
-
- split_cmdty = xaccAccountGetCommodity(acct);
- if (first_cmdty == NULL)
- {
- first_cmdty = split_cmdty;
- xaccTransSetCurrency(newT, first_cmdty);
- }
-
- xaccAccountBeginEdit(acct);
- xaccAccountInsertSplit(acct, split);
- }
-
- /* credit/debit formulas */
- {
- char *str, *parseErrorLoc;
- gnc_numeric credit_num, debit_num, final;
- int gncn_error;
-
- kvp_val = kvp_frame_get_slot_path( split_kvpf,
- GNC_SX_ID,
- GNC_SX_CREDIT_FORMULA,
- NULL);
- str = kvp_value_get_string( kvp_val );
- credit_num = gnc_numeric_create( 0, 1 );
- if (str != NULL && strlen(str) != 0) {
- if (!gnc_exp_parser_parse_separate_vars(str, &credit_num,
- &parseErrorLoc,
- actualVars))
- {
- GString *err = g_string_new("");
- g_string_printf(err, "Error parsing SX [%s] credit formula [%s] at [%s]: %s",
- xaccSchedXactionGetName(createUD->tci->parentTCT->sx),
- str, parseErrorLoc, gnc_exp_parser_error_string());
- *createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
- credit_num = gnc_numeric_create( 0, 1 );
- }
- }
-
- kvp_val = kvp_frame_get_slot_path( split_kvpf,
- GNC_SX_ID,
- GNC_SX_DEBIT_FORMULA,
- NULL);
- str = kvp_value_get_string( kvp_val );
-
- debit_num = gnc_numeric_create( 0, 1 );
- if (str != NULL && strlen(str) != 0) {
- if (!gnc_exp_parser_parse_separate_vars(str, &debit_num,
- &parseErrorLoc,
- actualVars))
- {
- GString *err = g_string_new("");
- g_string_printf(err, "Error parsing SX [%s] debit formula [%s] at [%s]: %s",
- xaccSchedXactionGetName(createUD->tci->parentTCT->sx),
- str, parseErrorLoc, gnc_exp_parser_error_string());
- *createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
- debit_num = gnc_numeric_create( 0, 1 );
- }
-
- }
-
- final = gnc_numeric_sub_fixed( debit_num, credit_num );
-
- gncn_error = gnc_numeric_check(final);
- if (gncn_error != GNC_ERROR_OK) {
- GString *err = g_string_new("");
- g_string_printf(err, "Error %d in SX [%s] final gnc_numeric value, using 0 instead.",
- gncn_error,
- xaccSchedXactionGetName(createUD->tci->parentTCT->sx));
- *createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
- final = gnc_numeric_create(0, 1);
- }
-
- xaccSplitSetValue(split, final);
- if (! gnc_commodity_equal(split_cmdty, first_cmdty))
- {
- GString *exchange_rate_var_name = g_string_sized_new(16);
- gnc_numeric *exchange, amt;
-
- /*
- GNCPriceDB *price_db = gnc_pricedb_get_db(gnc_get_current_book());
- GNCPrice *price;
-
- price = gnc_pricedb_lookup_latest(price_db, first_cmdty, split_cmdty);
- if (price == NULL)
- {
- price = gnc_pricedb_lookup_latest(price_db, split_cmdty, first_cmdty);
- if (price == NULL)
- {
- GString *err = g_string_new("");
- g_string_printf(err, "could not find pricedb entry for commodity-pair (%s, %s).",
- gnc_commodity_get_mnemonic(first_cmdty),
- gnc_commodity_get_mnemonic(split_cmdty));
- exchange = gnc_numeric_create(1, 1);
- *createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
-
- }
- else
- {
- exchange = gnc_numeric_div(gnc_numeric_create(1,1),
- gnc_price_get_value(price),
- 1000, GNC_HOW_RND_ROUND);
- }
- }
- else
- {
- exchange = gnc_price_get_value(price);
- }
- */
-
- g_string_printf(exchange_rate_var_name, "%s -> %s",
- gnc_commodity_get_mnemonic(split_cmdty),
- gnc_commodity_get_mnemonic(first_cmdty));
- exchange = (gnc_numeric*)g_hash_table_lookup(actualVars, exchange_rate_var_name->str);
- if (exchange == NULL)
- {
- exchange = g_new0(gnc_numeric, 1);
- *exchange = gnc_numeric_create(0, 1);
- }
- g_string_free(exchange_rate_var_name, TRUE);
-
- amt = gnc_numeric_mul(final, *exchange, 1000, GNC_HOW_RND_ROUND);
- xaccSplitSetAmount(split, amt);
- }
- xaccSplitScrub( split );
- }
- xaccAccountCommitEdit( acct );
- }
-
- /* Cleanup actualVars table. */
- {
- g_hash_table_foreach( actualVars,
- gnc_sxsl_del_vars_table_ea,
- NULL );
- g_hash_table_destroy( actualVars );
- actualVars = NULL;
- }
-
- if (errFlag) {
- PERR("Some error in new transaction creation...");
- xaccTransDestroy(newT);
- xaccTransCommitEdit(newT);
- return 13;
- }
-
- {
- kvp_frame *txn_frame;
- /* set a kvp-frame element in the transaction indicating and
- * pointing-to the SX this was created from. */
- txn_frame = xaccTransGetSlots(newT);
- kvp_frame_set_guid(txn_frame, "from-sched-xaction",
- xaccSchedXactionGetGUID(tci->parentTCT->sx));
- }
-
- xaccTransCommitEdit(newT);
-
- if ( createUD->createdGUIDs != NULL ) {
- *createUD->createdGUIDs =
- g_list_append( *(createUD->createdGUIDs),
- (gpointer)xaccTransGetGUID(newT) );
- }
-
- return 0;
-}
-
-/**
- * This should be called with the dates in increasing order, or the last call
- * will set the last occur date incorrectly.
- **/
-static void
-create_transactions_on(SchedXaction *sx,
- GDate *gd,
- toCreateInstance *tci,
- GList **createdGUIDs,
- GList **creation_errors)
-{
- createData createUD;
- Account *root, *acct;
- const char *id;
-
- if (tci) {
- g_assert(g_date_compare(gd, tci->date) == 0);
- }
-
- root = gnc_book_get_template_root( gnc_get_current_book () );
- id = guid_to_string( xaccSchedXactionGetGUID(sx) );
- if ( !(root && id) ) {
- return;
- }
- /* This looks strange but it's right. The account is
- named after the guid string. */
- acct = gnc_account_lookup_by_name( root, id );
- if (!acct) {
- return;
- }
-
- createUD.tci = tci;
- createUD.createdGUIDs = createdGUIDs;
- createUD.creation_errors = creation_errors;
- xaccAccountForEachTransaction(acct,
- create_each_transaction_helper,
- /*tct*/ &createUD);
-}
-
-static void
-_hashToList( gpointer key, gpointer value, gpointer user_data )
-{
- *(GList**)user_data = g_list_append( *(GList**)user_data, key );
-}
-
-static void
-hash_to_sorted_list( GHashTable *hashTable, GList **gl )
-{
- g_hash_table_foreach( hashTable, _hashToList, gl );
- *gl = g_list_sort( *gl, g_str_equal );
-}
-
-static void
-clear_variable_numerics( gpointer key, gpointer value, gpointer data )
-{
- g_free( (gnc_numeric*)value );
- g_hash_table_insert( (GHashTable*)data, key, NULL );
-}
-
-static gint
-_get_vars_helper(Transaction *txn, void *var_hash_data)
-{
- GHashTable *var_hash = (GHashTable*)var_hash_data;
- GList *split_list;
- kvp_frame *kvpf;
- kvp_value *kvp_val;
- Split *s;
- char *str;
- gnc_commodity *first_cmdty = NULL;
-
- split_list = xaccTransGetSplitList(txn);
-
- if ( split_list == NULL ) {
- return 1;
- }
-
- for ( ; split_list ; split_list = split_list->next ) {
- gnc_commodity *split_cmdty = NULL;
- GUID *acct_guid;
- Account *acct;
-
- s = (Split*)split_list->data;
- kvpf = xaccSplitGetSlots(s);
- kvp_val = kvp_frame_get_slot_path(kvpf,
- GNC_SX_ID,
- GNC_SX_ACCOUNT,
- NULL);
- acct_guid = kvp_value_get_guid( kvp_val );
- acct = xaccAccountLookup( acct_guid, gnc_get_current_book ());
- split_cmdty = xaccAccountGetCommodity(acct);
- if (first_cmdty == NULL)
- {
- first_cmdty = split_cmdty;
- }
-
- if (! gnc_commodity_equal(split_cmdty, first_cmdty))
- {
- gnc_numeric *tmp_num;
- GString *var_name = g_string_sized_new(16);
- g_string_printf(var_name, "%s -> %s",
- gnc_commodity_get_mnemonic(split_cmdty),
- gnc_commodity_get_mnemonic(first_cmdty));
- tmp_num = g_new0(gnc_numeric, 1);
- *tmp_num = gnc_numeric_create(0, 1);
- g_hash_table_insert(var_hash, g_strdup(var_name->str), tmp_num);
- g_string_free(var_name, TRUE);
- }
-
- // existing... ------------------------------------------
-
- kvp_val = kvp_frame_get_slot_path( kvpf,
- GNC_SX_ID,
- GNC_SX_CREDIT_FORMULA,
- NULL);
- if ( kvp_val != NULL ) {
- str = kvp_value_get_string( kvp_val );
- if ( str && strlen(str) != 0 ) {
- parse_vars_from_formula( str, var_hash, NULL );
- }
- }
-
- kvp_val = kvp_frame_get_slot_path( kvpf,
- GNC_SX_ID,
- GNC_SX_DEBIT_FORMULA,
- NULL);
- if ( kvp_val != NULL ) {
- str = kvp_value_get_string( kvp_val );
- if ( str && strlen(str) != 0 ) {
- parse_vars_from_formula( str, var_hash, NULL );
- }
- }
- }
-
- return 0;
-}
-
-void
-sxsl_get_sx_vars( SchedXaction *sx, GHashTable *var_hash )
-{
- Account *root, *acct;
- const char *id;
-
- root = gnc_book_get_template_root( gnc_get_current_book () );
- id = guid_to_string( xaccSchedXactionGetGUID(sx) );
- /* Get account named after guid string. */
- acct = gnc_account_lookup_by_name( root, id );
- xaccAccountForEachTransaction(acct,
- _get_vars_helper,
- var_hash);
-
- g_hash_table_foreach( var_hash,
- clear_variable_numerics,
- (gpointer)var_hash );
-}
-
-static gboolean
-tct_table_entry_key_handle( GtkWidget *widget, GdkEventKey *event, gpointer ud )
-{
- gnc_numeric *num;
- GtkEntry *ent = NULL;
- GString *str;
-
- if ( (event->keyval != GDK_Tab)
- && (event->keyval != GDK_ISO_Left_Tab) ) {
- return FALSE;
- }
-
- /* First, deal with formulas in these cells, replacing their
- * contents with the eval'd value. */
- ent = GTK_ENTRY(widget);
- num = (gnc_numeric*)g_object_get_data( G_OBJECT(ent), "numeric" );
- str = g_string_new("");
- g_string_printf( str, "%0.2f", gnc_numeric_to_double( *num ) );
- gtk_entry_set_text( ent, str->str );
- g_string_free( str, TRUE );
-
- /* FIXME: Next, deal with tab-ordering in this page...
- *
- * if ( entry isn't last in table )
- * return (normal)FALSE
- * if ( unfilled entry in this table exists )
- * change focus to unfilled entry
- * if ( no more unfilled clist-rows )
- * return (normal)FALSE
- * clist-select next unfilled row
- *
- * This doesn't deal with shift-tab very well ...
- * And there's a question of if the user will allow us to futz with
- * their tab-ordering... though it's already pretty screwed up for the
- * dynamically-changing-table anyways, so they probably won't mind
- * too much... -- jsled
- */
-
- return FALSE;
-}
-
-static
-void
-sxsincelast_tc_row_sel( GtkCTree *ct,
- GList *nodelist,
- gint column,
- gpointer user_data)
-{
- static const int NUM_COLS = 2;
- static GtkAttachOptions sopts = GTK_SHRINK;
- static GtkAttachOptions lxopts = GTK_EXPAND | GTK_FILL;
- GtkTable *varTable;
- int tableIdx;
- GtkWidget *label, *entry;
- GList *varList;
- gint varHashSize;
- GtkCTreeNode *node = GTK_CTREE_NODE( nodelist );
-
- toCreateInstance *tci;
- sxSinceLastData *sxsld;
-
- /* FIXME: this should more gracefully deal with multiple 'row-select'
- * signals from double/triple-clicks. */
- sxsld = (sxSinceLastData*)user_data;
-
- tci = (toCreateInstance*)gtk_ctree_node_get_row_data( ct, node );
- if ( !tci )
- return;
-
- sxsld->curSelTCI = tci;
- sxsld_set_sensitive_tci_controls( sxsld, TRUE );
- /* set real sensitivity based on the state of the TCI; when we change
- * the option menu selection here, it won't fire the selection-done
- * handler, so we have to force it. */
-
- {
- GtkOptionMenu *optMenu;
-
- optMenu = GTK_OPTION_MENU(
- glade_xml_get_widget( sxsld->gxml,
- SX_DISPOSITION_OPT ) );
- gtk_option_menu_set_history( optMenu,
- sxsld->curSelTCI->state );
- sxsld_disposition_changed( GTK_MENU_SHELL(
- gtk_option_menu_get_menu( optMenu ) ),
- sxsld );
- }
-
- /* Setup the query for the to-create register to only show the
- * transaction[s] associated with this lineitem. */
- {
- Account *root, *acct;
- Query *q;
- const gchar *sxGUIDstr;
- SplitRegister *sr;
-
- q = xaccMallocQuery();
- xaccQuerySetBook( q, gnc_get_current_book() );
- root = gnc_book_get_template_root( gnc_get_current_book() );
- sxGUIDstr = guid_to_string( xaccSchedXactionGetGUID( tci->parentTCT->sx ) );
- acct = gnc_account_lookup_by_name( root, sxGUIDstr );
- g_assert( acct != NULL );
- xaccQueryAddSingleAccountMatch( q, acct, QUERY_AND );
-
- gnc_suspend_gui_refresh();
- gnc_ledger_display_set_query( sxsld->to_create_ledger, q );
- sr = gnc_ledger_display_get_split_register( sxsld->to_create_ledger );
- gnc_split_register_set_template_account( sr, acct );
- gnc_ledger_display_refresh( sxsld->to_create_ledger );
- gnc_resume_gui_refresh();
- }
-
- /* Get the count of variables; potentially remove the system-defined
- * variables if they're present in the expression. */
- varHashSize = g_hash_table_size( tci->varBindings );
- {
- gpointer *unusedKey, *unusedVal;
- if ( g_hash_table_lookup_extended( tci->varBindings, "i",
- (gpointer)&unusedKey,
- (gpointer)&unusedVal ) ) {
- varHashSize -= 1;
- }
- }
-
- if ( varHashSize == 0 ) {
- return;
- }
-
- varList = NULL;
- hash_to_sorted_list( tci->varBindings, &varList );
- varTable = GTK_TABLE( glade_xml_get_widget( sxsld->gxml,
- VARIABLE_TABLE ) );
- gtk_table_resize( varTable, varHashSize + 1, NUM_COLS );
-
- tableIdx = 1;
- for ( ; varList ; varList = varList->next ) {
- gchar *varName;
- GString *gstr;
- const gchar *numValueStr;
- gnc_numeric *numValue, *tmpNumValue;
-
- varName = (gchar*)varList->data;
- if ( strcmp( varName, "i" ) == 0 ) {
- continue;
- }
-
- gstr = g_string_sized_new(16);
- g_string_printf( gstr, "%s: ", varName );
- label = gtk_label_new( gstr->str );
- gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_RIGHT );
- g_string_free( gstr, TRUE );
-
- entry = gtk_entry_new();
- g_object_set_data( G_OBJECT(entry), "varName", varName );
- g_object_set_data( G_OBJECT(entry), "tci", tci );
- tmpNumValue = g_new0( gnc_numeric, 1 );
- *tmpNumValue = gnc_numeric_create( 0, 1 );
- g_object_set_data( G_OBJECT(entry), "numeric", tmpNumValue );
- if ( tableIdx == varHashSize ) {
- /* Set a flag so we can know if we're the last row of
- * the table. */
- g_object_set_data( G_OBJECT(entry), "lastVisualElt",
- (gpointer)1 );
- }
-
- gtk_widget_set_size_request( entry, 64, -1 );
- numValue = (gnc_numeric*)g_hash_table_lookup( tci->varBindings,
- varName );
- if ( numValue != NULL ) {
- numValueStr =
- xaccPrintAmount( *numValue,
- gnc_default_print_info( FALSE ) );
- gtk_entry_set_text( GTK_ENTRY(entry), numValueStr );
- }
-
- /* fixme::2002.02.10 jsled testing */
- g_signal_connect( entry, "key-press-event",
- G_CALLBACK( tct_table_entry_key_handle ),
- NULL );
- g_signal_connect( entry, "changed",
- G_CALLBACK( sxsincelast_entry_changed ),
- sxsld );
- g_signal_connect( entry, "destroy",
- G_CALLBACK(gnc_sxsld_free_entry_numeric),
- sxsld );
-
- gtk_table_attach( varTable, label,
- 0, 1, tableIdx, tableIdx + 1,
- lxopts, sopts, 0, 0 );
- gtk_table_attach( varTable, entry,
- 1, 2, tableIdx, tableIdx + 1,
- sopts, sopts, 0, 0 );
- tableIdx += 1;
- }
-
- gtk_widget_show_all( GTK_WIDGET(varTable) );
-}
-
-static void
-clean_variable_table( sxSinceLastData *sxsld )
-{
- GtkTable *table;
- GList *children, *toFree, *l;
- GtkTableChild *child;
-
- table = GTK_TABLE( glade_xml_get_widget( sxsld->gxml,
- VARIABLE_TABLE ) );
- children = table->children;
- g_assert( children );
-
- toFree = NULL;
- for( ; children ; children = children->next ) {
- /* Destroy all children after the first [label-continaing]
- row... ie, leave the labels in place. */
- child = (GtkTableChild*)children->data;
- if ( child->top_attach > 0 ) {
- toFree = g_list_append( toFree, child->widget );
- }
- }
-
- gtk_table_resize( table, 1, 2 );
-
- for ( l = toFree; l; l = l->next ) {
- gtk_widget_destroy( (GtkWidget*)l->data );
- }
- g_list_free( toFree );
-}
-
-static void
-sxsincelast_tc_row_unsel( GtkCTree *ct,
- GList *nodelist,
- gint column,
- gpointer user_data)
-{
- sxSinceLastData *sxsld;
-
- sxsld = (sxSinceLastData*)user_data;
- clean_variable_table( sxsld );
-
- sxsld->curSelTCI = NULL;
-
- sxsld_set_sensitive_tci_controls( sxsld, FALSE );
-
- {
- Query *q;
- q = xaccMallocQuery();
- xaccQueryClear( q );
- gnc_suspend_gui_refresh();
- gnc_ledger_display_set_query( sxsld->to_create_ledger, q );
- gnc_ledger_display_refresh( sxsld->to_create_ledger );
- gnc_resume_gui_refresh();
- }
-
-
- /* we cleanup the gnc_numerics we allocated in the "destroy" signal
- * handler of the entry [where we attached them] */
-}
-
-void
-print_vars_helper( gpointer key, gpointer value, gpointer user_data )
-{
- DEBUG( "\"%s\" -> %.8x [%s]",
- (gchar*)key, GPOINTER_TO_UINT(value),
- gnc_numeric_to_string( *(gnc_numeric*)value ) );
-}
-
-int
-parse_vars_from_formula( const char *formula,
- GHashTable *varHash,
- gnc_numeric *result )
-{
- gnc_numeric *num;
- char *errLoc;
- int toRet;
-
- if ( result ) {
- num = result;
- } else {
- num = g_new0( gnc_numeric, 1 );
- }
-
- toRet = 0;
- if ( ! gnc_exp_parser_parse_separate_vars( formula, num,
- &errLoc, varHash ) ) {
- toRet = -1;
- }
-
- if ( !result ) {
- g_free( num );
- }
- return toRet;
-}
-
-/**
- * The following makes me [jsled] somewhat sad, but it works... :I
- *
- * Basic problem: You can't create a SX instance if any after it have already
- * been created [e.g., if an SX has instances on d_0, d_1 and d_2, and you
- * create d_0 and d_2, then d_1 will never get created ... only d_3, d_4,
- * &c.]
- *
- * This code, then, makes sure that the user hasn't skipped a date...
- *
- * Code flow...
- * . If non-consecutive Reminders chosen, disallow.
- * . Else, for each selected reminder, add to to-create list.
- * . Dismiss dialog.
- *
- * While we're doing this, we handle any previously-selected, now-unselected
- * reminders.
- *
- * Returns TRUE if there are processed, valid reminders... FALSE otherwise.
- **/
-static gboolean
-processed_valid_reminders_listP( sxSinceLastData *sxsld )
-{
- reminderTuple *rt;
- reminderInstanceTuple *rit;
- char *rtName;
- gboolean overallOkFlag, okFlag, prevState;
- GList *reminderList;
- GList *reminderInstList;
- GList *badList;
- GList *badRecentRun;
- GList *goodList;
- GList *toRevertList;
-
- rtName = NULL;
- goodList = NULL;
- overallOkFlag = TRUE;
-
- okFlag = prevState = TRUE;
- badList = badRecentRun = NULL;
- rt = NULL;
- toRevertList = NULL;
-
- for ( reminderList = sxsld->reminderList;
- reminderList;
- reminderList = reminderList->next ) {
-
- rt = (reminderTuple*)reminderList->data;
- okFlag = prevState = TRUE;
- badList = badRecentRun = NULL;
- rtName = xaccSchedXactionGetName( rt->sx );
-
- for ( reminderInstList = rt->instanceList;
- reminderInstList;
- reminderInstList = reminderInstList->next ) {
- rit = (reminderInstanceTuple*)reminderInstList->data;
-
- /* If we've previously created this RIT and now it's
- * not selected, then prepare to revert it
- * [later]. */
- if ( !rit->isSelected
- && rit->resultantTCI ) {
- toRevertList = g_list_append( toRevertList, rit );
- }
-
- if ( prevState ) {
- prevState = rit->isSelected;
- if ( !prevState ) {
- badRecentRun = g_list_append( badRecentRun, rit );
- }
- } else {
- if ( rit->isSelected ) {
- okFlag = FALSE;
- if ( g_list_length( badRecentRun ) > 0 ) {
- badList = g_list_concat( badList,
- badRecentRun );
- badRecentRun = NULL;
- }
- } else {
- badRecentRun =
- g_list_append( badRecentRun, rit );
- }
- }
- }
- overallOkFlag &=
- inform_or_add( sxsld, rt, okFlag, badList, &goodList );
- if ( badList ) {
- g_list_free( badList );
- badList = NULL;
- }
- if ( badRecentRun ) {
- g_list_free( badRecentRun );
- badRecentRun = NULL;
- }
- }
-
- /* Handle implications of above logic. */
- if ( !overallOkFlag ) {
- g_list_free( goodList );
- goodList = NULL;
-
- g_list_free( toRevertList );
- toRevertList = NULL;
-
- return FALSE;
- }
-
- if ( g_list_length( goodList ) > 0 ) {
- processSelectedReminderList( goodList, sxsld );
- g_list_free( goodList );
- goodList = NULL;
- }
-
- /* Revert the previously-created and now-unselected RITs. */
- gnc_sxsld_revert_reminders( sxsld, toRevertList );
- g_list_free( toRevertList );
- toRevertList = NULL;
-
- return TRUE;
-}
-
-
-/**
- * Remove the TCI from it's parent TCT, deleting any created transactions as
- * appropriate. Note: if after removing a TCIs from it's TCT and there are no
- * more instances in the TCT, then the TCT wouldn't have been created except
- * for us, and should be removed itself; we handle this as well.
- **/
-static
-void
-gnc_sxsld_revert_reminders( sxSinceLastData *sxsld,
- GList *toRevertList )
-{
- reminderInstanceTuple *rit;
- toCreateInstance *tci;
- toCreateTuple *tct;
- gboolean autoCreateState, notifyState;
- GList *l, *m;
-
- if ( !toRevertList ) {
- return;
- }
-
- for ( l = toRevertList; l; l = l->next ) {
- /* Navigate to the relevant objects. */
- rit = (reminderInstanceTuple*)l->data;
- g_assert( rit );
- tci = rit->resultantTCI;
- g_assert( tci );
- tct = tci->parentTCT;
- g_assert( tct );
-
- tct->instanceList = g_list_remove( tct->instanceList, tci );
-
- if ( g_list_length(tct->instanceList) == 0 ) {
- GList **correctList;
- /* if there are no instances, remove the TCT as
- * well. */
- xaccSchedXactionGetAutoCreate( rit->parentRT->sx,
- &autoCreateState,
- ¬ifyState );
- correctList = NULL;
- if ( autoCreateState ) {
- if ( notifyState ) {
- correctList = &sxsld->autoCreateList;
- }
- } else {
- correctList = &sxsld->toCreateList;
- }
-
- if ( correctList )
- *correctList = g_list_remove( *correctList, tct );
- }
-
- /* destroy any created transactions. */
- gnc_suspend_gui_refresh();
- for ( m = tci->createdTxnGUIDs; m; m = m->next ) {
- Transaction *t;
-
- sxsld->createdTxnGUIDList =
- g_list_remove( sxsld->createdTxnGUIDList,
- (GUID*)m->data );
- t = xaccTransLookup( (GUID*)m->data,
- gnc_get_current_book() );
- g_assert( t );
- xaccTransBeginEdit(t);
- xaccTransDestroy(t);
- xaccTransCommitEdit(t);
-
- }
- gnc_resume_gui_refresh();
-
- /* Free the now-dead TCI; this is buggy and causing
- * problems... */
- gnc_sxsld_free_tci( tci );
- rit->resultantTCI = NULL;
- }
-}
-
-
-static void
-sxsld_remind_row_toggle( GtkCTree *ct, GList *node,
- gint column, gpointer user_data )
-{
- GtkCTreeNode *ctn;
- reminderInstanceTuple *rit;
- sxSinceLastData *sxsld = (sxSinceLastData*)user_data;
- GnomeDruidPage *thisPage, *nextPage;
-
- ctn = GTK_CTREE_NODE( node );
- rit = (reminderInstanceTuple*)gtk_ctree_node_get_row_data( ct, ctn );
- if ( rit == NULL ) {
- PERR( "We got called to toggle a row that "
- "we can't find data for..." );
- return;
- }
- rit->isSelected = !rit->isSelected;
-
- /* Deal with setting up a correct next/finish button for this
- * page. */
- sxsld->remindSelCount += ( rit->isSelected ? 1 : -1 );
- thisPage = GNOME_DRUID_PAGE(glade_xml_get_widget( sxsld->gxml, REMINDERS_PG ));
- nextPage = gnc_sxsld_get_appropriate_page( sxsld, thisPage, FORWARD );
- if ( sxsld->remindSelCount == 0
- || sxsld->remindSelCount == 1 ) {
- /* If we don't have anywhere to go [read: there's only
- * reminders as of yet], and we've selected no reminders. */
-
- /* FIXME: damnit, this won't work correctly as we really want
- * to incorporate the effect of changing the reminder
- * selections into this, too. */
-
- gnome_druid_set_show_finish( sxsld->sincelast_druid,
- ( !nextPage
- && (sxsld->remindSelCount == 0) ) );
-
- } /* else { This else intentionally left blank; if it's >1, then we
- * handled the 'next/finish' button on the 0 -> 1 transition. } */
-}
-
-static
-void
-sxsld_obsolete_row_toggle( GtkCList *cl, gint row, gint col,
- GdkEventButton *event, gpointer ud )
-{
- toDeleteTuple *tdt;
-
- tdt = (toDeleteTuple*)gtk_clist_get_row_data( cl, row );
- tdt->isSelected = !tdt->isSelected;
-}
-
-/**
- * @return the count of created transactions which would be true after
- * processing the currently-selected state of to-create transactions. Note
- * that this includes auto-created transactions, which aren't shown in the
- * post-to-create review page.
- **/
-static
-gint
-sxsld_get_future_created_txn_count( sxSinceLastData *sxsld )
-{
- GList *tctList, *tciList;
- /* Get a reasonable initial count to modify below. */
- gint toRet = g_list_length( sxsld->createdTxnGUIDList );
-
- for ( tctList = sxsld->toCreateList;
- tctList; tctList = tctList->next ) {
-
- toCreateTuple *tct = (toCreateTuple*)tctList->data;
-
- for ( tciList = tct->instanceList;
- tciList;
- tciList = tciList->next ) {
-
- GList *txnSet, *splitList;
- toCreateInstance *tci = (toCreateInstance*)tciList->data;
-
- if ( tci->state == tci->prevState ) {
- continue;
- }
-
- switch ( tci->state ) {
- case SX_TO_CREATE:
- /* We were postpone or ignore, before ... so
- * add the new txns in. */
-
- /* Calculate the size of the transaction-list to be created. */
- txnSet = NULL;
- splitList = xaccSchedXactionGetSplits( tci->parentTCT->sx );
- for ( ; splitList; splitList = splitList->next ) {
- Split *s = (Split*)splitList->data;
- if ( g_list_find( txnSet, xaccSplitGetParent(s) ) == NULL ) {
- txnSet = g_list_append( txnSet, (gpointer)s );
- }
- }
- toRet += g_list_length( txnSet );
- g_list_free( txnSet );
- txnSet = NULL;
- break;
- case SX_IGNORE:
- case SX_POSTPONE:
- /* We were {postpone,ignore} or to-create,
- * before, so either continue to ignore or
- * subtract out the txns. */
- if ( tci->prevState != SX_TO_CREATE ) {
- continue;
- }
- toRet -= g_list_length( tci->createdTxnGUIDs );
- break;
- case SX_UNDEF:
- case SX_MAX_STATE:
- g_assert( "We shouldn't see any of these." );
- break;
- }
- }
- }
- g_assert( toRet >= 0 );
- return toRet;
-}
-
-static
-void
-sxsld_disposition_changed( GtkMenuShell *b, gpointer d )
-{
- sxSinceLastData *sxsld = (sxSinceLastData*)d;
- ToCreateState newState;
- gboolean newSensitivity;
- GtkCTree *ct;
- char *newCtreeText;
-
- newState =
- gnc_option_menu_get_active(
- glade_xml_get_widget( sxsld->gxml,
- SX_DISPOSITION_OPT ));
- /* Change the state of the TCI */
- //g_assert( sxsld->curSelTCI != NULL );
- g_return_if_fail(sxsld->curSelTCI != NULL);
-
- sxsld->curSelTCI->state = newState;
-
- newSensitivity = TRUE;
- newCtreeText = "FIXME";
-
- switch ( newState ) {
- case SX_TO_CREATE:
- newSensitivity = TRUE;
- {
- gboolean allVarsBound = TRUE;
- /* If there are no un-bound variables, then set the 'ready-to-go'
- flag to 'y'. */
- g_hash_table_foreach( sxsld->curSelTCI->varBindings,
- andequal_numerics_set,
- &allVarsBound );
- newCtreeText = ( allVarsBound
- ? _( READY_TEXT )
- : _( NEEDS_BINDINGS_TEXT ) );
- }
- break;
- case SX_IGNORE:
- newSensitivity = FALSE;
- newCtreeText = _( IGNORE_TEXT );
- break;
- case SX_POSTPONE:
- newSensitivity = FALSE;
- newCtreeText = _( POSTPONE_TEXT );
- break;
- default:
- g_assert( FALSE );
- break;
- }
-
- gtk_widget_set_sensitive( glade_xml_get_widget( sxsld->gxml,
- VARIABLE_TABLE ),
- newSensitivity );
- ct = GTK_CTREE(glade_xml_get_widget( sxsld->gxml, TO_CREATE_LIST ));
- gtk_ctree_node_set_text( ct, sxsld->curSelTCI->node, 1, newCtreeText );
-
- /* set the 'next/finish' button appropraitely based on the new
- * selection. */
- gnome_druid_set_show_finish( sxsld->sincelast_druid,
- ( ( sxsld_get_future_created_txn_count(sxsld)
- - sxsld->autoCreatedCount )== 0 ) );
-}
-
-/**
- * Makes both the variable table and disposition selection [in]sensitive, as
- * specified.
- **/
-static
-void
-sxsld_set_sensitive_tci_controls( sxSinceLastData *sxsld,
- gboolean sensitive )
-{
- GtkWidget *w;
- w = glade_xml_get_widget( sxsld->gxml, SX_DISPOSITION_OPT );
- gtk_widget_set_sensitive( w, sensitive );
- w = glade_xml_get_widget( sxsld->gxml, VARIABLE_TABLE );
- gtk_widget_set_sensitive( w, sensitive );
-}
-
-static void
-create_bad_reminders_msg( gpointer data, gpointer ud )
-{
- GString *msg;
- reminderInstanceTuple *rit;
- static char tmpBuf[ MAX_DATE_LENGTH+1 ];
-
- rit = (reminderInstanceTuple*)data;
- msg = (GString*)ud;
- qof_print_gdate( tmpBuf, MAX_DATE_LENGTH, rit->occurDate );
- g_string_append_printf( msg, tmpBuf );
- g_string_append_printf( msg, "\n" );
-}
-
-static gboolean
-inform_or_add( sxSinceLastData *sxsld, reminderTuple *rt, gboolean okFlag,
- GList *badList, GList **goodList )
-{
- reminderInstanceTuple *rit;
- GList *instances;
- GString *userMsg;
-
- userMsg = NULL;
-
- if ( okFlag ) {
- /* Add selected instances of this rt to
- * okay-to-add-to-toCreateList list. */
- for ( instances = rt->instanceList;
- instances;
- instances = instances->next ) {
- rit = (reminderInstanceTuple*)instances->data;
- /* this isn't really all that efficient. */
- if ( rit->isSelected ) {
- *goodList = g_list_append( *goodList, rit );
- }
- }
- } else {
- /* [Add to list for later] dialog issuance to user. */
-
- userMsg = g_string_sized_new( 128 );
- g_string_printf( userMsg,
- "You cannot skip instances of "
- "Scheduled Transactions. "
- "The following instances of \"%s\" "
- "must be selected as well:\n\n",
- xaccSchedXactionGetName( rt->sx ) );
- g_list_foreach( badList, create_bad_reminders_msg, userMsg );
- gnc_error_dialog( sxsld->sincelast_window, userMsg->str );
- g_string_free( userMsg, TRUE );
- }
-
- return okFlag;
-}
-
-static void
-sx_obsolete_select_all_clicked(GtkButton *button, gpointer user_data)
-{
- sxSinceLastData* sxsld = user_data;
-
- GtkCList *ob_clist = GTK_CLIST(glade_xml_get_widget(sxsld->gxml,
- SX_OBSOLETE_CLIST));
- gtk_clist_select_all( ob_clist );
-}
-
-static void
-sx_obsolete_unselect_all_clicked(GtkButton *button, gpointer user_data)
-{
- sxSinceLastData* sxsld = user_data;
-
- GtkCList *ob_clist = GTK_CLIST(glade_xml_get_widget(sxsld->gxml,
- SX_OBSOLETE_CLIST));
- gtk_clist_unselect_all( ob_clist );
-}
-
-static void
-create_autoCreate_ledger( sxSinceLastData *sxsld )
-{
- SplitRegister *splitreg;
- GtkWidget *vbox;
- Query *q;
-
- q = xaccMallocQuery();
- xaccQuerySetBook (q, gnc_get_current_book ());
- sxsld->ac_ledger = gnc_ledger_display_query( q,
- GENERAL_LEDGER,
- REG_STYLE_LEDGER );
-
- /* First the embedded window */
- vbox = glade_xml_get_widget( sxsld->gxml, AUTO_CREATE_VBOX );
- sxsld->ac_window =
- gnc_embedded_window_new("SXWindowActions",
- gnc_sxsld_menu_entries,
- gnc_sxsld_menu_n_entries,
- "gnc-sxed-window-ui.xml",
- sxsld->sincelast_window,
- FALSE, /* no accelerators */
- sxsld);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET(sxsld->ac_window),
- TRUE, TRUE, 0);
-
- /* Then the register in it */
- sxsld->ac_register = gnc_plugin_page_register_new_ledger(sxsld->ac_ledger);
- gnc_plugin_page_set_ui_description (sxsld->ac_register,
- "gnc-plugin-page-sxregister-ui.xml");
- gnc_plugin_page_register_set_options (sxsld->ac_register,
- NULL, NULL, 4, FALSE);
- gnc_embedded_window_open_page (sxsld->ac_window, sxsld->ac_register);
-
- /* Now configure the register */
- splitreg = gnc_ledger_display_get_split_register( sxsld->ac_ledger );
- gnc_split_register_config(splitreg,
- splitreg->type, splitreg->style,
- FALSE);
- gnc_split_register_show_present_divider( splitreg, FALSE );
-}
-
-static void
-create_created_ledger( sxSinceLastData *sxsld )
-{
- SplitRegister *splitreg;
- GtkWidget *vbox;
- Query *q;
-
- q = xaccMallocQuery();
- xaccQuerySetBook (q, gnc_get_current_book ());
- sxsld->created_ledger = gnc_ledger_display_query( q,
- GENERAL_LEDGER,
- REG_STYLE_LEDGER );
-
- /* First the embedded window */
- vbox = glade_xml_get_widget( sxsld->gxml, CREATED_VBOX );
- sxsld->created_window =
- gnc_embedded_window_new("SXWindowActions",
- gnc_sxsld_menu_entries,
- gnc_sxsld_menu_n_entries,
- "gnc-sxed-window-ui.xml",
- sxsld->sincelast_window,
- FALSE, /* no accelerators */
- sxsld);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET(sxsld->created_window),
- TRUE, TRUE, 0);
-
- /* Then the register in it */
- sxsld->created_register = gnc_plugin_page_register_new_ledger(sxsld->created_ledger);
- gnc_plugin_page_set_ui_description (sxsld->created_register,
- "gnc-plugin-page-sxregister-ui.xml");
- gnc_plugin_page_register_set_options (sxsld->created_register,
- NULL, NULL, 4, FALSE);
- gnc_embedded_window_open_page (sxsld->created_window, sxsld->created_register);
-
- /* Now configure the register */
- splitreg = gnc_ledger_display_get_split_register( sxsld->created_ledger );
- gnc_split_register_config(splitreg,
- splitreg->type, splitreg->style,
- FALSE);
- gnc_split_register_show_present_divider( splitreg, FALSE );
-}
-
-#if 0
-static
-void
-sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld )
-{
- SplitRegister *reg;
- GNCSplitReg *gsr;
- Account *account;
- Account *leader;
- Split *split;
-
- reg = gnc_ledger_display_get_split_register(sxsld->to_create_ledger);
- gsr = gnc_ledger_display_get_user_data(sxsld->to_create_ledger);
-
- split = gnc_split_register_get_current_split (reg);
- if (split == NULL)
- return;
-
- {
- GUID *acct_guid;
- kvp_frame *split_kvpf;
- kvp_value *kvp_val;
-
- split_kvpf = xaccSplitGetSlots( split );
- kvp_val = kvp_frame_get_slot_path( split_kvpf,
- GNC_SX_ID,
- GNC_SX_ACCOUNT,
- NULL );
- if ( kvp_val == NULL ) {
- PERR( "Null kvp_val for account" );
- }
- acct_guid = kvp_value_get_guid( kvp_val );
- account = xaccAccountLookup( acct_guid,
- gnc_get_current_book ());
- }
-
- if (account == NULL)
- return;
-
- leader = gnc_ledger_display_leader( gsr->ledger );
-
- if (account == leader)
- {
- split = xaccSplitGetOtherSplit(split);
- if (split == NULL)
- return;
-
- account = xaccSplitGetAccount(split);
- if (account == NULL)
- return;
- if (account == leader)
- return;
- }
-
- {
- GncPluginPage *new_page;
- GNCSplitReg *gsr;
-
- new_page = gnc_plugin_page_register_new (account, FALSE);
- gnc_main_window_open_page (NULL, new_page);
- gsr = gnc_plugin_page_register_get_gsr (new_page);
- gnc_split_reg_jump_to_split(gsr, split);
- }
-
- g_signal_stop_emission_by_name(gsr, "jump");
-}
-#endif
-
-static void
-create_to_create_ledger( sxSinceLastData *sxsld )
-{
- SplitRegister *splitreg;
- GtkWidget *vbox;
- Query *q;
-
- sxsld->to_create_ledger = gnc_ledger_display_template_gl( NULL );
- q = xaccMallocQuery();
- xaccQueryClear( q );
- gnc_ledger_display_set_query( sxsld->to_create_ledger, q );
-
- /* First the embedded window */
- vbox = glade_xml_get_widget( sxsld->gxml, TO_CREATE_TXN_VBOX );
- sxsld->to_create_window =
- gnc_embedded_window_new("SXWindowActions",
- gnc_sxsld_menu_entries,
- gnc_sxsld_menu_n_entries,
- "gnc-sxed-to-create-window-ui.xml",
- sxsld->sincelast_window,
- FALSE, /* no accelerators */
- sxsld);
- gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET(sxsld->to_create_window),
- TRUE, TRUE, 0);
-
- /* Then the register in it */
- sxsld->to_create_register = gnc_plugin_page_register_new_ledger(sxsld->to_create_ledger);
- gnc_plugin_page_set_ui_description (sxsld->to_create_register,
- "gnc-sxed-to-create-window-ui.xml");
- gnc_plugin_page_register_set_options(sxsld->to_create_register,
- NULL, NULL, 4, TRUE);
- gnc_embedded_window_open_page (sxsld->to_create_window, sxsld->to_create_register);
-
- /* Now configure the register */
- splitreg = gnc_ledger_display_get_split_register( sxsld->to_create_ledger );
- gnc_split_register_config( splitreg, splitreg->type, splitreg->style,
- FALSE );
- gnc_split_register_show_present_divider( splitreg, FALSE );
-}
-
-static void
-clean_sincelast_data( sxSinceLastData *sxsld )
-{
- GList *l, *m;
-
- /* FIXME: handle the cloned state data for all the instance
- * structures. */
-
- /* Free the reminder list */
- for ( l = sxsld->reminderList; l; l = l->next ) {
- reminderTuple *rt;
- reminderInstanceTuple *rit;
-
- rt = (reminderTuple*)l->data;
- for ( m = rt->instanceList; m; m = m->next ) {
- rit = (reminderInstanceTuple*)m->data;
- g_date_free( rit->endDate );
- g_date_free( rit->occurDate );
- g_free( rit );
- }
- g_list_free( rt->instanceList );
- rt->instanceList = NULL;
- g_free( rt );
- }
- g_list_free( sxsld->reminderList );
-
- /* Free the auto-create and to-create lists */
- gnc_sxsld_free_toCreateTuple_list( sxsld->autoCreateList );
- g_list_free( sxsld->autoCreateList );
- sxsld->autoCreateList = NULL;
-
- gnc_sxsld_free_toCreateTuple_list( sxsld->toCreateList );
- g_list_free( sxsld->toCreateList );
- sxsld->toCreateList = NULL;
-
- /* Free the to-remove list */
- for ( l = sxsld->toRemoveList; l; l = l->next ) {
- toDeleteTuple *tdt;
-
- tdt = (toDeleteTuple*)l->data;
- g_date_free( tdt->endDate );
- tdt->endDate = NULL;
-
- g_free( tdt );
- }
- g_list_free( sxsld->toRemoveList );
- sxsld->toRemoveList = NULL;
-
- /* free the created-txn-guid list */
- g_list_free( sxsld->createdTxnGUIDList );
- sxsld->createdTxnGUIDList = NULL;
-
- /* Free the saved SX temporal states */
- g_hash_table_foreach( sxsld->sxInitStates,
- gnc_sxsld_free_sxState,
- NULL );
- g_hash_table_destroy( sxsld->sxInitStates );
- sxsld->sxInitStates = NULL;
-
-}
-
-static
-void
-gnc_sxsld_free_tci( toCreateInstance *tci )
-{
- if ( tci->date ) {
- g_date_free(tci->date);
- tci->date = NULL;
- }
-
- if ( tci->varBindings ) {
- g_hash_table_foreach( tci->varBindings,
- _free_varBindings_hash_elts,
- NULL );
- g_hash_table_destroy( tci->varBindings );
- tci->varBindings = NULL;
- }
-
- /* Handling these original/previous/current-stated things is painful,
- * but here's the rules...
- *
- * If we're not cancelling...
- * . If ignored, destroy.
- * . If postponed, DON'T destroy.
- * . If to-create, destroy.
- *
- * If we are cancelling...
- * . If ignored, destroy.
- * . If postponed, destroy.
- * . UNLESS previously postponed
- * . If to-create, destroy.
- *
- * So, we don't destroy postponed by default, and let the
- * cancel-specific case handle that destruction [thus the
- * valid-pointer check].
- */
- if ( tci->prevState != SX_POSTPONE
- && tci->origState != SX_POSTPONE
- && tci->sxStateData != NULL ) {
- gnc_sx_destroy_temporal_state( tci->sxStateData );
- tci->sxStateData = NULL;
- }
-
- tci->parentTCT = NULL;
-
- if ( tci->createdTxnGUIDs ) {
- g_list_free( tci->createdTxnGUIDs );
- tci->createdTxnGUIDs = NULL;
- }
-
- g_free( tci );
-}
-
-/**
- * Frees a list of toCreateTuples, like the autoCreateList and
- * toCreateList.
- **/
-static
-void
-gnc_sxsld_free_toCreateTuple_list( GList *l )
-{
- GList *m;
- toCreateTuple *tct;
-
- for ( ; l; l = l->next ) {
- tct = (toCreateTuple*)l->data;
- for ( m = tct->instanceList; m; m = m->next ) {
- gnc_sxsld_free_tci( (toCreateInstance*)m->data );
- }
- g_list_free( tct->instanceList );
- tct->instanceList = NULL;
- g_free( tct );
- }
-}
-
-static
-void
-gnc_sxsld_free_sxState( gpointer key,
- gpointer value,
- gpointer userdata )
-{
- gnc_sx_destroy_temporal_state( (void*)value );
-}
-
-static
-void
-gnc_sxsld_free_entry_numeric( GObject *o, gpointer ud )
-{
- gnc_numeric *num;
- num = (gnc_numeric*)g_object_get_data( o, "numeric" );
- g_free( num );
-}
-
-static
-void
-gnc_sxsld_commit_ledgers( sxSinceLastData *sxsld )
-{
- gnc_split_register_save(
- gnc_ledger_display_get_split_register(sxsld->created_ledger),
- TRUE );
- gnc_split_register_save(
- gnc_ledger_display_get_split_register(sxsld->ac_ledger),
- TRUE );
-}
-
-static
-void
-_adderror(gpointer data, gpointer user_data)
-{
- GString *dialog_text = (GString*)user_data;
- g_string_append_printf(dialog_text, "- %s\n", ((GString*)data)->str);
-}
-
-static
-void
-creation_errors_dialog(GList *creation_errors)
-{
- GString *dialog_text = g_string_new(_("The following errors were encountered while creating the Scheduled Transactions:\n"));
- g_list_foreach(creation_errors, (GFunc)_adderror, dialog_text);
- gnc_info_dialog(NULL, "%s", dialog_text->str);
- g_string_free(dialog_text, TRUE);
-}
-
-static void
-_free_creation_errors(gpointer data, gpointer user_data_unused)
-{
- g_string_free((GString*)data, TRUE);
-}
-
-static
-void
-creation_errors_free(GList *creation_errors)
-{
- g_list_foreach(creation_errors, (GFunc)_free_creation_errors, NULL);
- g_list_free(creation_errors);
-}
Deleted: gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/dialog-sxsincelast.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,60 +0,0 @@
-/********************************************************************\
- * dialog-sxsincelast.h - SchedXaction "Since-Last-Run" dialog *
- * Copyright (c) 2001 Joshua Sled <jsled at asynchronous.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 *
-\********************************************************************/
-
-#ifndef DIALOG_SXSINCELAST_H
-#define DIALOG_SXSINCELAST_H
-
-/**
- * @return The magnitude of the return value is the number of auto-created,
- * no-notification scheduled transactions created. This value is positive if
- * there are additionally other SXes which need user interaction and the
- * Druid has been displayed, or negative if there are not, and no Druid
- * window was realized. In the case where there the dialog has been
- * displayed but no auto-create-no-notify transactions have been created,
- * INT_MAX [limits.h] is returned. 0 is treated as negative, with no
- * transactions created and no dialog displayed. The caller can use this
- * value as appropriate to inform the user.
- *
- * [e.g., for book-open-hook: do nothing; for menu-selection: display an info
- * dialog stating there's nothing to do.]
- **/
-gint gnc_ui_sxsincelast_dialog_create( void );
-void gnc_sx_sxsincelast_book_opened (void);
-
-/**
- * Returns the varaibles from the Splits of the given SchedXaction as the
- * keys of the given GHashTable.
- **/
-void sxsl_get_sx_vars( SchedXaction *sx, GHashTable *varHash );
-
-/**
- * Returns the variables from the given formula [free-form non-numeric
- * character strings] as the keys of the given GHashTable.
- * @param result can be NULL if you're not interested in the result
- **/
-int parse_vars_from_formula( const char *formula,
- GHashTable *varHash,
- gnc_numeric *result );
-
-void print_vars_helper( gpointer key, gpointer value, gpointer user_data );
-
-#endif // !defined(DIALOG_SXSINCELAST_H)
Modified: gnucash/branches/remove-group2/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/druid-acct-period.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/druid-acct-period.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -60,7 +60,7 @@
GnomeDruidPage *menu_page;
GnomeDruidPage *book_page;
GnomeDruidPage *finish_page;
- GNCFrequency *period_menu;
+ GncFrequency *period_menu;
GtkLabel * period_remarks;
GtkLabel * close_results;
GtkLabel * book_details;
@@ -540,8 +540,8 @@
xaccFreqSpecSetMonthly (info->period, &info->closing_date, 12);
xaccFreqSpecSetUIType (info->period, UIFREQ_YEARLY);
- info->period_menu = GNC_FREQUENCY (
- gnc_frequency_new (info->period, &info->closing_date));
+ info->period_menu = GNC_FREQUENCY(
+ gnc_frequency_new(info->period, &info->closing_date));
/* Change the text so that its more mainingful for this druid */
gnc_frequency_set_frequency_label_text(info->period_menu, _("Period:"));
Modified: gnucash/branches/remove-group2/src/gnome/druid-hierarchy.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/druid-hierarchy.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/druid-hierarchy.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,6 +25,7 @@
#include <gnome.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -201,7 +202,7 @@
i = strlen(locale);
ret = g_build_filename(top_dir, locale, (char *)NULL);
- while (stat(ret, &buf) != 0)
+ while (g_stat(ret, &buf) != 0)
{
i--;
if (i<1)
Modified: gnucash/branches/remove-group2/src/gnome/druid-loan.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/druid-loan.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/druid-loan.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,7 +35,6 @@
#include "SchedXaction.h"
#include "SX-book.h"
-#include "SX-book-p.h"
#include "SX-ttinfo.h"
#include "druid-utils.h"
#include "gnc-book.h"
@@ -159,10 +158,11 @@
static RepayOptDataDefault REPAY_DEFAULTS[] = {
/* { name, default txn memo, throughEscrowP, specSrcAcctP } */
- { "Taxes", "Tax Payment", TRUE, FALSE },
- { "Insurance", "Insurance Payment", TRUE, FALSE },
- { "PMI", "PMI Payment", TRUE, FALSE },
- { "Other Expense", "Miscellaneous Payment", FALSE, FALSE },
+ { N_("Taxes"), N_("Tax Payment"), TRUE, FALSE },
+ { N_("Insurance"), N_("Insurance Payment"), TRUE, FALSE },
+ /* Translators: PMI stands for Private Mortgage Insurance. */
+ { N_("PMI"), N_("PMI Payment"), TRUE, FALSE },
+ { N_("Other Expense"), N_("Miscellaneous Payment"), FALSE, FALSE },
{ NULL }
};
@@ -263,7 +263,7 @@
GtkSpinButton *prmIrateSpin;
GtkComboBox *prmType;
GtkFrame *prmVarFrame;
- GNCFrequency *prmVarGncFreq;
+ GncFrequency *prmVarGncFreq;
GNCDateEdit *prmStartDateGDE;
GtkSpinButton *prmLengthSpin;
GtkComboBox *prmLengthType;
@@ -283,7 +283,7 @@
GNCAccountSel *repPrincToGAS;
GNCAccountSel *repIntToGAS;
GtkFrame *repFreqFrame;
- GNCFrequency *repGncFreq;
+ GncFrequency *repGncFreq;
/* pay = payment[s] */
GtkEntry *payTxnName;
@@ -301,7 +301,7 @@
GtkRadioButton *payTxnFreqPartRb;
GtkRadioButton *payTxnFreqUniqRb;
GtkAlignment *payFreqAlign;
- GNCFrequency *payGncFreq;
+ GncFrequency *payGncFreq;
/* rev = review */
GtkComboBox *revRangeOpt;
@@ -823,9 +823,9 @@
= g_new0( RepayOptData, 1 );
optData->enabled = FALSE;
- optData->name = g_strdup( REPAY_DEFAULTS[i].name );
- optData->txnMemo = g_strdup( REPAY_DEFAULTS[i].
- defaultTxnMemo );
+ optData->name = g_strdup( _(REPAY_DEFAULTS[i].name) );
+ optData->txnMemo = g_strdup( _(REPAY_DEFAULTS[i].
+ defaultTxnMemo) );
optData->amount = 0.0;
optData->throughEscrowP = REPAY_DEFAULTS[i].escrowDefault;
optData->specSrcAcctP = REPAY_DEFAULTS[i].specSrcAcctDefault;
@@ -1981,7 +1981,8 @@
ld_create_sx_from_tcSX( LoanDruidData *ldd, toCreateSX *tcSX )
{
SchedXaction *sx;
- GList *ttxnList, *sxList;
+ SchedXactions *sxes;
+ GList *ttxnList;
sx = xaccSchedXactionMalloc( gnc_get_current_book() );
xaccSchedXactionSetName( sx, tcSX->name );
@@ -2002,9 +2003,8 @@
xaccSchedXactionSetTemplateTrans( sx, ttxnList,
gnc_get_current_book() );
- sxList = gnc_book_get_schedxactions( gnc_get_current_book() );
- sxList = g_list_append( sxList, sx );
- gnc_book_set_schedxactions( gnc_get_current_book(), sxList );
+ sxes = gnc_book_get_schedxactions(gnc_get_current_book());
+ gnc_sxes_add_sx(sxes, sx);
g_list_free( ttxnList );
ttxnList = NULL;
Modified: gnucash/branches/remove-group2/src/gnome/glade/account.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/account.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/account.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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>
<child internal-child="vbox">
@@ -118,6 +119,10 @@
<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="left_attach">0</property>
@@ -142,6 +147,10 @@
<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="left_attach">0</property>
@@ -176,6 +185,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">name_entry</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="left_attach">0</property>
@@ -201,6 +214,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">code_entry</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="left_attach">0</property>
@@ -226,6 +243,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">description_entry</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="left_attach">0</property>
@@ -250,6 +271,10 @@
<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="left_attach">0</property>
@@ -294,6 +319,10 @@
<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="left_attach">0</property>
@@ -319,6 +348,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">notes_text</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="left_attach">0</property>
@@ -518,6 +551,7 @@
1/10000
1/100000
1/1000000</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
</child>
@@ -571,6 +605,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">type_view</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="left_attach">0</property>
@@ -595,6 +633,10 @@
<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="left_attach">0</property>
@@ -619,6 +661,10 @@
<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="left_attach">2</property>
@@ -643,6 +689,10 @@
<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="left_attach">3</property>
@@ -667,6 +717,10 @@
<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="left_attach">3</property>
@@ -696,6 +750,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -755,6 +811,10 @@
<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="type">tab</property>
@@ -790,6 +850,10 @@
<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="left_attach">0</property>
@@ -814,6 +878,10 @@
<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="left_attach">0</property>
@@ -838,6 +906,10 @@
<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="left_attach">0</property>
@@ -960,6 +1032,10 @@
<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>
</child>
</widget>
@@ -998,6 +1074,10 @@
<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>
</child>
</widget>
@@ -1110,6 +1190,10 @@
<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="type">tab</property>
@@ -1142,6 +1226,7 @@
<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>
<child>
<widget class="GnomeDruid" id="hierarchy_druid">
@@ -1186,6 +1271,10 @@
<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>
@@ -1213,6 +1302,10 @@
<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>
@@ -1251,6 +1344,10 @@
<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>
@@ -1296,6 +1393,10 @@
<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>
@@ -1336,6 +1437,10 @@
<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>
@@ -1373,6 +1478,8 @@
<property name="reorderable">True</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1465,6 +1572,10 @@
<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>
@@ -1556,6 +1667,10 @@
<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>
@@ -1643,6 +1758,10 @@
<property name="yalign">0.5</property>
<property name="xpad">1</property>
<property name="ypad">1</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">5</property>
@@ -1706,6 +1825,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1797,6 +1917,10 @@
<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>
</child>
</widget>
@@ -1817,6 +1941,10 @@
<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="type">label_item</property>
@@ -1870,6 +1998,7 @@
<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="druid2">
@@ -1913,6 +2042,10 @@
<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>
@@ -1952,6 +2085,7 @@
<property name="items">USD
GBP
EUR</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
</child>
@@ -1971,6 +2105,10 @@
<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="type">label_item</property>
@@ -2046,6 +2184,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -2066,6 +2206,10 @@
<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="type">label_item</property>
@@ -2143,6 +2287,10 @@
<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="type">label_item</property>
@@ -2198,6 +2346,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -2218,6 +2368,10 @@
<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="type">label_item</property>
@@ -2273,6 +2427,10 @@
<property name="yalign">0.5</property>
<property name="xpad">1</property>
<property name="ypad">1</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>
@@ -2299,6 +2457,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -2336,6 +2496,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -2402,6 +2563,10 @@
<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>
@@ -2429,6 +2594,10 @@
<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>
@@ -2535,6 +2704,10 @@
<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="left_attach">0</property>
@@ -2559,6 +2732,10 @@
<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="left_attach">0</property>
@@ -2605,6 +2782,10 @@
<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>
@@ -2647,6 +2828,10 @@
<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="left_attach">0</property>
@@ -2760,6 +2945,10 @@
<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>
@@ -2866,6 +3055,10 @@
<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="left_attach">0</property>
@@ -2890,6 +3083,10 @@
<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="left_attach">0</property>
@@ -2941,6 +3138,7 @@
<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">True</property>
<signal name="response" handler="gppat_filter_response_cb" last_modification_time="Fri, 30 Dec 2005 01:57:50 GMT"/>
@@ -3019,6 +3217,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -3101,6 +3301,10 @@
<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="type">tab</property>
@@ -3177,6 +3381,10 @@
<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="type">tab</property>
@@ -3207,6 +3415,7 @@
<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">True</property>
<signal name="response" handler="gnc_account_renumber_response_cb" last_modification_time="Sat, 18 Mar 2006 21:52:03 GMT"/>
@@ -3291,6 +3500,10 @@
<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>
@@ -3335,6 +3548,10 @@
<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="left_attach">0</property>
@@ -3359,6 +3576,10 @@
<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="left_attach">0</property>
@@ -3405,6 +3626,10 @@
<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="left_attach">0</property>
@@ -3429,6 +3654,10 @@
<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="left_attach">1</property>
@@ -3453,6 +3682,10 @@
<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="left_attach">0</property>
@@ -3499,6 +3732,10 @@
<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="left_attach">1</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/acctperiod.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/acctperiod.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/acctperiod.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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="acct_period_druid">
@@ -68,6 +69,10 @@
<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>
@@ -107,6 +112,10 @@
<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>
@@ -148,6 +157,10 @@
<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>
@@ -169,6 +182,10 @@
<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>
@@ -199,6 +216,10 @@
<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="left_attach">0</property>
@@ -223,6 +244,10 @@
<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="left_attach">0</property>
@@ -284,7 +309,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
Modified: gnucash/branches/remove-group2/src/gnome/glade/budget.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/budget.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/budget.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -81,6 +82,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -167,6 +170,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -220,6 +224,10 @@
<property name="yalign">0</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="left_attach">0</property>
@@ -265,6 +273,10 @@
<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="left_attach">0</property>
@@ -359,6 +371,10 @@
<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="left_attach">0</property>
@@ -404,6 +420,10 @@
<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="left_attach">0</property>
@@ -461,6 +481,10 @@
<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="type">tab</property>
@@ -490,6 +514,7 @@
<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="GtkVBox" id="RecurrenceEntryVBox">
@@ -516,6 +541,10 @@
<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>
@@ -551,6 +580,7 @@
week(s)
month(s)
year(s)</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -586,6 +616,10 @@
<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>
@@ -684,6 +718,7 @@
<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="GtkVBox" id="SampleOptions">
@@ -704,6 +739,10 @@
<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>
@@ -734,6 +773,7 @@
<child>
<widget class="GtkComboBoxEntry" id="SampleComboBoxEntry">
<property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
</widget>
@@ -855,6 +895,7 @@
<child>
<widget class="GtkComboBox" id="SampleComboBox">
<property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -901,6 +942,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -995,6 +1038,7 @@
<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="GtkLabel" id="label91">
@@ -1009,6 +1053,10 @@
<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>
</child>
</widget>
@@ -1026,6 +1074,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1092,6 +1141,10 @@
<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>
@@ -1137,6 +1190,10 @@
<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="left_attach">0</property>
@@ -1161,6 +1218,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/chart-export.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/chart-export.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/chart-export.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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"/>
@@ -103,6 +104,10 @@
<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>
@@ -146,6 +151,10 @@
<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>
@@ -169,6 +178,10 @@
<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>
@@ -192,6 +205,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/gnome/glade/commodities.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/commodities.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/commodities.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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>
<property name="has_separator">True</property>
<signal name="response" handler="gnc_commodities_dialog_response" last_modification_time="Wed, 23 Jul 2003 02:18:14 GMT"/>
<signal name="destroy" handler="gnc_commodities_window_destroy_cb" last_modification_time="Wed, 23 Jul 2003 02:20:32 GMT"/>
@@ -119,6 +120,10 @@
<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>
@@ -175,6 +180,10 @@
<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>
@@ -202,6 +211,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/gnome/glade/fincalc.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/fincalc.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/fincalc.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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>
<property name="has_separator">False</property>
<signal name="response" handler="fincalc_response_cb" last_modification_time="Sun, 22 Jan 2006 03:12:48 GMT"/>
@@ -112,6 +113,10 @@
<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>
@@ -159,6 +164,10 @@
<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>
@@ -204,6 +213,10 @@
<property name="yalign">0.75</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>
@@ -287,6 +300,10 @@
<property name="yalign">0.75</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>
@@ -368,6 +385,10 @@
<property name="yalign">0.75</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>
@@ -449,6 +470,10 @@
<property name="yalign">0.75</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>
@@ -530,6 +555,10 @@
<property name="yalign">0.75</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>
@@ -669,6 +698,10 @@
<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>
@@ -738,6 +771,10 @@
<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>
@@ -780,6 +817,10 @@
<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="left_attach">0</property>
@@ -804,6 +845,10 @@
<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="left_attach">1</property>
@@ -828,6 +873,10 @@
<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="left_attach">0</property>
@@ -852,6 +901,10 @@
<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="left_attach">0</property>
@@ -934,6 +987,10 @@
<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>
</child>
</widget>
@@ -972,6 +1029,10 @@
<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>
</child>
</widget>
@@ -1009,6 +1070,10 @@
<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>
</child>
</widget>
@@ -1047,6 +1112,10 @@
<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>
</child>
</widget>
@@ -1119,6 +1188,10 @@
<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="left_attach">0</property>
@@ -1143,6 +1216,10 @@
<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="left_attach">0</property>
@@ -1168,6 +1245,7 @@
Weekly
Daily (360)
Daily (365)</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -1194,6 +1272,7 @@
Weekly
Daily (360)
Daily (365)</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -1245,6 +1324,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1330,6 +1410,10 @@
<property name="yalign">1</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>
@@ -1351,6 +1435,10 @@
<property name="yalign">1</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>
@@ -1372,6 +1460,10 @@
<property name="yalign">1</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>
@@ -1393,6 +1485,10 @@
<property name="yalign">1</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>
Modified: gnucash/branches/remove-group2/src/gnome/glade/lots.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/lots.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/lots.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<signal name="response" handler="lv_response_cb" last_modification_time="Sun, 22 May 2005 21:32:09 GMT"/>
<signal name="destroy" handler="lv_window_destroy_cb" last_modification_time="Sun, 22 May 2005 21:17:37 GMT"/>
@@ -90,6 +91,10 @@
<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>
@@ -163,6 +168,10 @@
<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>
@@ -192,82 +201,7 @@
</widget>
</child>
-<!-- The View button is not implemented, remove it
<child>
- <widget class="GtkButton" id="regview button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="tooltip" translatable="yes">Open a register showing the transactions in this lot</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">1</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <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="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-jump-to</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="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_View</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- -->
-
- <child>
<widget class="GtkButton" id="button5">
<property name="visible">True</property>
<property name="can_default">True</property>
@@ -351,6 +285,10 @@
<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="left_attach">0</property>
@@ -413,6 +351,10 @@
<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="left_attach">0</property>
@@ -437,6 +379,10 @@
<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="left_attach">0</property>
@@ -475,6 +421,10 @@
<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="left_attach">0</property>
@@ -504,6 +454,8 @@
<property name="reorderable">False</property>
<property name="enable_search">False</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -550,6 +502,10 @@
<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="left_attach">0</property>
@@ -591,6 +547,10 @@
<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>
</child>
@@ -606,6 +566,10 @@
<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>
</child>
@@ -621,6 +585,10 @@
<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>
</child>
@@ -636,6 +604,10 @@
<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>
</child>
@@ -651,6 +623,10 @@
<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>
</child>
@@ -666,6 +642,10 @@
<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>
</child>
@@ -681,6 +661,10 @@
<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>
</child>
</widget>
Modified: gnucash/branches/remove-group2/src/gnome/glade/merge.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/merge.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/merge.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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">
@@ -92,6 +93,10 @@
<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>
@@ -137,6 +142,10 @@
<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>
@@ -172,6 +181,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/gnome/glade/newuser.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/newuser.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/newuser.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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>
<child internal-child="vbox">
@@ -108,6 +109,10 @@
<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="left_attach">1</property>
@@ -138,6 +143,10 @@
<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>
@@ -240,6 +249,7 @@
<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>
<child internal-child="vbox">
@@ -331,6 +341,10 @@
<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="left_attach">1</property>
@@ -355,6 +369,10 @@
<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="left_attach">1</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/price.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/price.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/price.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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>
<property name="has_separator">True</property>
<signal name="response" handler="gnc_prices_dialog_response" last_modification_time="Tue, 25 Nov 2003 06:49:39 GMT"/>
<signal name="destroy" handler="gnc_prices_dialog_window_destroy_cb" last_modification_time="Tue, 25 Nov 2003 07:56:53 GMT"/>
@@ -170,6 +171,10 @@
<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>
@@ -242,6 +247,10 @@
<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>
@@ -314,6 +323,10 @@
<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>
@@ -351,6 +364,7 @@
<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">True</property>
<signal name="response" handler="pedit_dialog_response_cb" last_modification_time="Sun, 22 Jan 2006 20:18:04 GMT"/>
@@ -422,6 +436,10 @@
<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="left_attach">0</property>
@@ -446,6 +464,10 @@
<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="left_attach">0</property>
@@ -470,6 +492,10 @@
<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="left_attach">0</property>
@@ -494,6 +520,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">source_entry</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="left_attach">0</property>
@@ -519,6 +549,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">type_combobox</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="left_attach">0</property>
@@ -543,6 +577,10 @@
<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="left_attach">0</property>
@@ -662,6 +700,7 @@
Last
Net Asset Value
Unknown</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="pedit_data_changed_cb" last_modification_time="Sun, 22 Jan 2006 20:04:30 GMT"/>
</widget>
@@ -699,6 +738,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -768,6 +808,10 @@
<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="left_attach">0</property>
@@ -838,6 +882,10 @@
<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="left_attach">0</property>
@@ -862,6 +910,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/print.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/print.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/print.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<signal name="response" handler="gnc_ui_print_check_response_cb" last_modification_time="Sun, 22 Jan 2006 21:24:04 GMT"/>
@@ -111,6 +112,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">check_format_combobox</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="left_attach">0</property>
@@ -136,6 +141,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">check_position_combobox</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="left_attach">0</property>
@@ -160,6 +169,10 @@
<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="left_attach">0</property>
@@ -178,6 +191,7 @@
Deluxe(tm) Personal Checks US-Letter
Quicken(tm) Wallet Checks w/ side stub
Custom</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="gnc_print_check_combobox_changed" last_modification_time="Sat, 28 Jan 2006 04:19:16 GMT"/>
</widget>
@@ -197,6 +211,7 @@
Middle
Bottom
Custom</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="gnc_print_check_combobox_changed" last_modification_time="Sat, 28 Jan 2006 04:19:41 GMT"/>
</widget>
@@ -229,6 +244,10 @@
<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="type">tab</property>
@@ -257,6 +276,10 @@
<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="left_attach">1</property>
@@ -281,6 +304,10 @@
<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="left_attach">2</property>
@@ -306,6 +333,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">payee_x_entry</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="left_attach">0</property>
@@ -331,6 +362,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">date_x_entry</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="left_attach">0</property>
@@ -356,6 +391,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">amount_words_x_entry</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="left_attach">0</property>
@@ -381,6 +420,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">amount_numbers_x_entry</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="left_attach">0</property>
@@ -406,6 +449,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">memo_x_entry</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="left_attach">0</property>
@@ -644,6 +691,7 @@
Centimeters
Millimeters
Points</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -670,6 +718,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">units_combobox</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="left_attach">0</property>
@@ -716,6 +768,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">translation_x_entry</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="left_attach">0</property>
@@ -741,6 +797,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">check_rotation_entry</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="left_attach">0</property>
@@ -813,6 +873,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/progress.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/progress.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/progress.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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>
<child>
<widget class="GtkVBox" id="vbox85">
@@ -39,6 +40,10 @@
<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>
@@ -53,6 +58,7 @@
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
<property name="pulse_step">0.10000000149</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
<packing>
<property name="padding">0</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/reconcile.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/reconcile.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/reconcile.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -84,6 +85,10 @@
<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>
@@ -127,6 +132,10 @@
<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="left_attach">1</property>
@@ -151,6 +160,10 @@
<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="left_attach">0</property>
@@ -173,6 +186,10 @@
<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="left_attach">0</property>
@@ -195,6 +212,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/register.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/register.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/register.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -79,6 +80,10 @@
<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>
@@ -121,6 +126,10 @@
<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="left_attach">0</property>
@@ -146,6 +155,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">num_spin</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="left_attach">0</property>
@@ -224,6 +237,7 @@
<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="GtkToolbar" id="toolbar">
@@ -420,6 +434,7 @@
<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="GtkMenuBar" id="register_menubar">
@@ -866,6 +881,7 @@
<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="GtkToolbar" id="gnc_register_toolbar">
@@ -1118,6 +1134,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1185,6 +1202,10 @@
<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>
@@ -1237,6 +1258,7 @@
<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">True</property>
<signal name="response" handler="gnc_plugin_page_register_sort_response_cb" last_modification_time="Sun, 12 Jun 2005 01:03:23 GMT"/>
@@ -1547,6 +1569,7 @@
<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">True</property>
<signal name="response" handler="gnc_plugin_page_register_filter_response_cb" last_modification_time="Sun, 12 Jun 2005 20:35:52 GMT"/>
@@ -1645,6 +1668,10 @@
<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>
@@ -1696,6 +1723,10 @@
<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="left_attach">0</property>
@@ -1833,6 +1864,10 @@
<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="left_attach">0</property>
@@ -1857,6 +1892,10 @@
<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="left_attach">0</property>
@@ -1960,6 +1999,10 @@
<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="type">tab</property>
@@ -1989,6 +2032,10 @@
<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="left_attach">2</property>
@@ -2012,6 +2059,10 @@
<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="left_attach">0</property>
@@ -2176,6 +2227,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/sched-xact.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/sched-xact.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/sched-xact.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -77,7 +78,7 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox105">
+ <widget class="GtkVBox" id="editor-vbox">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@@ -114,6 +115,10 @@
<property name="xpad">5</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">sxe_name</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>
@@ -179,6 +184,10 @@
<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>
@@ -200,6 +209,10 @@
<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>
@@ -223,7 +236,7 @@
<child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">0</property>
@@ -244,8 +257,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -266,8 +279,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -311,6 +324,10 @@
<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>
@@ -322,8 +339,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
@@ -345,8 +362,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -390,6 +407,10 @@
<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>
@@ -401,8 +422,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
@@ -438,13 +459,35 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_padding">24</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="enabled_opt">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Enabled</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -468,6 +511,10 @@
<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>
@@ -489,6 +536,10 @@
<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>
@@ -534,6 +585,10 @@
<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>
@@ -555,6 +610,10 @@
<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>
@@ -583,6 +642,10 @@
<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>
@@ -693,6 +756,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</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="left_attach">2</property>
@@ -717,6 +784,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</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="left_attach">2</property>
@@ -838,6 +909,10 @@
<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>
@@ -935,6 +1010,10 @@
<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>
@@ -956,6 +1035,10 @@
<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>
@@ -1004,6 +1087,7 @@
<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="GtkVBox" id="gncfreq_vbox">
@@ -1033,6 +1117,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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="left_attach">0</property>
@@ -1057,6 +1145,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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="left_attach">0</property>
@@ -1083,6 +1175,7 @@
Tri-Yearly
Semi-Yearly
Yearly</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -1123,6 +1216,10 @@
<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="tab_expand">False</property>
@@ -1143,6 +1240,10 @@
<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="type">tab</property>
@@ -1168,6 +1269,10 @@
<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>
@@ -1195,6 +1300,10 @@
<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="type">tab</property>
@@ -1226,6 +1335,10 @@
<property name="yalign">0.5</property>
<property name="xpad">4</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>
@@ -1266,6 +1379,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -1300,6 +1417,10 @@
<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="type">tab</property>
@@ -1331,6 +1452,10 @@
<property name="yalign">0.5</property>
<property name="xpad">4</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>
@@ -1371,6 +1496,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -1405,6 +1534,10 @@
<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="type">tab</property>
@@ -1436,6 +1569,10 @@
<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>
@@ -1476,6 +1613,10 @@
<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>
@@ -1692,6 +1833,10 @@
<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="type">label_item</property>
@@ -1724,6 +1869,10 @@
<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="type">tab</property>
@@ -1749,6 +1898,10 @@
<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>
@@ -1776,6 +1929,10 @@
<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="type">tab</property>
@@ -1814,6 +1971,10 @@
<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>
@@ -1854,6 +2015,10 @@
<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>
@@ -1888,6 +2053,10 @@
<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>
@@ -1930,6 +2099,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -1965,6 +2135,10 @@
<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>
@@ -2007,6 +2181,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2049,6 +2224,10 @@
<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="type">tab</property>
@@ -2086,6 +2265,10 @@
<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>
@@ -2126,6 +2309,10 @@
<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>
@@ -2160,6 +2347,10 @@
<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">2</property>
@@ -2202,6 +2393,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2244,6 +2436,10 @@
<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="type">tab</property>
@@ -2276,6 +2472,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2290,6 +2490,7 @@
<property name="items" translatable="yes">Jan, Apr, Jul, Oct
Feb, May, Aug, Nov
Mar, Jun, Sep, Dec</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2326,6 +2527,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2368,6 +2573,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2403,6 +2609,10 @@
<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="type">tab</property>
@@ -2435,6 +2645,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2449,6 +2663,7 @@
<property name="items" translatable="yes">Jan, May, Sep
Feb, Jun, Oct
Mar, Jul, Nov</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2485,6 +2700,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2527,6 +2746,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2562,6 +2782,10 @@
<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="type">tab</property>
@@ -2594,6 +2818,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2611,6 +2839,7 @@
Apr, Oct
May, Nov
Jun, Dec</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2647,6 +2876,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2689,6 +2922,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2724,6 +2958,10 @@
<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="type">tab</property>
@@ -2756,6 +2994,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2796,6 +3038,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2831,6 +3077,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2854,6 +3104,7 @@
October
November
December</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2890,6 +3141,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</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>
@@ -2932,6 +3187,7 @@
[29th/last]
[30th/last]
[31st/last]</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -2967,6 +3223,10 @@
<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="type">tab</property>
@@ -2983,360 +3243,6 @@
</child>
</widget>
-<widget class="GtkDialog" id="Scheduled Transaction List">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Scheduled Transactions</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">640</property>
- <property name="default_height">480</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="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox18">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">8</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area18">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="close_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-close</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">0</property>
- </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="GtkLabel" id="label847992">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Transactions</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment34">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox123">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkCList" id="sched_xact_list">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="n_columns">3</property>
- <property name="column_widths">127,140,80</property>
- <property name="selection_mode">GTK_SELECTION_SINGLE</property>
- <property name="show_titles">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkLabel" id="label847750">
- <property name="label" translatable="yes">Name</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>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label847751">
- <property name="label" translatable="yes">Frequency</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>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label847752">
- <property name="label" translatable="yes">Next Occurrence</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>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
- <property name="spacing">10</property>
-
- <child>
- <widget class="GtkButton" id="new_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-new</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="edit_button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment24">
- <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="hbox179">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-properties</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label847980">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="delete_button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label847993">
- <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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label847970">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Upcoming</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment35">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="upcoming_cal_hbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
<widget class="GtkDialog" id="sx_from_real_trans">
<property name="visible">True</property>
<property name="title" translatable="yes">Make Scheduled Transaction</property>
@@ -3350,6 +3256,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -3444,6 +3351,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</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="left_attach">0</property>
@@ -3468,6 +3379,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</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="left_attach">0</property>
@@ -3492,6 +3407,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</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="left_attach">0</property>
@@ -3533,6 +3452,7 @@
Monthly
Quarterly
Yearly</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -3696,6 +3616,10 @@
<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="type">label_item</property>
@@ -3757,6 +3681,7 @@
<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="sincelast_druid">
@@ -3803,6 +3728,7 @@
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
<property name="pulse_step">0.10000000149</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
</child>
@@ -3819,6 +3745,10 @@
<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="type">label_item</property>
@@ -3864,6 +3794,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">11</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>
@@ -3902,6 +3836,10 @@
<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>
</child>
@@ -3917,6 +3855,10 @@
<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>
</child>
@@ -3932,6 +3874,10 @@
<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>
</child>
</widget>
@@ -4025,6 +3971,10 @@
<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>
</child>
@@ -4040,6 +3990,10 @@
<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>
</child>
</widget>
@@ -4076,6 +4030,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</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>
@@ -4185,6 +4143,10 @@
<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="left_attach">1</property>
@@ -4208,6 +4170,10 @@
<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="left_attach">0</property>
@@ -4248,6 +4214,10 @@
<property name="yalign">0.5</property>
<property name="xpad">3</property>
<property name="ypad">3</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>
@@ -4291,6 +4261,10 @@
<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="type">label_item</property>
@@ -4349,6 +4323,10 @@
<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="type">label_item</property>
@@ -4421,6 +4399,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">11</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>
@@ -4460,6 +4442,10 @@
<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>
</child>
@@ -4475,6 +4461,10 @@
<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>
</child>
@@ -4490,6 +4480,10 @@
<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>
</child>
</widget>
@@ -4570,6 +4564,7 @@
<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="loan_druid">
@@ -4631,6 +4626,10 @@
<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="left_attach">0</property>
@@ -4655,6 +4654,10 @@
<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="left_attach">0</property>
@@ -4679,6 +4682,10 @@
<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="left_attach">0</property>
@@ -4703,6 +4710,10 @@
<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="left_attach">0</property>
@@ -4727,6 +4738,10 @@
<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="left_attach">0</property>
@@ -4789,6 +4804,7 @@
<property name="visible">True</property>
<property name="items" translatable="yes">months
years</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -4882,6 +4898,10 @@
<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>
@@ -4914,6 +4934,10 @@
<property name="yalign">0</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="left_attach">2</property>
@@ -4937,6 +4961,10 @@
<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="left_attach">2</property>
@@ -4984,6 +5012,10 @@
<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="type">label_item</property>
@@ -5010,6 +5042,7 @@
5/1 Year ARM
7/1 Year ARM
10/1 Year ARM</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -5061,6 +5094,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">10</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>
@@ -5137,6 +5174,10 @@
<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>
@@ -5234,6 +5275,10 @@
<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="left_attach">0</property>
@@ -5258,6 +5303,10 @@
<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="left_attach">0</property>
@@ -5282,6 +5331,10 @@
<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="left_attach">0</property>
@@ -5306,6 +5359,10 @@
<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="left_attach">0</property>
@@ -5330,6 +5387,10 @@
<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="left_attach">2</property>
@@ -5449,6 +5510,10 @@
<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="type">label_item</property>
@@ -5528,6 +5593,10 @@
<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="left_attach">0</property>
@@ -5552,6 +5621,10 @@
<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="left_attach">0</property>
@@ -5576,6 +5649,10 @@
<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="left_attach">0</property>
@@ -5600,6 +5677,10 @@
<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="left_attach">2</property>
@@ -5694,6 +5775,10 @@
<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="left_attach">0</property>
@@ -5718,6 +5803,10 @@
<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="left_attach">2</property>
@@ -5896,6 +5985,10 @@
<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="type">label_item</property>
@@ -5970,6 +6063,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">5</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>
@@ -5991,6 +6088,7 @@
Now + 1 Year
Whole Loan
Custom</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -6045,6 +6143,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">5</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="left_attach">0</property>
@@ -6069,6 +6171,10 @@
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">5</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="left_attach">0</property>
@@ -6095,6 +6201,10 @@
<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="type">label_item</property>
@@ -6252,6 +6362,7 @@
<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="GtkTable" id="sx_prefs">
@@ -6276,6 +6387,10 @@
<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="left_attach">0</property>
@@ -6300,6 +6415,10 @@
<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="left_attach">0</property>
@@ -6324,6 +6443,10 @@
<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="left_attach">0</property>
@@ -6410,6 +6533,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/scheduled_trans/transaction_editor/create_days</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>
@@ -6448,6 +6575,10 @@
<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>
</child>
</widget>
@@ -6500,6 +6631,10 @@
<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>
@@ -6557,6 +6692,10 @@
<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>
@@ -6619,6 +6758,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -6672,6 +6812,10 @@
<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>
@@ -6697,6 +6841,8 @@
<property name="reorderable">False</property>
<property name="enable_search">False</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -6717,4 +6863,384 @@
</child>
</widget>
+<widget class="GtkWindow" id="sx list plugin page content">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">window1</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="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="GtkVPaned" id="sx-list-vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox183">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label847992">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Transactions</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <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="GtkAlignment" id="alignment34">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox123">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="sx_list">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">True</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </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="shrink">True</property>
+ <property name="resize">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="upcoming mumble">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label847993">
+ <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="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="label847970">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Upcoming</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <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="GtkAlignment" id="alignment35">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="upcoming_cal_hbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </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="shrink">True</property>
+ <property name="resize">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkDialog" id="since-last-run-dialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Since Last Run...</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="default_width">640</property>
+ <property name="default_height">480</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">True</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">True</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox25">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area25">
+ <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_default">True</property>
+ <property name="has_default">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="okbutton2">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</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">-5</property>
+ </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="vbox182">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVPaned" id="paned">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="position">240</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow21">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="instance_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">True</property>
+ <property name="resize">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox179">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkFixed" id="fixed1">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="review_txn_toggle">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Review created transactions</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</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">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>
Modified: gnucash/branches/remove-group2/src/gnome/glade/stocks.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/stocks.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/stocks.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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>
<signal name="destroy" handler="gnc_stock_split_druid_window_destroy_cb" last_modification_time="Sat, 23 Aug 2003 22:43:04 GMT"/>
<child>
@@ -69,6 +70,10 @@
<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>
@@ -95,6 +100,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -139,6 +146,10 @@
<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>
@@ -170,6 +181,10 @@
<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="left_attach">0</property>
@@ -194,6 +209,10 @@
<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="left_attach">0</property>
@@ -219,6 +238,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">description_entry</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="left_attach">0</property>
@@ -277,6 +300,10 @@
<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="left_attach">0</property>
@@ -301,6 +328,10 @@
<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="left_attach">0</property>
@@ -325,6 +356,10 @@
<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="left_attach">0</property>
@@ -457,6 +492,10 @@
<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>
@@ -487,6 +526,10 @@
<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="left_attach">0</property>
@@ -512,6 +555,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">memo_entry</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="left_attach">0</property>
@@ -593,6 +640,10 @@
<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="left_attach">0</property>
@@ -617,6 +668,10 @@
<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="left_attach">1</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/tax.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/tax.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/tax.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -86,6 +87,10 @@
<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="left_attach">2</property>
@@ -176,6 +181,10 @@
<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>
@@ -204,6 +213,10 @@
<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>
@@ -241,6 +254,8 @@
<property name="reorderable">True</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -322,6 +337,10 @@
<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>
@@ -350,6 +369,10 @@
<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>
@@ -558,6 +581,10 @@
<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>
@@ -579,6 +606,10 @@
<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>
@@ -600,6 +631,10 @@
<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>
@@ -621,6 +656,10 @@
<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>
@@ -698,6 +737,10 @@
<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>
@@ -743,6 +786,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/gnome/glade/userpass.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome/glade/userpass.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/glade/userpass.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -78,6 +79,10 @@
<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>
@@ -110,6 +115,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">username_entry</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="left_attach">0</property>
@@ -135,6 +144,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">password_entry</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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/gnc-plugin-basic-commands.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/gnc-plugin-basic-commands.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,8 +41,7 @@
#include "dialog-chart-export.h"
#include "dialog-fincalc.h"
#include "dialog-find-transactions.h"
-#include "dialog-scheduledxaction.h"
-#include "dialog-sxsincelast.h"
+#include "dialog-sx-since-last-run.h"
#include "dialog-totd.h"
#include "druid-acct-period.h"
#include "druid-loan.h"
@@ -54,6 +53,7 @@
#include "gnc-ui.h"
#include "gnc-window.h"
#include "gnc-session.h"
+#include "gnc-plugin-page-sx-list.h"
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_GUI;
@@ -221,6 +221,10 @@
{
GncPluginBasicCommands *plugin;
+ /* We just need to mention it, so the GType is registered and will be
+ * reflected during plugin-page restore. */
+ GNC_TYPE_PLUGIN_PAGE_SX_LIST;
+
plugin = g_object_new (GNC_TYPE_PLUGIN_BASIC_COMMANDS, NULL);
return GNC_PLUGIN (plugin);
@@ -434,35 +438,50 @@
static void
gnc_main_window_cmd_actions_scheduled_transaction_editor (GtkAction *action, GncMainWindowActionData *data)
{
- gnc_ui_scheduled_xaction_dialog_create ();
+ GncPluginPage *page = gnc_plugin_page_sx_list_new();
+ gnc_main_window_open_page(NULL, page);
}
static void
gnc_main_window_cmd_actions_since_last_run (GtkAction *action, GncMainWindowActionData *data)
{
GncMainWindow *window;
- gint ret;
+ GncSxInstanceModel *sx_instances;
+ GncSxSummary summary;
const char *nothing_to_do_msg =
_( "There are no Scheduled Transactions to be entered at this time." );
g_return_if_fail (data != NULL);
window = data->window;
- ret = gnc_ui_sxsincelast_dialog_create ();
- if ( ret == 0 ) {
- gnc_info_dialog (GTK_WIDGET(&window->gtk_window), nothing_to_do_msg);
- } else if ( ret < 0 ) {
- gnc_info_dialog (GTK_WIDGET(&window->gtk_window), ngettext
- /* Translators: %d is the number of transactions. This is a
- ngettext(3) message. */
- ("There are no Scheduled Transactions to be entered at this time. "
- "(%d transaction automatically created)",
- "There are no Scheduled Transactions to be entered at this time. "
- "(%d transactions automatically created)",
- -(ret)),
- -(ret));
- } /* else { this else [>0 means dialog was created] intentionally left
- * blank. } */
+
+ sx_instances = gnc_sx_get_current_instances();
+ gnc_sx_instance_model_summarize(sx_instances, &summary);
+ gnc_sx_instance_model_effect_change(sx_instances, TRUE, NULL, NULL);
+ if (summary.need_dialog)
+ {
+ gnc_ui_sx_since_last_run_dialog(sx_instances);
+ }
+ else
+ {
+ if (summary.num_auto_create_no_notify_instances == 0)
+ {
+ gnc_info_dialog(GTK_WIDGET(&window->gtk_window), nothing_to_do_msg);
+ }
+ else
+ {
+ gnc_info_dialog(GTK_WIDGET(&window->gtk_window), ngettext
+ /* Translators: %d is the number of transactions. This is a
+ ngettext(3) message. */
+ ("There are no Scheduled Transactions to be entered at this time. "
+ "(%d transaction automatically created)",
+ "There are no Scheduled Transactions to be entered at this time. "
+ "(%d transactions automatically created)",
+ summary.num_auto_create_no_notify_instances),
+ summary.num_auto_create_no_notify_instances);
+ }
+ }
+ g_object_unref(G_OBJECT(sx_instances));
}
static void
Modified: gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-account-tree.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-account-tree.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -36,9 +36,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h"
Modified: gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-budget.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-budget.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-budget.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,10 +39,6 @@
#include <glade/glade.h>
#include "gnc-date-edit.h"
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
-
#include "gnc-plugin-page-register.h"
#include "gnc-budget.h"
Modified: gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-register.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-register.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -38,9 +38,6 @@
#include "guile-mappings.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
#include "swig-runtime.h"
#include "gnc-plugin-page-register.h"
@@ -76,8 +73,6 @@
#include "window-reconcile.h"
#include "window-report.h"
-#include "gtk-compat.h"
-
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_GUI;
Copied: gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-sx-list.c (from rev 15563, gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.c)
Copied: gnucash/branches/remove-group2/src/gnome/gnc-plugin-page-sx-list.h (from rev 15563, gnucash/trunk/src/gnome/gnc-plugin-page-sx-list.h)
Modified: gnucash/branches/remove-group2/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/gnc-split-reg.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/gnc-split-reg.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,7 +5,7 @@
* Copyright (C) 1998 Rob Browning <rlb at cs.utexas.edu> *
* Copyright (C) 1999-2000 Dave Peticolas <dave at krondo.com> *
* Copyright (C) 2001 Gnumatic, Inc. *
- * Copyright (C) 2002 Joshua Sled <jsled at asynchronous.org> *
+ * Copyright (C) 2002,2006 Joshua Sled <jsled at asynchronous.org> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@@ -37,7 +37,7 @@
#include "QueryNew.h"
#include "SX-book.h"
#include "dialog-account.h"
-#include "dialog-scheduledxaction.h"
+#include "dialog-sx-editor.h"
#include "dialog-sx-from-trans.h"
#include "gnc-component-manager.h"
#include "gnc-date-edit.h"
@@ -170,10 +170,10 @@
FROM_STRING_FUNC(SortType, ENUM_LIST_SORTTYPE)
AS_STRING_FUNC(SortType, ENUM_LIST_SORTTYPE)
-guint
+GType
gnc_split_reg_get_type( void )
{
- static guint gnc_split_reg_type = 0;
+ static GType gnc_split_reg_type = 0;
if (!gnc_split_reg_type)
{
@@ -991,7 +991,7 @@
gtk_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- gnc_gtk_dialog_add_button(dialog, N_("_Remove Splits"),
+ gnc_gtk_dialog_add_button(dialog, _("_Remove Splits"),
GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT);
response = gnc_dialog_run(GTK_DIALOG(dialog), warning);
gtk_widget_destroy (dialog);
@@ -1227,7 +1227,7 @@
GList *sxElts;
/* Get the correct SX */
- for ( sxElts = gnc_book_get_schedxactions( gnc_get_current_book() );
+ for ( sxElts = gnc_book_get_schedxactions(gnc_get_current_book())->sx_list;
(!theSX) && sxElts;
sxElts = sxElts->next ) {
SchedXaction *sx = (SchedXaction*)sxElts->data;
@@ -1237,8 +1237,7 @@
}
if ( theSX ) {
- SchedXactionDialog *sxd = gnc_ui_scheduled_xaction_dialog_create();
- gnc_ui_scheduled_xaction_editor_dialog_create( sxd, theSX, FALSE );
+ gnc_ui_scheduled_xaction_editor_dialog_create(theSX, FALSE);
return;
}
}
Modified: gnucash/branches/remove-group2/src/gnome/gnc-split-reg.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome/gnc-split-reg.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/gnc-split-reg.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -159,7 +159,7 @@
/**
* GTK-related; gets an identifier for the class of GNCSplitRegs.
**/
-guint gnc_split_reg_get_type(void);
+GType gnc_split_reg_get_type(void);
/**
* Creates and returns a GNCSplitReg.
Copied: gnucash/branches/remove-group2/src/gnome/gnc-sx-list-tree-model-adapter.c (from rev 15563, gnucash/trunk/src/gnome/gnc-sx-list-tree-model-adapter.c)
Copied: gnucash/branches/remove-group2/src/gnome/gnc-sx-list-tree-model-adapter.h (from rev 15563, gnucash/trunk/src/gnome/gnc-sx-list-tree-model-adapter.h)
Modified: gnucash/branches/remove-group2/src/gnome/top-level.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/top-level.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/top-level.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -33,7 +33,7 @@
#include "dialog-account.h"
#include "dialog-commodity.h"
#include "dialog-options.h"
-#include "dialog-scheduledxaction.h"
+#include "dialog-sx-editor.h"
#include "dialog-transfer.h"
#include "dialog-totd.h"
#include "druid-hierarchy.h"
Modified: gnucash/branches/remove-group2/src/gnome/ui/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnome/ui/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/ui/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -8,6 +8,7 @@
gnc-plugin-file-history-ui.xml \
gnc-plugin-register-ui.xml \
gnc-plugin-page-register-ui.xml \
+ gnc-plugin-page-sx-list-ui.xml \
gnc-plugin-page-sxregister-ui.xml \
gnc-sxed-to-create-window-ui.xml \
gnc-reconcile-window-ui.xml \
Copied: gnucash/branches/remove-group2/src/gnome/ui/gnc-plugin-page-sx-list-ui.xml (from rev 15563, gnucash/trunk/src/gnome/ui/gnc-plugin-page-sx-list-ui.xml)
Modified: gnucash/branches/remove-group2/src/gnome/window-reconcile.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome/window-reconcile.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome/window-reconcile.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,7 +31,6 @@
#include "config.h"
#include <gtk/gtk.h>
-#include "gtk-compat.h"
#include <glib/gi18n.h>
#include "Scrub.h"
@@ -1285,30 +1284,36 @@
gnc_numeric *new_ending,
time_t *statement_date)
{
+ GDate date;
time_t today;
struct tm tm;
+ g_date_clear(&date, 1);
+
if (xaccAccountGetReconcileLastDate (account, statement_date))
{
int months = 1, days = 0;
- tm = * localtime (statement_date);
+ g_date_set_time_t(&date, *statement_date);
- /* How far should the date be moved? Args unchanged on failure. */
xaccAccountGetReconcileLastInterval (account, &months, &days);
if (months) {
- /*
- * Add in the months and normalize
- */
- date_add_months(&tm, months, TRUE);
+ gboolean was_last_day_of_month = g_date_is_last_of_month(&date);
+
+ g_date_add_months(&date, months);
+
+ /* Track last day of the month, i.e. 1/31 -> 2/28 -> 3/31 */
+ if (was_last_day_of_month)
+ {
+ g_date_set_day(&date, g_date_get_days_in_month(g_date_get_month(&date),
+ g_date_get_year(&date)));
+ }
} else {
- /*
- * Add in the days (weeks if multiple of seven).
- */
- tm.tm_mday += days;
+ g_date_add_days(&date, days);
}
- tm.tm_isdst = -1;
+
+ g_date_to_struct_tm(&date, &tm);
gnc_tm_set_day_end (&tm);
*statement_date = mktime (&tm);
Modified: gnucash/branches/remove-group2/src/gnome-search/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,3 @@
-PWD := $(shell pwd)
-
pkglib_LTLIBRARIES = libgncmod-gnome-search.la
AM_CFLAGS = \
@@ -51,11 +49,13 @@
search-reconciled.h \
search-string.h
+libgncmod_gnome_search_la_LDFLAGS = -avoid-version
+
libgncmod_gnome_search_la_LIBADD = \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${GUILE_LIBS} \
${GNOME_LIBS} \
${GTKHTML_LIBS} \
@@ -72,3 +72,4 @@
EXTRA_DIST = \
${glade_DATA}
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.search\"
Modified: gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -80,10 +80,10 @@
*
* Returns the GtkType for the GNCGeneralSearch widget
*/
-guint
+GType
gnc_general_search_get_type (void)
{
- static guint general_search_type = 0;
+ static GType general_search_type = 0;
if (!general_search_type){
static const GTypeInfo our_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/gnc-general-search.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -83,7 +83,7 @@
gpointer searched);
gpointer gnc_general_search_get_selected (GNCGeneralSearch *gsl);
-guint gnc_general_search_get_type (void);
+GType gnc_general_search_get_type (void);
#endif
Modified: gnucash/branches/remove-group2/src/gnome-search/gncmod-gnome-search.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/gncmod-gnome-search.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/gncmod-gnome-search.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
/*********************************************************************
* gncmod-gnome-search
* GNC Module initialization for the Gnome Search UI
- *
+ *
* Copyright (c) 2002 Derek Atkins <warlord at MIT.EDU>
*
* This program is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
#endif
#include <gtk/gtk.h>
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -36,34 +36,28 @@
#include "search-core-type.h"
/* version of the gnc module system interface we require */
-int libgncmod_gnome_search_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_gnome_search_LTX_gnc_module_current = 0;
-int libgncmod_gnome_search_LTX_gnc_module_revision = 0;
-int libgncmod_gnome_search_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_gnome_search_LTX_gnc_module_path(void);
-char *libgncmod_gnome_search_LTX_gnc_module_description(void);
-int libgncmod_gnome_search_LTX_gnc_module_init(int refcount);
-int libgncmod_gnome_search_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_gnome_search_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/gnome-search");
}
-char *
-libgncmod_gnome_search_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("The GnuCash Gnome Search UI");
}
int
-libgncmod_gnome_search_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
@@ -74,17 +68,17 @@
return FALSE;
}
- if(refcount == 0)
+ if(refcount == 0)
{
/* initialize known types */
gnc_search_core_initialize ();
}
-
+
return TRUE;
}
int
-libgncmod_gnome_search_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
/* XXX Unload the other modules */
if (refcount == 0) {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-account.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -59,10 +59,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_account_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-account.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-account.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-account.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -46,7 +46,7 @@
/* signals */
};
-guint gnc_search_account_get_type (void);
+GType gnc_search_account_get_type (void);
GNCSearchAccount *gnc_search_account_new (void);
GNCSearchAccount *gnc_search_account_matchall_new (void);
Modified: gnucash/branches/remove-group2/src/gnome-search/search-boolean.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-boolean.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-boolean.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -54,10 +54,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_boolean_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-boolean.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-boolean.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-boolean.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -47,7 +47,7 @@
/* signals */
};
-guint gnc_search_boolean_get_type (void);
+GType gnc_search_boolean_get_type (void);
GNCSearchBoolean *gnc_search_boolean_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/gnome-search/search-date.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-date.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-date.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -58,10 +58,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_date_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-date.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-date.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-date.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -48,7 +48,7 @@
/* signals */
};
-guint gnc_search_date_get_type (void);
+GType gnc_search_date_get_type (void);
GNCSearchDate *gnc_search_date_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/gnome-search/search-double.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-double.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-double.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -58,10 +58,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_double_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-double.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-double.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-double.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -47,7 +47,7 @@
/* signals */
};
-guint gnc_search_double_get_type (void);
+GType gnc_search_double_get_type (void);
GNCSearchDouble *gnc_search_double_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/gnome-search/search-int64.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-int64.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-int64.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -59,10 +59,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_int64_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-int64.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-int64.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-int64.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -47,7 +47,7 @@
/* signals */
};
-guint gnc_search_int64_get_type (void);
+GType gnc_search_int64_get_type (void);
GNCSearchInt64 *gnc_search_int64_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/gnome-search/search-numeric.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-numeric.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-numeric.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -59,10 +59,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_numeric_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-numeric.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-numeric.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-numeric.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -50,7 +50,7 @@
/* signals */
};
-guint gnc_search_numeric_get_type (void);
+GType gnc_search_numeric_get_type (void);
GNCSearchNumeric *gnc_search_numeric_new (void);
GNCSearchNumeric *gnc_search_numeric_debcred_new (void);
Modified: gnucash/branches/remove-group2/src/gnome-search/search-reconciled.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-reconciled.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-reconciled.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -55,10 +55,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_reconciled_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-reconciled.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-reconciled.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-reconciled.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -47,7 +47,7 @@
/* signals */
};
-guint gnc_search_reconciled_get_type (void);
+GType gnc_search_reconciled_get_type (void);
GNCSearchReconciled *gnc_search_reconciled_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/gnome-search/search-string.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-string.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-string.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -58,10 +58,10 @@
static GNCSearchCoreTypeClass *parent_class;
-guint
+GType
gnc_search_string_get_type (void)
{
- static guint type = 0;
+ static GType type = 0;
if (!type) {
GTypeInfo type_info = {
Modified: gnucash/branches/remove-group2/src/gnome-search/search-string.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search-string.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search-string.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -54,7 +54,7 @@
/* signals */
};
-guint gnc_search_string_get_type (void);
+GType gnc_search_string_get_type (void);
GNCSearchString *gnc_search_string_new (void);
/* methods */
Modified: gnucash/branches/remove-group2/src/gnome-search/search.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-search/search.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-search/search.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -87,6 +88,10 @@
<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>
@@ -197,6 +202,10 @@
<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>
@@ -218,6 +227,10 @@
<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>
@@ -310,6 +323,10 @@
<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>
@@ -375,6 +392,10 @@
<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="type">label_item</property>
@@ -545,6 +566,10 @@
<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="type">label_item</property>
Modified: gnucash/branches/remove-group2/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,4 @@
SUBDIRS = glade schemas . test ui
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-gnome-utils.la
@@ -50,6 +49,8 @@
gnc-date-edit.c \
gnc-date-format.c \
gnc-dense-cal.c \
+ gnc-dense-cal-model.c \
+ gnc-dense-cal-store.c \
gnc-druid-gnome.c \
gnc-druid-provider-edge-gnome.c \
gnc-druid-provider-file-gnome.c \
@@ -75,6 +76,7 @@
gnc-period-select.c \
gnc-query-list.c \
gnc-splash.c \
+ gnc-sx-instance-dense-cal-adapter.c \
gnc-tree-model.c \
gnc-tree-model-account-types.c \
gnc-tree-model-account.c \
@@ -118,6 +120,8 @@
gnc-date-edit.h \
gnc-date-format.h \
gnc-dense-cal.h \
+ gnc-dense-cal-model.h \
+ gnc-dense-cal-store.h \
gnc-druid-gnome-ui.h \
gnc-embedded-window.h \
gnc-file.h \
@@ -140,6 +144,7 @@
gnc-period-select.h \
gnc-query-list.h \
gnc-splash.h \
+ gnc-sx-instance-dense-cal-adapter.h \
gnc-tree-model.h \
gnc-tree-model-account-types.h \
gnc-tree-model-account.h \
@@ -163,9 +168,11 @@
gnc-druid-provider-multifile-gnome.h \
search-param.h
+libgncmod_gnome_utils_la_LDFLAGS = -avoid-version
+
libgncmod_gnome_utils_la_LIBADD = \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/backend/file/libgnc-backend-file-utils.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
@@ -220,7 +227,7 @@
@echo "#ifndef GNC_VERSION_H" >> _gnc-version.h
@echo "#define GNC_VERSION_H" >> _gnc-version.h
@echo "" >> _gnc-version.h
- @svninfo=`${top_srcdir}/util/gnc-svnversion ${srcdir}` ; \
+ @svninfo=`${top_srcdir}/util/gnc-svnversion ${top_srcdir}` ; \
if [ $$? = 0 ] ; then \
echo "#define GNUCASH_SVN 1" >> _gnc-version.h ; \
fi
@@ -234,11 +241,11 @@
-rm -f _gnc-svninfo.h
_gnc-svninfo.h: Makefile
- @svninfo=`${top_srcdir}/util/gnc-svnversion ${srcdir}` ; \
+ @svninfo=`${top_srcdir}/util/gnc-svnversion ${top_srcdir}` ; \
if [ $$? = 0 ] ; then \
if [ -z "$$svninfo" ] ; then \
echo "gnc-svnversion failed. figure out why." ; \
- echo "can't determine svn revision from ${srcdir}." ; \
+ echo "can't determine svn revision from ${top_srcdir}." ; \
exit 1 ; \
fi ; \
echo "/* Autogenerated. Do not change. */" > _gnc-svninfo.h ; \
@@ -290,3 +297,5 @@
uninstall-hook:
rm -f ${DESTDIR}${pkgdatadir}/gnome
endif
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\"
Modified: gnucash/branches/remove-group2/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/dialog-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/dialog-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,11 +25,11 @@
#include "config.h"
#include <gnome.h>
-#ifndef HAVE_GLIB26
-#include "gutils26.h"
-#endif
#include <glib/gi18n.h>
#include <math.h>
+#ifdef G_OS_WIN32
+#include <pow.h>
+#endif
#include <string.h>
#include "Transaction.h"
@@ -514,8 +514,8 @@
commodity);
gnc_account_commodity_from_type (aw, FALSE);
- gnc_tree_view_account_set_selected_account
- (GNC_TREE_VIEW_ACCOUNT (aw->parent_tree), parent);
+ gnc_tree_view_account_set_selected_account (
+ GNC_TREE_VIEW_ACCOUNT (aw->parent_tree), parent);
gnc_resume_gui_refresh ();
LEAVE("1");
@@ -1713,7 +1713,7 @@
************************************************************/
/*
- * register a callback that get's called when the account has changed
+ * register a callback that gets called when the account has changed
* so significantly that you need to destroy yourself. In particular
* this is used by the ledger display to destroy ledgers when the
* account type has changed.
Modified: gnucash/branches/remove-group2/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/dialog-options.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/dialog-options.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -23,12 +23,7 @@
#include "config.h"
-#ifdef HAVE_GTK26
#include <gtk/gtk.h>
-#else
-#undef GNOME_DISABLE_DEPRECATED
-#include <gnome.h>
-#endif
#include <gdk/gdk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
@@ -221,7 +216,6 @@
return;
}
-#ifdef HAVE_GTK26
static void
gnc_image_option_update_preview_cb (GtkFileChooser *chooser,
GNCOption *option)
@@ -269,14 +263,6 @@
return;
g_object_set_data_full(G_OBJECT(chooser), LAST_SELECTION, filename, g_free);
}
-#else
-static void
-gnc_image_option_clear_selection_cb (GtkButton *button,
- GtkEntry *entry)
-{
- gtk_entry_set_text(entry, "");
-}
-#endif
/********************************************************************\
* gnc_option_set_ui_value_internal *
@@ -1999,9 +1985,6 @@
GtkWidget *value;
GtkWidget *label;
GtkWidget *button;
-#ifndef HAVE_GTK26
- GtkWidget *entry;
-#endif
gchar *colon_name;
ENTER("option %p(%s), name %s", option, gnc_option_name(option), name);
@@ -2015,7 +1998,6 @@
button = gtk_button_new_with_label(_("Clear"));
gtk_tooltips_set_tip(tooltips, button, _("Clear any selected image file."), NULL);
-#ifdef HAVE_GTK26
value = gtk_file_chooser_button_new(_("Select image"),
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_tooltips_set_tip(tooltips, value, _("Select an image file."), NULL);
@@ -2031,19 +2013,7 @@
G_CALLBACK(gnc_image_option_update_preview_cb), option);
g_signal_connect_swapped(G_OBJECT (button), "clicked",
G_CALLBACK(gtk_file_chooser_unselect_all), value);
-#else
- value = gnome_pixmap_entry_new(NULL, _("Select pixmap"),
- FALSE);
- gtk_tooltips_set_tip(tooltips, value, _("Select an image file."), NULL);
- gnome_pixmap_entry_set_preview(GNOME_PIXMAP_ENTRY(value), FALSE);
- entry = gnome_pixmap_entry_gtk_entry (GNOME_PIXMAP_ENTRY(value));
- g_signal_connect(G_OBJECT (entry), "changed",
- G_CALLBACK(gnc_option_changed_widget_cb), option);
- g_signal_connect(G_OBJECT (button), "clicked",
- G_CALLBACK(gnc_image_option_clear_selection_cb), entry);
-#endif
-
gnc_option_set_widget (option, value);
gnc_option_set_ui_value(option, FALSE);
@@ -2490,7 +2460,6 @@
if (string && *string)
{
-#ifdef HAVE_GTK26
gchar *test;
DEBUG("string = %s", string);
gtk_file_chooser_select_filename(GTK_FILE_CHOOSER(widget), string);
@@ -2499,12 +2468,6 @@
g_strdup(string), g_free);
DEBUG("Set %s, retrieved %s", string, test);
gnc_image_option_update_preview_cb(GTK_FILE_CHOOSER(widget), option);
-#else
- GtkEntry *entry;
- DEBUG("string = %s", string);
- entry = GTK_ENTRY(gnome_pixmap_entry_gtk_entry(GNOME_PIXMAP_ENTRY(widget)));
- gtk_entry_set_text(entry, string);
-#endif
}
LEAVE("FALSE");
return FALSE;
@@ -2880,7 +2843,6 @@
static SCM
gnc_option_get_ui_value_pixmap (GNCOption *option, GtkWidget *widget)
{
-#ifdef HAVE_GTK26
gchar *string;
SCM result;
@@ -2890,12 +2852,6 @@
if (string)
g_free(string);
return result;
-#else
- GnomePixmapEntry * p = GNOME_PIXMAP_ENTRY(widget);
- char * string = gnome_pixmap_entry_get_filename(p);
-
- return (scm_makfrom0str(string ? string : ""));
-#endif
}
static SCM
Modified: gnucash/branches/remove-group2/src/gnome-utils/dialog-preferences.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/dialog-preferences.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/dialog-preferences.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -196,7 +196,6 @@
ENTER("file %s, widget %s, tab %s full page %d",
filename, widgetname, tabname, full_page);
-
add_in = g_malloc(sizeof(addition));
if (add_in == NULL) {
g_critical("Unable to allocate memory.\n");
@@ -243,6 +242,7 @@
g_free(add_in->widgetname);
g_free(add_in->tabname);
g_free(add_in);
+ LEAVE("err");
return;
} else {
add_ins = g_slist_append(add_ins, add_in);
@@ -468,6 +468,7 @@
g_critical("The object name %s in file %s is not a GtkTable. It cannot "
"be added to the preferences dialog.",
add_in->widgetname, add_in->filename);
+ LEAVE("");
return;
}
g_object_get(G_OBJECT(new_content), "n-columns", &cols, NULL);
@@ -475,6 +476,7 @@
g_critical("The table %s in file %s does not have four columns. It cannot "
"be added to the preferences dialog.",
add_in->widgetname, add_in->filename);
+ LEAVE("");
return;
}
@@ -1493,8 +1495,8 @@
DEBUG("bad value");
widget = g_hash_table_find(table, gnc_prefs_nearest_match, group_name);
if (widget) {
- DEBUG("forcing %s", gtk_widget_get_name(widget));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+ DEBUG("forcing %s", gtk_widget_get_name(widget));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
}
g_free(group_name);
g_free(name);
Modified: gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -904,16 +904,12 @@
GtkWidget *button;
button = gtk_button_new_with_label(label);
-#ifdef HAVE_GTK26
if (stock_id) {
GtkWidget *image;
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(button), image);
}
-#else
- gtk_button_set_use_underline(GTK_BUTTON(button), TRUE);
-#endif
gtk_widget_show_all(button);
gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button, response);
}
@@ -982,61 +978,3 @@
return response;
}
-
-#ifndef HAVE_GTK26
-
-/** Find the first GtkLabel in a container. When called on a gtk2.4
- * message dialog, there is only one label in the dialog so theis
- * should return it. */
-static void
-find_label (GtkWidget *widget, gpointer data)
-{
- GtkWidget **label = data;
-
- if (*label)
- return;
-
- if (GTK_IS_LABEL(widget)) {
- *label = widget;
- return;
- }
-
- if (GTK_IS_CONTAINER(widget)) {
- gtk_container_foreach(GTK_CONTAINER(widget), find_label, data);
- }
-}
-
-/** Mimic the gtk2.6 function to add secondary information to a
- * message dialog. */
-void
-gtk_message_dialog_format_secondary_text(GtkMessageDialog *dialog,
- const gchar *format,
- ...)
-{
- GtkWidget *label = NULL;
- const gchar *current;
- gchar *primary, *secondary;
- va_list args;
-
- gtk_container_foreach(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox),
- find_label, &label);
- if (!label)
- return;
-
- /* Get the current markup. */
- current = gtk_label_get_label(GTK_LABEL(label));
-
- /* Format the text to be added. */
- va_start(args, format);
- secondary = g_strdup_vprintf(format, args);
- va_end(args);
-
- /* Append the two strings, making the first one bold. */
- primary = g_strdup_printf("<b>%s</b>\n\n%s", current, secondary);
- gtk_label_set_markup(GTK_LABEL(label), primary);
-
- g_free(primary);
- g_free(secondary);
-}
-
-#endif
Modified: gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/dialog-utils.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -152,11 +152,4 @@
gint
gnc_dialog_run(GtkDialog *dialog, const gchar *gconf_key);
-#ifndef HAVE_GTK26
-void
-gtk_message_dialog_format_secondary_text(GtkMessageDialog *dialog,
- const gchar *message_format,
- ...) G_GNUC_PRINTF (2, 3);
#endif
-
-#endif
Modified: gnucash/branches/remove-group2/src/gnome-utils/druid-gconf-setup.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/druid-gconf-setup.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/druid-gconf-setup.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -34,6 +34,7 @@
#include <gnome.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
@@ -138,7 +139,7 @@
g_strfreev(lines);
}
- output = fopen(path_filename, "a");
+ output = g_fopen(path_filename, "a");
if (output == NULL) {
*error = g_error_new (G_FILE_ERROR,
g_file_error_from_errno(errno),
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/commodity.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/commodity.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/commodity.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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>
<child internal-child="vbox">
@@ -100,6 +101,10 @@
<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="left_attach">0</property>
@@ -137,6 +142,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">namespace_cbe</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>
@@ -176,6 +185,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">commodity_cbe</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>
@@ -193,6 +206,7 @@
<widget class="GtkComboBoxEntry" id="namespace_cbe">
<property name="visible">True</property>
<property name="items">Dummy namespace entry</property>
+ <property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="gnc_ui_select_commodity_namespace_changed_cb" last_modification_time="Thu, 08 Jun 2006 23:26:58 GMT"/>
@@ -211,6 +225,7 @@
<widget class="GtkComboBoxEntry" id="commodity_cbe">
<property name="visible">True</property>
<property name="items">Dummy security entry</property>
+ <property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="gnc_ui_select_commodity_changed_cb" last_modification_time="Thu, 08 Jun 2006 23:30:40 GMT"/>
@@ -248,6 +263,7 @@
<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>
<child internal-child="vbox">
@@ -332,6 +348,10 @@
<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="left_attach">0</property>
@@ -431,6 +451,10 @@
<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">4</property>
@@ -482,6 +506,10 @@
<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="left_attach">0</property>
@@ -506,6 +534,10 @@
<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="left_attach">0</property>
@@ -622,6 +654,10 @@
<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>
</child>
</widget>
@@ -661,6 +697,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">fullname_entry</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>
@@ -700,6 +740,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">mnemonic_entry</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>
@@ -739,6 +783,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">namespace_cbe</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>
@@ -778,6 +826,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">code_entry</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>
@@ -816,6 +868,10 @@
<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>
</child>
</widget>
@@ -877,6 +933,10 @@
<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>
@@ -1092,6 +1152,10 @@
<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>
</child>
</widget>
@@ -1109,6 +1173,7 @@
<widget class="GtkComboBoxEntry" id="namespace_cbe">
<property name="visible">True</property>
<property name="items">Dummy namespace</property>
+ <property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="gnc_ui_commodity_changed_cb" last_modification_time="Thu, 08 Jun 2006 23:29:20 GMT"/>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-query-list.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-query-list.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-query-list.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -71,6 +72,10 @@
<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">5</property>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-reset-warnings.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-reset-warnings.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/dialog-reset-warnings.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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>
<property name="has_separator">True</property>
<signal name="response" handler="gnc_reset_warnings_response_cb" last_modification_time="Sun, 17 Jul 2005 01:07:02 GMT"/>
@@ -98,6 +99,10 @@
<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>
@@ -159,6 +164,10 @@
<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>
@@ -186,6 +195,10 @@
<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>
@@ -237,6 +250,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gconf-setup.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gconf-setup.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gconf-setup.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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>
<child internal-child="vbox">
@@ -114,6 +115,10 @@
<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>
@@ -187,6 +192,10 @@
<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>
@@ -248,6 +257,10 @@
<property name="yalign">0</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>
@@ -279,6 +292,7 @@
<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>
<signal name="delete_event" handler="druid_gconf_delete_event" last_modification_time="Sat, 16 Jul 2005 02:04:17 GMT"/>
<child>
@@ -645,6 +659,10 @@
<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>
@@ -749,6 +767,10 @@
<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="left_attach">0</property>
@@ -924,6 +946,10 @@
<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>
@@ -991,6 +1017,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gnc-xml-import.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gnc-xml-import.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/druid-gnc-xml-import.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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>
<child internal-child="vbox">
@@ -100,6 +101,10 @@
<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>
@@ -194,6 +199,10 @@
<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>
@@ -233,6 +242,10 @@
<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>
@@ -272,6 +285,10 @@
<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>
@@ -379,6 +396,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -404,6 +423,10 @@
<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>
@@ -488,6 +511,10 @@
<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>
@@ -559,6 +586,10 @@
<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>
@@ -630,6 +661,10 @@
<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>
@@ -709,6 +744,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -788,6 +824,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">available_encs_view</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>
@@ -832,6 +872,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<signal name="row_activated" handler="gxi_available_enc_activated_cb" last_modification_time="Sat, 08 Apr 2006 01:13:30 GMT"/>
</widget>
</child>
@@ -920,6 +962,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">custom_enc_entry</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>
@@ -1036,6 +1082,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">selected_encs_view</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>
@@ -1121,6 +1171,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<signal name="row_activated" handler="gxi_selected_enc_activated_cb" last_modification_time="Sat, 08 Apr 2006 01:12:38 GMT"/>
</widget>
</child>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/druid-provider-multifile.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/druid-provider-multifile.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/druid-provider-multifile.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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="GnomeDruidPageStandard" id="Multifile Provider Page">
@@ -43,6 +44,10 @@
<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>
@@ -80,6 +85,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -107,6 +114,10 @@
<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">3</property>
@@ -176,6 +187,10 @@
<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>
@@ -245,6 +260,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/exchange-dialog.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/exchange-dialog.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/exchange-dialog.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -87,6 +88,10 @@
<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="left_attach">0</property>
@@ -111,6 +116,10 @@
<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="left_attach">0</property>
@@ -135,6 +144,10 @@
<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="left_attach">0</property>
@@ -295,6 +308,10 @@
<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>
</child>
</widget>
@@ -334,6 +351,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">from_entry</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>
@@ -373,6 +394,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">to_entry</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>
@@ -411,6 +436,10 @@
<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>
</child>
</widget>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-date-format.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-date-format.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-date-format.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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="GtkTable" id="date_format_table">
@@ -40,6 +41,10 @@
<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="left_attach">2</property>
@@ -60,7 +65,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes">%Y-%m-%d</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<signal name="changed" handler="gnc_ui_date_format_changed_cb"/>
</widget>
@@ -187,6 +192,10 @@
<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="left_attach">1</property>
@@ -211,6 +220,10 @@
<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="left_attach">1</property>
@@ -235,6 +248,10 @@
<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="left_attach">1</property>
@@ -259,6 +276,10 @@
<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="left_attach">1</property>
@@ -283,6 +304,10 @@
<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="left_attach">1</property>
@@ -313,6 +338,10 @@
<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>
@@ -346,6 +375,8 @@
Locale
Custom
</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
<signal name="changed" handler="gnc_ui_date_format_changed_cb" last_modification_time="Wed, 14 Sep 2005 05:03:24 GMT"/>
</widget>
<packing>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-gui-query.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-gui-query.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/gnc-gui-query.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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>
<child internal-child="vbox">
@@ -98,6 +99,10 @@
<property name="yalign">0</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>
@@ -119,6 +124,10 @@
<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>
@@ -210,6 +219,7 @@
<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>
<child internal-child="vbox">
@@ -278,6 +288,10 @@
<property name="yalign">0</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>
@@ -299,6 +313,10 @@
<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>
@@ -390,6 +408,7 @@
<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>
<child internal-child="vbox">
@@ -458,6 +477,10 @@
<property name="yalign">0</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>
@@ -479,6 +502,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/preferences.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/preferences.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/preferences.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -18,6 +18,7 @@
<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">True</property>
<signal name="response" handler="gnc_options_dialog_response_cb" last_modification_time="Sun, 17 Aug 2003 21:58:20 GMT"/>
@@ -151,6 +152,7 @@
<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>
<property name="has_separator">True</property>
<signal name="response" handler="gnc_preferences_response_cb" last_modification_time="Thu, 28 Apr 2005 16:35:16 GMT"/>
@@ -233,6 +235,10 @@
<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="left_attach">0</property>
@@ -305,6 +311,10 @@
<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="left_attach">0</property>
@@ -329,6 +339,10 @@
<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="left_attach">0</property>
@@ -522,6 +536,10 @@
<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="left_attach">0</property>
@@ -546,6 +564,10 @@
<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="left_attach">0</property>
@@ -576,6 +598,10 @@
<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="type">tab</property>
@@ -605,6 +631,10 @@
<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="left_attach">0</property>
@@ -653,6 +683,10 @@
<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="left_attach">0</property>
@@ -677,6 +711,10 @@
<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="left_attach">0</property>
@@ -775,6 +813,10 @@
<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="left_attach">0</property>
@@ -799,6 +841,10 @@
<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="left_attach">0</property>
@@ -823,6 +869,10 @@
<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="left_attach">0</property>
@@ -847,6 +897,10 @@
<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="left_attach">0</property>
@@ -889,6 +943,10 @@
<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="left_attach">1</property>
@@ -1010,6 +1068,10 @@
<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="left_attach">1</property>
@@ -1034,6 +1096,10 @@
<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="left_attach">0</property>
@@ -1059,6 +1125,10 @@
<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="left_attach">0</property>
@@ -1090,6 +1160,10 @@
<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="type">tab</property>
@@ -1118,6 +1192,10 @@
<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="left_attach">0</property>
@@ -1142,6 +1220,10 @@
<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="left_attach">0</property>
@@ -1166,6 +1248,10 @@
<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="left_attach">1</property>
@@ -1190,6 +1276,10 @@
<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="left_attach">1</property>
@@ -1214,6 +1304,10 @@
<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="left_attach">1</property>
@@ -1238,6 +1332,10 @@
<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="left_attach">1</property>
@@ -1262,6 +1360,10 @@
<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="left_attach">1</property>
@@ -1410,6 +1512,10 @@
<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="left_attach">0</property>
@@ -1434,6 +1540,10 @@
<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="left_attach">0</property>
@@ -1458,6 +1568,10 @@
<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="left_attach">0</property>
@@ -1512,6 +1626,10 @@
<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="type">tab</property>
@@ -1541,6 +1659,10 @@
<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="left_attach">0</property>
@@ -1663,6 +1785,10 @@
<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>
@@ -1695,6 +1821,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/general/retain_days</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="left_attach">0</property>
@@ -1744,6 +1874,10 @@
<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="left_attach">0</property>
@@ -1768,6 +1902,10 @@
<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="left_attach">0</property>
@@ -1793,6 +1931,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/general/auto_decimal_places</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="left_attach">0</property>
@@ -1889,6 +2031,10 @@
<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="left_attach">0</property>
@@ -1913,6 +2059,10 @@
<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="left_attach">0</property>
@@ -1937,6 +2087,10 @@
<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="left_attach">0</property>
@@ -1961,6 +2115,10 @@
<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="left_attach">0</property>
@@ -1986,6 +2144,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/search/new_search_limit</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="left_attach">0</property>
@@ -2064,6 +2226,10 @@
<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="type">tab</property>
@@ -2093,6 +2259,10 @@
<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="left_attach">0</property>
@@ -2141,6 +2311,10 @@
<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="left_attach">0</property>
@@ -2189,6 +2363,10 @@
<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="left_attach">0</property>
@@ -2213,6 +2391,10 @@
<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="left_attach">0</property>
@@ -2405,6 +2587,10 @@
<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="left_attach">0</property>
@@ -2435,6 +2621,10 @@
<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="type">tab</property>
@@ -2464,6 +2654,10 @@
<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="left_attach">0</property>
@@ -2488,6 +2682,10 @@
<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="left_attach">0</property>
@@ -2512,6 +2710,10 @@
<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="left_attach">0</property>
@@ -2611,6 +2813,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/general/register/number_of_rows</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="left_attach">0</property>
@@ -2637,6 +2843,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/general/register/max_transactions</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="left_attach">0</property>
@@ -2762,6 +2972,10 @@
<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="type">tab</property>
@@ -2791,6 +3005,10 @@
<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="left_attach">1</property>
@@ -2908,6 +3126,10 @@
<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="left_attach">0</property>
@@ -2932,6 +3154,10 @@
<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="left_attach">0</property>
@@ -2956,6 +3182,10 @@
<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="left_attach">0</property>
@@ -3010,6 +3240,10 @@
<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="type">tab</property>
@@ -3163,6 +3397,10 @@
<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="left_attach">0</property>
@@ -3187,6 +3425,10 @@
<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="left_attach">0</property>
@@ -3211,6 +3453,10 @@
<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="left_attach">0</property>
@@ -3258,6 +3504,10 @@
<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="left_attach">0</property>
@@ -3282,6 +3532,10 @@
<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="left_attach">0</property>
@@ -3405,6 +3659,10 @@
<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="left_attach">0</property>
@@ -3429,6 +3687,10 @@
<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="left_attach">0</property>
@@ -3483,6 +3745,10 @@
<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="type">tab</property>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/totd.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/totd.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/totd.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -20,6 +20,7 @@
<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">True</property>
<signal name="response" handler="gnc_totd_dialog_response" last_modification_time="Tue, 03 Jan 2006 03:47:09 GMT"/>
@@ -119,6 +120,10 @@
<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>
@@ -146,6 +151,10 @@
<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>
@@ -171,9 +180,9 @@
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
- <property name="text" translatable="no">The text of the tip goes here. Some example placeholder text:
+ <property name="text">The text of the tip goes here. Some example placeholder text:
If you are looking for a stable personal finance application, you should use
-the latest "stable" release of GnuCash. See http://www.gnucash.org</property>
+the latest "stable" release of GnuCash. See http://www.gnucash.org</property>
</widget>
<packing>
<property name="padding">0</property>
Modified: gnucash/branches/remove-group2/src/gnome-utils/glade/transfer.glade
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/glade/transfer.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/glade/transfer.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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="gnc_xfer_dialog_response_cb" last_modification_time="Sun, 27 Jul 2003 17:44:58 GMT"/>
@@ -95,6 +96,10 @@
<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="left_attach">0</property>
@@ -109,7 +114,7 @@
<child>
<widget class="GtkLabel" id="label">
<property name="visible">True</property>
- <property name="label" translatable="no"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -119,6 +124,10 @@
<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="left_attach">0</property>
@@ -152,6 +161,10 @@
<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="left_attach">0</property>
@@ -195,6 +208,10 @@
<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="left_attach">0</property>
@@ -239,6 +256,10 @@
<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="left_attach">0</property>
@@ -259,7 +280,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -284,6 +305,10 @@
<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="left_attach">0</property>
@@ -304,7 +329,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -329,6 +354,10 @@
<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="left_attach">0</property>
@@ -349,7 +378,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -389,7 +418,7 @@
<child>
<widget class="GtkLabel" id="label">
<property name="visible">True</property>
- <property name="label" translatable="no"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -399,6 +428,10 @@
<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="left_attach">0</property>
@@ -423,6 +456,10 @@
<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="left_attach">0</property>
@@ -453,6 +490,10 @@
<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>
@@ -474,6 +515,10 @@
<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>
@@ -517,7 +562,7 @@
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="no"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -527,6 +572,10 @@
<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="left_attach">2</property>
@@ -551,6 +600,10 @@
<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="left_attach">3</property>
@@ -565,7 +618,7 @@
<child>
<widget class="GtkLabel" id="label">
<property name="visible">True</property>
- <property name="label" translatable="no"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -575,6 +628,10 @@
<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="left_attach">3</property>
@@ -605,6 +662,10 @@
<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>
@@ -626,6 +687,10 @@
<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>
@@ -767,6 +832,10 @@
<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="left_attach">0</property>
@@ -781,7 +850,7 @@
<child>
<widget class="GtkLabel" id="label">
<property name="visible">True</property>
- <property name="label" translatable="no"> </property>
+ <property name="label"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -791,6 +860,10 @@
<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="left_attach">0</property>
@@ -865,6 +938,10 @@
<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="left_attach">2</property>
@@ -932,6 +1009,10 @@
<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="left_attach">2</property>
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-date-edit.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-date-edit.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-date-edit.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,7 +28,6 @@
@NOTATION@
*/
-
#ifndef GNC_DATE_EDIT_H
#define GNC_DATE_EDIT_H
Copied: gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-model.c (from rev 15563, gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.c)
Copied: gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-model.h (from rev 15563, gnucash/trunk/src/gnome-utils/gnc-dense-cal-model.h)
Copied: gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-store.c (from rev 15563, gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.c)
Copied: gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal-store.h (from rev 15563, gnucash/trunk/src/gnome-utils/gnc-dense-cal-store.h)
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
/********************************************************************\
* gnc-dense-cal.c : a custom densely-dispalyed calendar widget *
- * Copyright (C) 2002 Joshua Sled <jsled at asynchronous.org> *
+ * Copyright (C) 2002,2006 Joshua Sled <jsled at asynchronous.org> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@@ -22,28 +22,16 @@
#include "config.h"
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
#include "glib-compat.h"
-#include <math.h>
-
#include "gnc-dense-cal.h"
-
-/* For PERR, only... */
+#include "gnc-dense-cal-model.h"
#include "gnc-engine.h"
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <math.h>
/**
- * Todo:
- * . marking
- * . color-per-marker (configurable)
- * X all-or-nothing
- * \ handle errors properly
- * X mouse-over -> "hottip"
- * X rotated month labels
- * X weeksPerCol -> monthsPerCol
- **/
-
-/**
* Marking ...
*
* We want a facility to mark multiple days on the calendar. This facility
@@ -84,103 +72,98 @@
static const gchar* MARK_COLOR = "Yellow";
-static const gchar* MARKS_LOST_SIGNAL_NAME = "marks_lost";
-
-/* SIGNALS */
-enum gnc_dense_cal_signal_enum {
- MARKS_LOST_SIGNAL,
- LAST_SIGNAL
-};
-
-static guint gnc_dense_cal_signals[LAST_SIGNAL] = { 0 };
-
static QofLogModule log_module = GNC_MOD_SX;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "gnc.gui.dense-cal"
-static void gnc_dense_cal_class_init (GncDenseCalClass *class);
-static void gnc_dense_cal_init (GncDenseCal *dcal);
-static void gnc_dense_cal_finalize (GObject *object);
-static void gnc_dense_cal_dispose (GObject *object);
-static void gnc_dense_cal_realize (GtkWidget *widget);
-static void gnc_dense_cal_draw_to_buffer( GncDenseCal *dcal );
-static gint gnc_dense_cal_expose( GtkWidget *widget,
- GdkEventExpose *event );
+static void gnc_dense_cal_class_init(GncDenseCalClass *class);
+static void gnc_dense_cal_init(GncDenseCal *dcal);
+static void gnc_dense_cal_finalize(GObject *object);
+static void gnc_dense_cal_dispose(GObject *object);
+static void gnc_dense_cal_realize(GtkWidget *widget);
+static void gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal);
+static gint gnc_dense_cal_expose(GtkWidget *widget,
+ GdkEventExpose *event);
-static void gdc_reconfig( GncDenseCal *dcal );
+static void gdc_reconfig(GncDenseCal *dcal);
-static void gdc_free_all_mark_data( GncDenseCal *dcal );
+static void gdc_free_all_mark_data(GncDenseCal *dcal);
-static void gnc_dense_cal_size_request( GtkWidget *widget,
- GtkRequisition *requisition);
-static void gnc_dense_cal_size_allocate( GtkWidget *widget,
- GtkAllocation *allocation );
-static gint gnc_dense_cal_motion_notify( GtkWidget *widget,
- GdkEventMotion *event );
-static gint gnc_dense_cal_button_press( GtkWidget *widget,
- GdkEventButton *evt );
+static void gnc_dense_cal_size_request(GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gnc_dense_cal_size_allocate(GtkWidget *widget,
+ GtkAllocation *allocation);
+static gint gnc_dense_cal_motion_notify(GtkWidget *widget,
+ GdkEventMotion *event);
+static gint gnc_dense_cal_button_press(GtkWidget *widget,
+ GdkEventButton *evt);
-static inline int day_width_at( GncDenseCal *dcal, guint xScale );
-static inline int day_width( GncDenseCal *dcal );
-static inline int day_height_at( GncDenseCal *dcal, guint yScale );
-static inline int day_height( GncDenseCal *dcal );
-static inline int week_width_at( GncDenseCal *dcal, guint xScale );
-static inline int week_width( GncDenseCal *dcal );
-static inline int week_height_at( GncDenseCal *dcal, guint yScale );
-static inline int week_height( GncDenseCal *dcal );
-static inline int col_width_at( GncDenseCal *dcal, guint xScale );
-static inline int col_width( GncDenseCal *dcal );
+static inline int day_width_at(GncDenseCal *dcal, guint xScale);
+static inline int day_width(GncDenseCal *dcal);
+static inline int day_height_at(GncDenseCal *dcal, guint yScale);
+static inline int day_height(GncDenseCal *dcal);
+static inline int week_width_at(GncDenseCal *dcal, guint xScale);
+static inline int week_width(GncDenseCal *dcal);
+static inline int week_height_at(GncDenseCal *dcal, guint yScale);
+static inline int week_height(GncDenseCal *dcal);
+static inline int col_width_at(GncDenseCal *dcal, guint xScale);
+static inline int col_width(GncDenseCal *dcal);
-static inline int col_height( GncDenseCal *dcal );
-static inline int num_cols( GncDenseCal *dcal );
+static inline int col_height(GncDenseCal *dcal);
+static inline int num_cols(GncDenseCal *dcal);
/**
* Returns the total number of weeks to display in the calendar [irrespective
* of columns/weeks-per-col].
**/
-static inline int num_weeks( GncDenseCal *dcal );
+static inline int num_weeks(GncDenseCal *dcal);
/**
* Returns the number of weeks per column. Note that this is the number of
* weeks needed to display the longest column.
**/
-static int num_weeks_per_col( GncDenseCal *dcal );
+static int num_weeks_per_col(GncDenseCal *dcal);
/* hotspot calculation */
-static gint wheres_this( GncDenseCal *dcal, int x, int y );
+static gint wheres_this(GncDenseCal *dcal, int x, int y);
-static void recompute_x_y_scales( GncDenseCal *dcal );
-static void recompute_mark_storage( GncDenseCal *dcal );
-static void recompute_extents( GncDenseCal *dcal );
-static void populate_hover_window( GncDenseCal *dcal, gint doc );
+static void recompute_x_y_scales(GncDenseCal *dcal);
+static void recompute_mark_storage(GncDenseCal *dcal);
+static void recompute_extents(GncDenseCal *dcal);
+static void populate_hover_window(GncDenseCal *dcal, gint doc);
-static void month_coords( GncDenseCal *dcal, int monthOfCal, GList **outList );
-static void doc_coords( GncDenseCal *dcal, int dayOfCal,
- int *x1, int *y1, int *x2, int *y2 );
+static void month_coords(GncDenseCal *dcal, int monthOfCal, GList **outList);
+static void doc_coords(GncDenseCal *dcal, int dayOfCal,
+ int *x1, int *y1, int *x2, int *y2);
+static void gdc_mark_add(GncDenseCal *dcal, guint tag, gchar *name, gchar *info, guint size, GDate **dateArray);
+static void gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove);
+
+static void gdc_add_tag_markings(GncDenseCal *cal, guint tag);
+static void gdc_add_markings(GncDenseCal *cal);
+static void gdc_remove_markings(GncDenseCal *cal);
+
static GtkWidgetClass *parent_class = NULL;
-/*static const gchar* MONTH_NAMES[] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };*/
#define MONTH_NAME_BUFSIZE 5
/* Takes the number of months since January, in the range 0 to
* 11. Returns the abbreviated month name according to the current
- * locale. (i18n'd version of the above static character array.) */
+ * locale.*/
static const gchar *month_name(int mon)
{
- static gchar buf[MONTH_NAME_BUFSIZE];
- GDate *date;
+ static gchar buf[MONTH_NAME_BUFSIZE];
+ GDate date;
+ gint arbitrary_year = 1977;
- memset(buf, 0, MONTH_NAME_BUFSIZE);
- date = g_date_new();
- g_date_set_month(date, mon);
- g_date_strftime(buf, MONTH_NAME_BUFSIZE-1, "%b", date);
- g_date_free(date);
-
- return buf;
+ memset(buf, 0, MONTH_NAME_BUFSIZE);
+ g_date_clear(&date, 1);
+
+ g_date_set_year(&date, arbitrary_year);
+ g_date_set_day(&date, 1);
+ // g_date API is 1..12 (not 0..11)
+ g_date_set_month(&date, mon+1);
+ g_date_strftime(buf, MONTH_NAME_BUFSIZE-1, "%b", &date);
+
+ return buf;
}
-/* FIXME: i18n
- static const gchar *dayLabels[7] = {
- "Su", "M", "Tu", "W", "Th", "F", "Sa"
- };*/
/* Takes the number of days since Sunday, in the range 0 to 6. Returns
* the abbreviated weekday name according to the current locale. */
static const gchar *day_label(int wday)
@@ -189,8 +172,8 @@
struct tm my_tm;
int i;
- memset( buf, 0, MONTH_NAME_BUFSIZE );
- memset( &my_tm, 0, sizeof( struct tm ) );
+ memset(buf, 0, MONTH_NAME_BUFSIZE);
+ memset(&my_tm, 0, sizeof(struct tm));
my_tm.tm_wday = wday;
i = strftime (buf, MONTH_NAME_BUFSIZE-1, "%a", &my_tm);
/* Wild hack to use only the first two letters */
@@ -198,1060 +181,1044 @@
return buf;
}
-
GType
-gnc_dense_cal_get_type ()
+gnc_dense_cal_get_type()
{
- static GType dense_cal_type = 0;
+ static GType dense_cal_type = 0;
- if (dense_cal_type == 0) {
- static const GTypeInfo dense_cal_info = {
- sizeof (GncDenseCalClass),
- NULL,
- NULL,
- (GClassInitFunc) gnc_dense_cal_class_init,
- NULL,
- NULL,
- sizeof (GncDenseCal),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gnc_dense_cal_init,
- NULL
- };
+ if (dense_cal_type == 0) {
+ static const GTypeInfo dense_cal_info = {
+ sizeof (GncDenseCalClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) gnc_dense_cal_class_init,
+ NULL,
+ NULL,
+ sizeof (GncDenseCal),
+ 0,
+ (GInstanceInitFunc) gnc_dense_cal_init,
+ NULL
+ };
- dense_cal_type = g_type_register_static(GTK_TYPE_WIDGET,
- "GncDenseCal",
- &dense_cal_info, 0);
- }
+ dense_cal_type = g_type_register_static(GTK_TYPE_WIDGET,
+ "GncDenseCal",
+ &dense_cal_info, 0);
+ }
- return dense_cal_type;
+ return dense_cal_type;
}
static void
-gnc_dense_cal_class_init (GncDenseCalClass *klass)
+gnc_dense_cal_class_init(GncDenseCalClass *klass)
{
- GObjectClass *object_class;
- GtkWidgetClass *widget_class;
+ GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
- object_class = G_OBJECT_CLASS (klass);
- widget_class = GTK_WIDGET_CLASS (klass);
+ object_class = G_OBJECT_CLASS (klass);
+ widget_class = GTK_WIDGET_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
+ parent_class = g_type_class_peek_parent (klass);
- gnc_dense_cal_signals[MARKS_LOST_SIGNAL] =
- g_signal_new (MARKS_LOST_SIGNAL_NAME,
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GncDenseCalClass, marks_lost_cb),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ object_class->finalize = gnc_dense_cal_finalize;
+ object_class->dispose = gnc_dense_cal_dispose;
- object_class->finalize = gnc_dense_cal_finalize;
- object_class->dispose = gnc_dense_cal_dispose;
-
- widget_class->realize = gnc_dense_cal_realize;
- widget_class->expose_event = gnc_dense_cal_expose;
- widget_class->size_request = gnc_dense_cal_size_request;
- widget_class->size_allocate = gnc_dense_cal_size_allocate;
- widget_class->motion_notify_event = gnc_dense_cal_motion_notify;
- widget_class->button_press_event = gnc_dense_cal_button_press;
+ widget_class->realize = gnc_dense_cal_realize;
+ widget_class->expose_event = gnc_dense_cal_expose;
+ widget_class->size_request = gnc_dense_cal_size_request;
+ widget_class->size_allocate = gnc_dense_cal_size_allocate;
+ widget_class->motion_notify_event = gnc_dense_cal_motion_notify;
+ widget_class->button_press_event = gnc_dense_cal_button_press;
}
static void
-gnc_dense_cal_init (GncDenseCal *dcal)
+gnc_dense_cal_init(GncDenseCal *dcal)
{
- gboolean colorAllocSuccess;
+ gboolean colorAllocSuccess;
- dcal->disposed = FALSE;
- dcal->initialized = FALSE;
- dcal->markData = NULL;
- dcal->numMarks = 0;
- dcal->marks = NULL;
- dcal->lastMarkTag = 0;
+ dcal->disposed = FALSE;
+ dcal->initialized = FALSE;
+ dcal->markData = NULL;
+ dcal->numMarks = 0;
+ dcal->marks = NULL;
+ dcal->lastMarkTag = 0;
- dcal->showPopup = FALSE;
+ dcal->showPopup = FALSE;
- dcal->transPopup = GTK_WINDOW( gtk_window_new( GTK_WINDOW_POPUP ) );
- {
- GtkWidget *vbox, *hbox;
- GtkWidget *l;
- GtkCList *cl;
- static gchar *CLIST_TITLES[2];
- CLIST_TITLES[0] = _("Name");
- CLIST_TITLES[1] = _("Frequency");
+ dcal->transPopup = GTK_WINDOW(gtk_window_new(GTK_WINDOW_POPUP));
+ {
+ GtkWidget *vbox, *hbox;
+ GtkWidget *l;
+ GtkListStore *tree_data;
+ GtkTreeView *tree_view;
- vbox = gtk_vbox_new( FALSE, 5 );
- hbox = gtk_hbox_new( FALSE, 5 );
+ vbox = gtk_vbox_new(FALSE, 5);
+ hbox = gtk_hbox_new(FALSE, 5);
- l = gtk_label_new( _("Date: ") );
- gtk_container_add( GTK_CONTAINER(hbox), l );
- l = gtk_label_new( "YY/MM/DD" );
- g_object_set_data( G_OBJECT(dcal->transPopup), "dateLabel", l );
- gtk_container_add( GTK_CONTAINER(hbox), l );
- gtk_container_add( GTK_CONTAINER(vbox), hbox );
+ l = gtk_label_new(_("Date: "));
+ gtk_container_add(GTK_CONTAINER(hbox), l);
+ l = gtk_label_new("YY/MM/DD");
+ g_object_set_data(G_OBJECT(dcal->transPopup), "dateLabel", l);
+ gtk_container_add(GTK_CONTAINER(hbox), l);
+ gtk_container_add(GTK_CONTAINER(vbox), hbox);
- gtk_container_add( GTK_CONTAINER(vbox), gtk_hseparator_new() );
+ gtk_container_add(GTK_CONTAINER(vbox), gtk_hseparator_new());
- cl = GTK_CLIST(gtk_clist_new_with_titles(2, (gchar**)CLIST_TITLES));
- gtk_clist_set_column_auto_resize( cl, 0, TRUE );
- gtk_clist_set_column_auto_resize( cl, 1, TRUE );
- g_object_set_data( G_OBJECT(dcal->transPopup), "clist", cl );
- gtk_container_add( GTK_CONTAINER(vbox), GTK_WIDGET(cl) );
+ tree_data = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+ tree_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_data)));
+ gtk_tree_view_insert_column_with_attributes(tree_view, -1, _("Name"), gtk_cell_renderer_text_new(), "text", 0, NULL);
+ gtk_tree_view_insert_column_with_attributes(tree_view, -1, _("Frequency"), gtk_cell_renderer_text_new(), "text", 1, NULL);
+ g_object_set_data(G_OBJECT(dcal->transPopup), "model", tree_data);
+ gtk_container_add(GTK_CONTAINER(vbox), GTK_WIDGET(tree_view));
- gtk_container_add( GTK_CONTAINER(dcal->transPopup), vbox );
+ gtk_container_add(GTK_CONTAINER(dcal->transPopup), vbox);
- gtk_widget_realize( GTK_WIDGET(dcal->transPopup) );
- }
+ gtk_widget_realize(GTK_WIDGET(dcal->transPopup));
+ }
- gdk_color_parse( MONTH_THIS_COLOR, &dcal->weekColors[MONTH_THIS] );
- gdk_color_parse( MONTH_THAT_COLOR, &dcal->weekColors[MONTH_THAT] );
- if ( gdk_colormap_alloc_colors( gdk_colormap_get_system(),
- dcal->weekColors,
- MAX_COLORS, TRUE, TRUE,
- &colorAllocSuccess ) > 0 ) {
- /* FIXME : handle [more] properly */
- PERR( "Error allocating colors\n" );
- }
+ gdk_color_parse(MONTH_THIS_COLOR, &dcal->weekColors[MONTH_THIS]);
+ gdk_color_parse(MONTH_THAT_COLOR, &dcal->weekColors[MONTH_THAT]);
+ if (gdk_colormap_alloc_colors(gdk_colormap_get_system(),
+ dcal->weekColors,
+ MAX_COLORS, TRUE, TRUE,
+ &colorAllocSuccess) > 0)
+ {
+ g_error("error allocating colors");
+ }
- /* Deal with the various label sizes. */
- {
- gint i;
- gint maxWidth, maxHeight, maxAscent, maxLBearing;
- gint lbearing, rbearing, width, ascent, descent;
- GtkStyle *style;
+ /* Deal with the various label sizes. */
+ {
+ gint i;
+ gint maxWidth, maxHeight;
+ gint width;
+ GtkStyle *style;
+ PangoLayout *layout;
+ const PangoFontDescription *existing_font_desc;
+ PangoFontDescription *font_desc;
+ gint font_size;
+ gint font_size_reduction_units = 1;
- /* FIXME GNOME 2 port (rework the complete font code) */
- style = gtk_widget_get_style(GTK_WIDGET(dcal));
+ layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
- dcal->dayLabelFont = gtk_style_get_font(style);
- gdk_font_ref( dcal->dayLabelFont );
- g_assert( dcal->dayLabelFont );
+ style = gtk_widget_get_style(GTK_WIDGET(dcal));
- dcal->monthLabelFont = gtk_style_get_font(style);
- g_assert(dcal->monthLabelFont);
- gdk_font_ref(dcal->monthLabelFont);
+ font_desc = pango_font_description_copy(style->font_desc);
+ font_size = pango_font_description_get_size(font_desc);
+ font_size -= font_size_reduction_units * PANGO_SCALE;
+ pango_font_description_set_size(font_desc, font_size);
+ gtk_widget_modify_font(GTK_WIDGET(dcal), font_desc);
+ pango_font_description_free(font_desc);
+
+ maxWidth = maxHeight = 0;
+ for (i=0; i<12; i++)
+ {
+ gint w, h;
+ pango_layout_set_text(layout, month_name(i), -1);
+ pango_layout_get_pixel_size(layout, &w, &h);
+ maxWidth = MAX(maxWidth, w);
+ maxHeight = MAX(maxHeight, h);
+ }
- maxWidth = maxHeight = maxAscent = maxLBearing = 0;
- for ( i=0; i<12; i++ ) {
- gint w, h;
- gdk_string_extents( dcal->monthLabelFont, month_name(i),
- &lbearing, &rbearing, &width,
- &ascent, &descent );
- w = rbearing - lbearing + 1;
- h = ascent + descent;
- maxLBearing = MAX( maxLBearing, ABS(lbearing) );
- maxWidth = MAX( maxWidth, w );
- maxHeight = MAX( maxHeight, h );
- maxAscent = MAX( maxAscent, ascent );
- }
- dcal->label_width = maxHeight + 1;
- dcal->label_height = maxWidth;
- dcal->label_lbearing = maxLBearing;
- dcal->label_ascent = maxAscent;
- dcal->needInitMonthLabels = TRUE;
- }
+ // these two were reversed, before...
+ dcal->label_width = maxWidth;
+ dcal->label_height = maxHeight;
+
+ g_object_unref(layout);
+ }
- dcal->month = G_DATE_JANUARY;
- dcal->year = 1970;
+ dcal->month = G_DATE_JANUARY;
+ dcal->year = 1970;
- dcal->numMonths = 12;
- dcal->monthsPerCol = 3;
- dcal->leftPadding = 2;
- dcal->topPadding = 2;
+ dcal->numMonths = 12;
+ dcal->monthsPerCol = 3;
+ dcal->leftPadding = 2;
+ dcal->topPadding = 2;
- {
- GDate *tmpDate;
+ {
+ GDate *now = g_date_new();
+ g_date_set_time_t(now, time(NULL));
+ gnc_dense_cal_set_month(dcal, g_date_get_month(now));
+ gnc_dense_cal_set_year(dcal, g_date_get_year(now));
+ g_date_free(now);
+ }
- tmpDate = g_date_new();
- g_date_set_time_t( tmpDate, time(NULL) );
- gnc_dense_cal_set_month( dcal, g_date_get_month(tmpDate) );
- gnc_dense_cal_set_year( dcal, g_date_get_year(tmpDate) );
- g_date_free( tmpDate );
- }
+ recompute_extents(dcal);
+ recompute_mark_storage(dcal);
- recompute_extents( dcal );
- recompute_mark_storage( dcal );
+ /* Now that we're "sure" of our configuration, compute initial
+ * scaling factors; will be increased when we're allocated enough
+ * space to scale up. */
+ {
+ PangoLayout *layout;
+ int width_88, height_88;
+ int width_XXX, height_XXX;
- /* Now that we're "sure" of our configuration, compute initial
- * scaling factors; will be increased when we're allocated enough
- * space to scale up. */
- dcal->min_x_scale = dcal->x_scale =
- MAX( gdk_string_width( dcal->monthLabelFont, "88" ),
- gdk_string_width( dcal->dayLabelFont, "88" ) + 2 );
- dcal->min_y_scale = dcal->y_scale =
- MAX( floor( (float)gdk_string_width( dcal->monthLabelFont,
- "XXX" )
- / 3.0 ),
- gdk_string_height( dcal->dayLabelFont, "88" ) + 2 );
- dcal->dayLabelHeight = gdk_string_height( dcal->monthLabelFont, "88" );
- dcal->initialized = TRUE;
+ layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
+ pango_layout_set_text(layout, "88", -1);
+ pango_layout_get_pixel_size(layout, &width_88, &height_88);
+
+ pango_layout_set_text(layout, "XXX", -1);
+ pango_layout_get_pixel_size(layout, &width_XXX, &height_XXX);
+
+ dcal->min_x_scale = dcal->x_scale = width_88 + 2;
+ dcal->min_y_scale = dcal->y_scale = MAX(floor((float)width_XXX / 3.), height_88 + 2);
+
+ dcal->dayLabelHeight = height_88;
+
+ g_object_unref(layout);
+ }
+ dcal->initialized = TRUE;
}
GtkWidget*
gnc_dense_cal_new(void)
{
- GncDenseCal *dcal;
- dcal = g_object_new(GNC_TYPE_DENSE_CAL, NULL, NULL);
+ GncDenseCal *dcal;
+ dcal = g_object_new(GNC_TYPE_DENSE_CAL, NULL);
+ return GTK_WIDGET(dcal);
+}
- return GTK_WIDGET (dcal);
+GtkWidget*
+gnc_dense_cal_new_with_model(GncDenseCalModel *model)
+{
+ GncDenseCal *cal = GNC_DENSE_CAL(gnc_dense_cal_new());
+ gnc_dense_cal_set_model(cal, model);
+ return GTK_WIDGET(cal);
}
static void
-recompute_first_of_month_offset( GncDenseCal *dcal )
+recompute_first_of_month_offset(GncDenseCal *dcal)
{
- GDate *tmpDate;
+ GDate *tmpDate;
- tmpDate = g_date_new_dmy( 1, dcal->month, dcal->year );
- dcal->firstOfMonthOffset = g_date_get_weekday( tmpDate ) % 7;
- g_date_free( tmpDate );
+ tmpDate = g_date_new_dmy(1, dcal->month, dcal->year);
+ dcal->firstOfMonthOffset = g_date_get_weekday(tmpDate) % 7;
+ g_date_free(tmpDate);
}
void
-gnc_dense_cal_set_month( GncDenseCal *dcal, GDateMonth mon )
+gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon)
{
- dcal->month = mon;
- recompute_first_of_month_offset( dcal );
- recompute_extents( dcal );
- if ( GTK_WIDGET_REALIZED( dcal ) ) {
- recompute_x_y_scales( dcal );
- gnc_dense_cal_draw_to_buffer( dcal );
- gtk_widget_queue_draw( GTK_WIDGET(dcal) );
- }
+ dcal->month = mon;
+ recompute_first_of_month_offset(dcal);
+ recompute_extents(dcal);
+ if (GTK_WIDGET_REALIZED(dcal))
+ {
+ recompute_x_y_scales(dcal);
+ gnc_dense_cal_draw_to_buffer(dcal);
+ gtk_widget_queue_draw(GTK_WIDGET(dcal));
+ }
}
void
-gnc_dense_cal_set_year( GncDenseCal *dcal, guint year )
+gnc_dense_cal_set_year(GncDenseCal *dcal, guint year)
{
- dcal->year = year;
- recompute_first_of_month_offset( dcal );
- recompute_extents( dcal );
- if ( GTK_WIDGET_REALIZED( dcal ) ) {
- recompute_x_y_scales( dcal );
- gnc_dense_cal_draw_to_buffer( dcal );
- gtk_widget_queue_draw( GTK_WIDGET(dcal) );
- }
+ dcal->year = year;
+ recompute_first_of_month_offset(dcal);
+ recompute_extents(dcal);
+ if (GTK_WIDGET_REALIZED(dcal))
+ {
+ recompute_x_y_scales(dcal);
+ gnc_dense_cal_draw_to_buffer(dcal);
+ gtk_widget_queue_draw(GTK_WIDGET(dcal));
+ }
}
void
-gnc_dense_cal_set_num_months( GncDenseCal *dcal, guint num_months )
+gnc_dense_cal_set_num_months(GncDenseCal *dcal, guint num_months)
{
- dcal->numMonths = num_months;
- recompute_extents( dcal );
- recompute_mark_storage( dcal );
- if ( GTK_WIDGET_REALIZED( dcal ) ) {
- recompute_x_y_scales( dcal );
- gnc_dense_cal_draw_to_buffer( dcal );
- gtk_widget_queue_draw( GTK_WIDGET(dcal) );
- }
+ dcal->numMonths = num_months;
+ recompute_extents(dcal);
+ recompute_mark_storage(dcal);
+ if (GTK_WIDGET_REALIZED(dcal))
+ {
+ recompute_x_y_scales(dcal);
+ gnc_dense_cal_draw_to_buffer(dcal);
+ gtk_widget_queue_draw(GTK_WIDGET(dcal));
+ }
}
void
-gnc_dense_cal_set_months_per_col( GncDenseCal *dcal, guint monthsPerCol )
+gnc_dense_cal_set_months_per_col(GncDenseCal *dcal, guint monthsPerCol)
{
- dcal->monthsPerCol = monthsPerCol;
- recompute_x_y_scales(dcal);
+ dcal->monthsPerCol = monthsPerCol;
+ recompute_x_y_scales(dcal);
}
guint
-gnc_dense_cal_get_num_months( GncDenseCal *dcal )
+gnc_dense_cal_get_num_months(GncDenseCal *dcal)
{
- return dcal->numMonths;
+ return dcal->numMonths;
}
GDateMonth
-gnc_dense_cal_get_month( GncDenseCal *dcal )
+gnc_dense_cal_get_month(GncDenseCal *dcal)
{
- return dcal->month;
+ return dcal->month;
}
GDateYear
-gnc_dense_cal_get_year( GncDenseCal *dcal )
+gnc_dense_cal_get_year(GncDenseCal *dcal)
{
- return dcal->year;
+ return dcal->year;
}
static void
gnc_dense_cal_dispose (GObject *object)
{
- int i;
- GncDenseCal *dcal;
- g_return_if_fail (object != NULL);
- g_return_if_fail (GNC_IS_DENSE_CAL (object));
+ int i;
+ GncDenseCal *dcal;
+ g_return_if_fail(object != NULL);
+ g_return_if_fail(GNC_IS_DENSE_CAL(object));
- dcal = GNC_DENSE_CAL(object);
+ dcal = GNC_DENSE_CAL(object);
- if(dcal->disposed)
- return;
+ if (dcal->disposed)
+ return;
+ dcal->disposed = TRUE;
- dcal->disposed = TRUE;
+ if (GTK_WIDGET_REALIZED(dcal->transPopup))
+ {
+ gtk_widget_hide(GTK_WIDGET(dcal->transPopup));
+ gtk_widget_destroy(GTK_WIDGET(dcal->transPopup));
+ dcal->transPopup = NULL;
+ }
- if ( GTK_WIDGET_REALIZED( dcal->transPopup ) ) {
- gtk_widget_hide( GTK_WIDGET(dcal->transPopup) );
- gtk_widget_destroy( GTK_WIDGET(dcal->transPopup) );
- dcal->transPopup = NULL;
- }
+ if (dcal->drawbuf)
+ {
+ g_object_unref(dcal->drawbuf);
+ dcal->drawbuf = NULL;
+ }
- if ( dcal->drawbuf ) {
- g_object_unref( dcal->drawbuf );
- dcal->drawbuf = NULL;
- }
+ /* FIXME: we have a bunch of cleanup to do, here. */
- /* FIXME: we have a bunch of cleanup to do, here. */
- /* monthLabelFont, dayLabelFont */
- if ( dcal->monthLabelFont ) {
- gdk_font_unref( dcal->monthLabelFont );
- dcal->monthLabelFont = NULL;
- }
- if ( dcal->dayLabelFont ) {
- gdk_font_unref( dcal->dayLabelFont );
- dcal->dayLabelFont = NULL;
- }
- /* month labels */
- if ( dcal->monthLabels[0] ) {
- for ( i=0; i < 12; i++ ) {
- g_object_unref( dcal->monthLabels[i] );
- dcal->monthLabels[i] = NULL;
- }
- }
- /* mark data */
- gdc_free_all_mark_data( dcal );
+ gdc_free_all_mark_data(dcal);
- if (G_OBJECT_CLASS (parent_class)->dispose)
- (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+ g_object_unref(G_OBJECT(dcal->model));
+
+ if (G_OBJECT_CLASS (parent_class)->dispose)
+ G_OBJECT_CLASS(parent_class)->dispose(object);
}
static void
gnc_dense_cal_finalize (GObject *object)
{
- GncDenseCal *dcal;
- g_return_if_fail (object != NULL);
- g_return_if_fail (GNC_IS_DENSE_CAL (object));
+ GncDenseCal *dcal;
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GNC_IS_DENSE_CAL (object));
- dcal = GNC_DENSE_CAL(object);
+ dcal = GNC_DENSE_CAL(object);
- if (G_OBJECT_CLASS (parent_class)->finalize)
- (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+ if (G_OBJECT_CLASS (parent_class)->finalize)
+ G_OBJECT_CLASS(parent_class)->finalize(object);
}
static void
gnc_dense_cal_realize (GtkWidget *widget)
{
- GncDenseCal *dcal;
- GdkWindowAttr attributes;
- gint attributes_mask;
+ GncDenseCal *dcal;
+ GdkWindowAttr attributes;
+ gint attributes_mask;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GNC_IS_DENSE_CAL (widget));
+ g_return_if_fail(widget != NULL);
+ g_return_if_fail(GNC_IS_DENSE_CAL (widget));
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- dcal = GNC_DENSE_CAL (widget);
+ GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
+ dcal = GNC_DENSE_CAL(widget);
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.event_mask =
- gtk_widget_get_events (widget)
- | GDK_EXPOSURE_MASK
- | GDK_BUTTON_PRESS_MASK
- | GDK_BUTTON_RELEASE_MASK
- | GDK_POINTER_MOTION_MASK
- | GDK_POINTER_MOTION_HINT_MASK;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.x = widget->allocation.x;
+ attributes.y = widget->allocation.y;
+ attributes.width = widget->allocation.width;
+ attributes.height = widget->allocation.height;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.event_mask =
+ gtk_widget_get_events(widget)
+ | GDK_EXPOSURE_MASK
+ | GDK_BUTTON_PRESS_MASK
+ | GDK_BUTTON_RELEASE_MASK
+ | GDK_POINTER_MOTION_MASK
+ | GDK_POINTER_MOTION_HINT_MASK;
+ attributes.visual = gtk_widget_get_visual(widget);
+ attributes.colormap = gtk_widget_get_colormap(widget);
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
- widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+ widget->window = gdk_window_new(widget->parent->window, &attributes, attributes_mask);
- widget->style = gtk_style_attach (widget->style, widget->window);
+ widget->style = gtk_style_attach(widget->style, widget->window);
- gdk_window_set_user_data (widget->window, widget);
+ gdk_window_set_user_data(widget->window, widget);
- gdc_reconfig( dcal );
+ gdc_reconfig(dcal);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_ACTIVE);
+ gtk_style_set_background(widget->style, widget->window, GTK_STATE_ACTIVE);
}
-static
-void
-gdc_reconfig( GncDenseCal *dcal )
+static void
+gdc_reconfig(GncDenseCal *dcal)
{
- GtkWidget *widget = GTK_WIDGET(dcal);
+ GtkWidget *widget = GTK_WIDGET(dcal);
- if ( dcal->drawbuf ) {
- g_object_unref( dcal->drawbuf );
- }
- dcal->drawbuf = gdk_pixmap_new( widget->window,
- widget->allocation.width,
- widget->allocation.height,
- -1 );
- gnc_dense_cal_draw_to_buffer( dcal );
+ if (dcal->drawbuf)
+ g_object_unref(dcal->drawbuf);
+ dcal->drawbuf = gdk_pixmap_new(widget->window,
+ widget->allocation.width,
+ widget->allocation.height,
+ -1);
+ gnc_dense_cal_draw_to_buffer(dcal);
}
static void
-gnc_dense_cal_size_request( GtkWidget *widget,
- GtkRequisition *requisition )
+gnc_dense_cal_size_request(GtkWidget *widget,
+ GtkRequisition *requisition)
{
- GncDenseCal *dcal = GNC_DENSE_CAL(widget);
- if ( !dcal->initialized ) {
- PERR( "Uninitialized size request\n" );
- requisition->width = DENSE_CAL_DEFAULT_WIDTH;
- requisition->height = DENSE_CAL_DEFAULT_HEIGHT;
- return;
- }
- requisition->width =
- (dcal->leftPadding * 2)
- + (num_cols(dcal) * (col_width_at(dcal, dcal->min_x_scale)
- + dcal->label_width))
- + ((num_cols(dcal)-1) * COL_BORDER_SIZE);
- requisition->height =
- (dcal->topPadding * 2)
- + MINOR_BORDER_SIZE
- + dcal->dayLabelHeight
- + (num_weeks_per_col(dcal)
- * week_height_at(dcal, dcal->min_y_scale));
+ GncDenseCal *dcal = GNC_DENSE_CAL(widget);
+ if (!dcal->initialized)
+ {
+ g_warning("Uninitialized size request\n");
+ requisition->width = DENSE_CAL_DEFAULT_WIDTH;
+ requisition->height = DENSE_CAL_DEFAULT_HEIGHT;
+ return;
+ }
+ requisition->width =
+ (dcal->leftPadding * 2)
+ + (num_cols(dcal)* (col_width_at(dcal, dcal->min_x_scale)
+ + dcal->label_width))
+ + ((num_cols(dcal)-1) * COL_BORDER_SIZE);
+ requisition->height =
+ (dcal->topPadding * 2)
+ + MINOR_BORDER_SIZE
+ + dcal->dayLabelHeight
+ + (num_weeks_per_col(dcal)
+ * week_height_at(dcal, dcal->min_y_scale));
}
static void
-recompute_x_y_scales( GncDenseCal *dcal )
+recompute_x_y_scales(GncDenseCal *dcal)
{
- GtkWidget *widget;
- int denom;
- int width, height;
+ GtkWidget *widget;
+ int denom;
+ int width, height;
- widget = GTK_WIDGET(dcal);
+ widget = GTK_WIDGET(dcal);
- width = DENSE_CAL_DEFAULT_WIDTH;
- height = DENSE_CAL_DEFAULT_HEIGHT;
- if ( dcal->initialized ) {
- width = widget->allocation.width;
- height = widget->allocation.height;
- }
+ width = DENSE_CAL_DEFAULT_WIDTH;
+ height = DENSE_CAL_DEFAULT_HEIGHT;
+ if (dcal->initialized)
+ {
+ width = widget->allocation.width;
+ height = widget->allocation.height;
+ }
- /* FIXME: there's something slightly wrong in the x_scale computation that
- * lets us draw larger than our area. */
- denom = 7 * num_cols(dcal);
- g_assert( denom != 0 );
- dcal->x_scale = (gint)((width
- - (dcal->leftPadding * 2)
- - (num_cols(dcal) * ( (8 * MINOR_BORDER_SIZE)
- + dcal->label_width ))
- - ((num_cols(dcal)-1) * COL_BORDER_SIZE))
- / denom);
- dcal->x_scale = MAX( dcal->x_scale, dcal->min_x_scale );
+ /* FIXME: there's something slightly wrong in the x_scale computation that
+ * lets us draw larger than our area. */
+ denom = 7 * num_cols(dcal);
+ g_assert(denom != 0);
+ dcal->x_scale = (gint)((width
+ - (dcal->leftPadding * 2)
+ - (num_cols(dcal) * ((8 * MINOR_BORDER_SIZE)
+ + dcal->label_width))
+ - ((num_cols(dcal)-1) * COL_BORDER_SIZE))
+ / denom);
+ dcal->x_scale = MAX(dcal->x_scale, dcal->min_x_scale);
- denom = num_weeks_per_col(dcal);
- g_assert( denom != 0 );
- dcal->y_scale = (gint)((height
- - (dcal->topPadding * 2)
- - MINOR_BORDER_SIZE
- - dcal->dayLabelHeight
- - (num_weeks_per_col(dcal)-1
- * MINOR_BORDER_SIZE))
- / denom );
- dcal->y_scale = MAX( dcal->y_scale, dcal->min_y_scale );
+ denom = num_weeks_per_col(dcal);
+ g_assert(denom != 0);
+ dcal->y_scale = (gint)((height
+ - (dcal->topPadding * 2)
+ - MINOR_BORDER_SIZE
+ - dcal->dayLabelHeight
+ - (num_weeks_per_col(dcal)-1
+ * MINOR_BORDER_SIZE))
+ / denom);
+ dcal->y_scale = MAX(dcal->y_scale, dcal->min_y_scale);
}
static void
-gdc_free_all_mark_data( GncDenseCal *dcal )
+gdc_free_all_mark_data(GncDenseCal *dcal)
{
- int i;
- GList *l;
- for ( i=0; i < dcal->numMarks; i++ ) {
- /* Each of these just contains an elt of dcal->markData,
- * which we're about to free, below... */
- g_list_free( dcal->marks[i] );
- }
- g_free( dcal->marks );
- dcal->marks = NULL;
- /* Remove the old mark data. */
- for ( l = dcal->markData; l; l = l->next ) {
- g_list_free( ((gdc_mark_data*)l->data)->ourMarks );
- g_free( (gdc_mark_data*)l->data );
- }
- g_list_free( dcal->markData );
- dcal->markData = NULL;
+ int i;
+ GList *l;
+ for (i=0; i < dcal->numMarks; i++)
+ {
+ /* Each of these just contains an elt of dcal->markData,
+ * which we're about to free, below... */
+ g_list_free(dcal->marks[i]);
+ }
+ g_free(dcal->marks);
+ dcal->marks = NULL;
+ /* Remove the old mark data. */
+ for (l = dcal->markData; l; l = l->next)
+ {
+ g_list_free(((gdc_mark_data*)l->data)->ourMarks);
+ g_free((gdc_mark_data*)l->data);
+ }
+ g_list_free(dcal->markData);
+ dcal->markData = NULL;
}
static void
-recompute_mark_storage( GncDenseCal *dcal )
+recompute_mark_storage(GncDenseCal *dcal)
{
- if ( dcal->marks == NULL ) {
- goto createNew;
- }
+ if (dcal->marks == NULL)
+ goto createNew;
+ gdc_free_all_mark_data(dcal);
- gdc_free_all_mark_data( dcal );
createNew:
- dcal->numMarks = num_weeks(dcal) * 7;
- dcal->marks = g_new0( GList*, dcal->numMarks );
- g_signal_emit_by_name( dcal, MARKS_LOST_SIGNAL_NAME );
+ dcal->numMarks = num_weeks(dcal) * 7;
+ dcal->marks = g_new0(GList*, dcal->numMarks);
+ if (dcal->model)
+ gdc_add_markings(dcal);
}
static void
-recompute_extents( GncDenseCal *dcal )
+recompute_extents(GncDenseCal *dcal)
{
- GDate date;
- gint start_week, end_week;
+ GDate date;
+ gint start_week, end_week;
- g_date_clear( &date, 1 );
- g_date_set_dmy( &date, 1, dcal->month, dcal->year );
- start_week = g_date_get_sunday_week_of_year(&date);
- g_date_add_months( &date, dcal->numMonths );
- end_week = g_date_get_sunday_week_of_year(&date);
- if ( g_date_get_year(&date) != dcal->year ) {
- end_week += g_date_get_sunday_weeks_in_year( dcal->year );
- }
- dcal->num_weeks = end_week - start_week + 1;
+ g_date_clear(&date, 1);
+ g_date_set_dmy(&date, 1, dcal->month, dcal->year);
+ start_week = g_date_get_sunday_week_of_year(&date);
+ g_date_add_months(&date, dcal->numMonths);
+ end_week = g_date_get_sunday_week_of_year(&date);
+ if (g_date_get_year(&date) != dcal->year)
+ end_week += g_date_get_sunday_weeks_in_year(dcal->year);
+ dcal->num_weeks = end_week - start_week + 1;
}
static void
-gnc_dense_cal_size_allocate( GtkWidget *widget,
- GtkAllocation *allocation )
+gnc_dense_cal_size_allocate(GtkWidget *widget,
+ GtkAllocation *allocation)
{
- GncDenseCal *dcal;
+ GncDenseCal *dcal;
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GNC_IS_DENSE_CAL (widget));
- g_return_if_fail (allocation != NULL);
+ g_return_if_fail(widget != NULL);
+ g_return_if_fail(GNC_IS_DENSE_CAL (widget));
+ g_return_if_fail(allocation != NULL);
- dcal = GNC_DENSE_CAL(widget);
+ dcal = GNC_DENSE_CAL(widget);
- widget->allocation = *allocation;
+ widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget)) {
- gdk_window_move_resize (widget->window,
- allocation->x, allocation->y,
- allocation->width,
- allocation->height);
+ if (GTK_WIDGET_REALIZED(widget)) {
+ gdk_window_move_resize(widget->window,
+ allocation->x, allocation->y,
+ allocation->width,
+ allocation->height);
+
+ /* We want to know how many px we can increase every day
+ * [width] or week [height]. */
+ recompute_x_y_scales(dcal);
- /* We want to know how many px we can increase every day
- * [width] or week [height]. */
- recompute_x_y_scales( dcal );
-
- gdc_reconfig( dcal );
- }
+ gdc_reconfig(dcal);
+ }
}
static void
-free_rect( gpointer data, gpointer ud )
+free_rect(gpointer data, gpointer ud)
{
- g_free( (GdkRectangle*)data );
+ g_free((GdkRectangle*)data);
}
static gint
-gnc_dense_cal_expose( GtkWidget *widget,
- GdkEventExpose *event )
+gnc_dense_cal_expose(GtkWidget *widget,
+ GdkEventExpose *event)
{
- GncDenseCal *dcal;
- GdkGC *gc;
+ GncDenseCal *dcal;
+ GdkGC *gc;
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GNC_IS_DENSE_CAL (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_return_val_if_fail(widget != NULL, FALSE);
+ g_return_val_if_fail(GNC_IS_DENSE_CAL(widget), FALSE);
+ g_return_val_if_fail(event != NULL, FALSE);
- if (event->count > 0)
- return FALSE;
+ if (event->count > 0)
+ return FALSE;
- dcal = GNC_DENSE_CAL (widget);
- gc = widget->style->fg_gc[ GTK_WIDGET_STATE(widget) ];
- gdk_draw_drawable(GDK_DRAWABLE(widget->window),
- gc,
- GDK_DRAWABLE(dcal->drawbuf),
- 0, 0, 0, 0,
- widget->allocation.width,
- widget->allocation.height);
+ dcal = GNC_DENSE_CAL(widget);
+ gc = widget->style->fg_gc[GTK_WIDGET_STATE(widget)];
+ gdk_draw_drawable(GDK_DRAWABLE(widget->window),
+ gc,
+ GDK_DRAWABLE(dcal->drawbuf),
+ 0, 0, 0, 0,
+ widget->allocation.width,
+ widget->allocation.height);
- return FALSE;
+ return FALSE;
}
static void
-gnc_dense_cal_draw_to_buffer( GncDenseCal *dcal )
+gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
{
- GtkWidget *widget;
- gint i;
- int maxWidth;
+ GtkWidget *widget;
+ gint i;
+ int maxWidth;
+ PangoLayout *layout;
- widget = &dcal->widget;
+ widget = &dcal->widget;
- if ( ! dcal->drawbuf )
- return;
+ if (!dcal->drawbuf)
+ return;
- gdk_draw_rectangle (dcal->drawbuf,
- widget->style->white_gc,
- TRUE,
- 0, 0,
- widget->allocation.width,
- widget->allocation.height);
+ layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
+ gdk_draw_rectangle(dcal->drawbuf,
+ widget->style->white_gc,
+ TRUE,
+ 0, 0,
+ widget->allocation.width,
+ widget->allocation.height);
- if ( dcal->needInitMonthLabels ) {
- /* Create the month labels */
- gint i;
- GdkPixmap *tmpPix;
- GdkImage *tmpImg;
- GdkGC *gc;
- GdkColor black;
- gc = widget->style->fg_gc[widget->state];
- tmpPix = gdk_pixmap_new( NULL,
- dcal->label_height,
- dcal->label_width,
- gdk_visual_get_system()->depth );
- black.pixel = gdk_rgb_xpixel_from_rgb(0);
- for ( i=0; i<12; i++ ) {
- guint x,y;
- /* these are going to be rotated, so transpose width
- * and height */
- dcal->monthLabels[i] =
- gdk_pixmap_new( widget->window,
- dcal->label_width,
- dcal->label_height, -1 );
- gdk_draw_rectangle( dcal->monthLabels[i],
- widget->style->white_gc,
- TRUE, 0, 0,
- dcal->label_width,
- dcal->label_height );
+ /* Fill in alternating month colors. */
+ {
+ gint i;
+ GdkGC *gc;
+ GdkRectangle *rect;
+ GList *mcList, *mcListIter;
- gdk_draw_rectangle( tmpPix,
- widget->style->white_gc,
- TRUE, 0, 0,
- dcal->label_height,
- dcal->label_width );
+ gc = gdk_gc_new(dcal->widget.window);
+ gdk_gc_copy(gc, widget->style->fg_gc[GTK_WIDGET_STATE(widget)]);
- gdk_draw_string( tmpPix, dcal->monthLabelFont, gc,
- dcal->label_lbearing,
- dcal->label_ascent,
- month_name(i) );
+ /* reset all of the month position offsets. */
+ for (i=0; i<12; i++)
+ {
+ dcal->monthPositions[i].x = dcal->monthPositions[i].y = -1;
+ }
- tmpImg = gdk_image_get( tmpPix, 0, 0,
- dcal->label_height,
- dcal->label_width );
+ /* Paint the weeks for the upcoming N months. */
+ for (i=0; i < dcal->numMonths; i++)
+ {
+ gdk_gc_set_foreground(gc, &dcal->weekColors[ i % 2 ]);
- /* now, (transpose the pixel matrix)==(do a 90-degree
- * counter-clockwise rotation) */
- for ( x=0; x < dcal->label_height; x++ ) {
- for ( y=0; y < dcal->label_width; y++ ) {
- if ( gdk_image_get_pixel( tmpImg, x, y )
- != black.pixel ) {
- continue;
- }
- gdk_draw_point( dcal->monthLabels[i],
- gc, y,
- dcal->label_height - x );
- }
- }
- gdk_image_destroy( tmpImg );
- }
- dcal->needInitMonthLabels = FALSE;
- }
+ mcList = NULL;
+ month_coords(dcal, i, &mcList);
+ dcal->monthPositions[i].x
+ = floor(i/dcal->monthsPerCol)
+ * (col_width(dcal) + COL_BORDER_SIZE);
+ dcal->monthPositions[i].y = ((GdkRectangle*)mcList->next->data)->y;
+ for (mcListIter = mcList; mcListIter != NULL; mcListIter = mcListIter->next)
+ {
+ rect = (GdkRectangle*)mcListIter->data;
+ gdk_draw_rectangle(dcal->drawbuf, gc,
+ TRUE, rect->x, rect->y,
+ rect->width - 2, rect->height);
+ }
+ g_list_foreach(mcList, free_rect, NULL);
+ g_list_free(mcList);
+ }
- /* Fill in alternating month colors. */
- {
- gint i;
- GdkGC *gc;
- GdkRectangle *rect;
- GList *mcList, *mcListIter;
+ gdk_gc_destroy(gc);
+ }
- gc = gdk_gc_new( dcal->widget.window );
- gdk_gc_copy( gc, widget->style->fg_gc[GTK_WIDGET_STATE(widget)] );
+ /* Hilight the marked days. */
+ {
+ int i;
+ int x1, x2, y1, y2;
+ GdkColor markColor, black;
+ GdkGCValues current_values;
- /* reset all of the month position offsets. */
- for ( i=0; i<12; i++ ) {
- dcal->monthPositions[i].x = dcal->monthPositions[i].y = -1;
- }
+ gdk_gc_get_values(widget->style->fg_gc[widget->state], ¤t_values);
- /* Paint the weeks for the upcoming N months. */
- for ( i=0; i < dcal->numMonths; i++ ) {
- gdk_gc_set_foreground( gc, &dcal->weekColors[ i % 2 ] );
+ gdk_color_parse(MARK_COLOR, &markColor);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &markColor, TRUE, TRUE);
- mcList = NULL;
- month_coords( dcal, i, &mcList );
- dcal->monthPositions[i].x =
- floor(i/dcal->monthsPerCol)
- * (col_width(dcal) + COL_BORDER_SIZE);
- dcal->monthPositions[i].y = ((GdkRectangle*)mcList->next->data)->y;
- for ( mcListIter = mcList; mcListIter;
- mcListIter = mcListIter->next ) {
- rect = (GdkRectangle*)mcListIter->data;
- gdk_draw_rectangle( dcal->drawbuf, gc,
- TRUE, rect->x, rect->y,
- rect->width - 2, rect->height );
- }
- g_list_foreach( mcList, free_rect, NULL );
- g_list_free( mcList );
- }
+ gdk_gc_set_foreground(widget->style->fg_gc[widget->state], &markColor);
+ for (i=0; i<dcal->numMarks; i++)
+ {
+ if (dcal->marks[i] != NULL)
+ {
+ int w,h, x_offset, y_offset, circle_delta;
- gdk_gc_destroy( gc );
- }
+ doc_coords(dcal, i, &x1, &y1, &x2, &y2);
+ w = x2 - x1;
+ h = y2 - y1;
- /* Hilight the marked days. */
- {
- int i;
- int x1, x2, y1, y2;
- GdkColor markColor, black;
- GList *l;
- gdc_mark_data *gdcmd;
+ x_offset = x1;
+ y_offset = y1;
- gdk_color_parse( MARK_COLOR, &markColor );
- gdk_colormap_alloc_color( gdk_colormap_get_system(), &markColor, TRUE, TRUE );
- gdk_color_black( gdk_colormap_get_system(), &black );
+ circle_delta = ABS(w-h) / 2;
+ if (w < h)
+ {
+ y_offset += circle_delta;
+ }
+ else
+ {
+ x_offset += circle_delta;
+ }
- /* FIXME: use a different GC for this */
- gdk_gc_set_foreground( widget->style->fg_gc[widget->state], &markColor );
- for ( i=0; i<dcal->numMarks; i++ ) {
- for ( l = dcal->marks[i]; l ; l = l->next ) {
- gdcmd = (gdc_mark_data*)l->data;
- doc_coords( dcal, i, &x1, &y1, &x2, &y2 );
- gdk_draw_rectangle( dcal->drawbuf,
- widget->style->fg_gc[widget->state],
- TRUE, x1, y1, (x2-x1), (y2-y1) );
- }
- }
- gdk_gc_set_foreground( widget->style->fg_gc[widget->state], &black );
- }
+ gdk_draw_arc(dcal->drawbuf,
+ widget->style->fg_gc[widget->state],
+ TRUE,
+ x_offset, y_offset, MIN(w,h), MIN(w,h),
+ 0 * 64,
+ 360 * 64);
+ }
+ }
- for ( i=0; i < num_cols(dcal); i++ ) {
- gint x, y, w, h;
- gint j;
+ // reset to the previous foreground color.
+ gdk_gc_set_foreground(widget->style->fg_gc[widget->state], ¤t_values.foreground);
+ }
- dcal->dayLabelHeight = gdk_string_height( dcal->monthLabelFont, "S" );
+ for (i=0; i < num_cols(dcal); i++)
+ {
+ gint x, y, w, h;
+ gint j;
+
+ pango_layout_set_text(layout, "S", -1);
+ pango_layout_get_pixel_size(layout, NULL, &dcal->dayLabelHeight);
- x = dcal->leftPadding
- + ( i * (col_width(dcal)+COL_BORDER_SIZE) )
- + dcal->label_width;
- y = dcal->topPadding + dcal->dayLabelHeight;
- w = col_width(dcal) - COL_BORDER_SIZE - dcal->label_width - 2;
- h = col_height(dcal);
+ x = dcal->leftPadding
+ + (i * (col_width(dcal)+COL_BORDER_SIZE))
+ + dcal->label_width;
+ y = dcal->topPadding + dcal->dayLabelHeight;
+ w = col_width(dcal) - COL_BORDER_SIZE - dcal->label_width - 2;
+ h = col_height(dcal);
- /* draw the outside border [inside the month labels] */
- gdk_draw_rectangle( dcal->drawbuf,
- widget->style->fg_gc[widget->state],
- FALSE, x, y, w, h );
- /* draw the week seperations */
- {
- for ( j=0; j < num_weeks_per_col(dcal); j++ ) {
- gint wy = y + (j * week_height(dcal));
- gdk_draw_line( dcal->drawbuf,
- widget->style->fg_gc[widget->state],
- x, wy,
- x + w, wy );
- }
- }
- /* draw the day seperations */
- {
- for ( j=1; j<7; j++ ) {
- gint dx = x + (j * day_width(dcal));
- gdk_draw_line( dcal->drawbuf,
- widget->style->fg_gc[widget->state],
- dx, y,
- dx, y + col_height(dcal) );
- }
- }
- /* draw the day labels */
- maxWidth = gdk_string_width( dcal->monthLabelFont, "88" );
- if ( dcal->x_scale > maxWidth ) {
- for ( j=0; j<7; j++ ) {
- gint dx = x
- + (j * day_width(dcal))
- + (day_width(dcal)/2)
- - ( gdk_string_width(dcal->monthLabelFont,
- day_label(j)) / 2 );
- gint dy = y - 2;
- gdk_draw_string( dcal->drawbuf,
- dcal->monthLabelFont,
- widget->style->fg_gc[widget->state],
- dx, dy, day_label(j) );
- }
- }
- }
+ /* draw the outside border [inside the month labels] */
+ gdk_draw_rectangle(dcal->drawbuf,
+ widget->style->fg_gc[widget->state],
+ FALSE, x, y, w, h);
+ /* draw the week seperations */
+ for (j=0; j < num_weeks_per_col(dcal); j++)
+ {
+ gint wy = y + (j * week_height(dcal));
+ gdk_draw_line(dcal->drawbuf,
+ widget->style->fg_gc[widget->state],
+ x, wy,
+ x + w, wy);
+ }
- /* Try some pixmap copying for the month labels. */
- {
- gint i, idx;
+ /* draw the day seperations */
+ for (j=1; j<7; j++)
+ {
+ gint dx = x + (j * day_width(dcal));
+ gdk_draw_line(dcal->drawbuf,
+ widget->style->fg_gc[widget->state],
+ dx, y,
+ dx, y + col_height(dcal));
+ }
- for ( i=0; i<12; i++ ) {
- if ( dcal->monthPositions[i].x == -1 ) {
- break;
- }
- idx = (dcal->month - 1 + i) % 12;
- gdk_draw_drawable(GDK_DRAWABLE(dcal->drawbuf),
- widget->style->fg_gc[widget->state],
- GDK_DRAWABLE(dcal->monthLabels[idx]),
- 0, 0,
- dcal->leftPadding
- + dcal->monthPositions[i].x,
- dcal->monthPositions[i].y,
- dcal->label_width, dcal->label_height);
- }
- }
+ /* draw the day labels */
+ pango_layout_set_text(layout, "88", -1);
+ pango_layout_get_pixel_size(layout, &maxWidth, NULL);
+
+ if (dcal->x_scale > maxWidth)
+ {
+ for (j=0; j<7; j++)
+ {
+ int day_label_width;
+ gint label_x_offset, label_y_offset;
- /* Try the per-day strings [dates] */
- {
- GDate d, eoc;
- gint doc;
- gchar dayNumBuf[3];
- gint numW, numH;
- gint x1, y1, x2, y2, w, h;
+ pango_layout_set_text(layout, day_label(j), -1);
+ pango_layout_get_pixel_size(layout, &day_label_width, NULL);
+ label_x_offset = x
+ + (j * day_width(dcal))
+ + (day_width(dcal)/2)
+ - (day_label_width / 2);
+ label_y_offset = y - dcal->dayLabelHeight;
+ pango_layout_set_text(layout, day_label(j), -1);
+ gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf), widget->style->fg_gc[widget->state],
+ label_x_offset, label_y_offset,
+ layout);
- g_date_set_dmy( &d, 1, dcal->month, dcal->year );
- eoc = d;
- g_date_add_months( &eoc, dcal->numMonths );
- for ( doc = 0; g_date_get_julian(&d) < g_date_get_julian(&eoc);
- g_date_add_days( &d, 1 ), doc++ ) {
- doc_coords( dcal, doc, &x1, &y1, &x2, &y2 );
- memset( dayNumBuf, 0, 3 );
- snprintf( dayNumBuf, 3, "%d", g_date_get_day( &d ) );
- numW = gdk_string_width( dcal->dayLabelFont, dayNumBuf );
- numH = gdk_string_height( dcal->dayLabelFont, dayNumBuf );
- w = (x2 - x1)+1;
- h = (y2 - y1)+1;
- gdk_draw_string( dcal->drawbuf,
- dcal->dayLabelFont,
- widget->style->fg_gc[widget->state],
- x1 + (w/2) - (numW/2),
- y1 + (h/2) + (numH/2),
- dayNumBuf );
- }
- }
+ }
+ }
+ }
- {
- GdkRectangle update_rect;
- update_rect.x = 0;
- update_rect.y = 0;
- update_rect.width = widget->allocation.width;
- update_rect.height = widget->allocation.height;
- gtk_widget_draw( GTK_WIDGET(dcal),
- &update_rect );
- }
+ /* Month labels. */
+ {
+ gint i;
+ PangoMatrix matrix = PANGO_MATRIX_INIT;
+ pango_matrix_rotate(&matrix, 90.);
+ pango_context_set_matrix(gtk_widget_get_pango_context(GTK_WIDGET(dcal)), &matrix);
+
+ for (i=0; i<12; i++)
+ {
+ guint x, y, idx;
+
+ if (dcal->monthPositions[i].x == -1)
+ break;
+ idx = (dcal->month - 1 + i) % 12;
+ pango_layout_set_text(layout, month_name(i), -1);
+ gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf),
+ widget->style->fg_gc[widget->state],
+ dcal->leftPadding + dcal->monthPositions[i].x,
+ dcal->monthPositions[i].y,
+ layout);
+ }
+
+ // reset rotation
+ pango_matrix_rotate(&matrix, -90.);
+ pango_context_set_matrix(gtk_widget_get_pango_context(GTK_WIDGET(dcal)), &matrix);
+ }
+
+ /* Try the per-day strings [dates] */
+ {
+ GDate d, eoc;
+ gint doc;
+ gchar dayNumBuf[3];
+ gint numW, numH;
+ gint x1, y1, x2, y2, w, h;
+
+ g_date_set_dmy(&d, 1, dcal->month, dcal->year);
+ eoc = d;
+ g_date_add_months(&eoc, dcal->numMonths);
+ for (doc = 0; g_date_get_julian(&d) < g_date_get_julian(&eoc); g_date_add_days(&d, 1), doc++)
+ {
+ doc_coords(dcal, doc, &x1, &y1, &x2, &y2);
+ memset(dayNumBuf, 0, 3);
+ snprintf(dayNumBuf, 3, "%d", g_date_get_day(&d));
+ pango_layout_set_text(layout, dayNumBuf, -1);
+ pango_layout_get_pixel_size(layout, &numW, &numH);
+ w = (x2 - x1)+1;
+ h = (y2 - y1)+1;
+ gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf),
+ widget->style->fg_gc[widget->state],
+ x1 + (w/2) - (numW/2),
+ y1 + (h/2) - (numH/2),
+ layout);
+ }
+ }
+
+ {
+ GdkRectangle update_rect;
+ update_rect.x = 0;
+ update_rect.y = 0;
+ update_rect.width = widget->allocation.width;
+ update_rect.height = widget->allocation.height;
+ gtk_widget_draw(GTK_WIDGET(dcal), &update_rect);
+ }
}
static void
-populate_hover_window( GncDenseCal *dcal, gint doc )
+populate_hover_window(GncDenseCal *dcal, gint doc)
{
- GtkWidget *w;
- GDate *date;
- static const int MAX_STRFTIME_BUF_LEN = 64;
- gchar strftimeBuf[MAX_STRFTIME_BUF_LEN];
+ GtkWidget *w;
+ GDate *date;
+ static const int MAX_STRFTIME_BUF_LEN = 64;
+ gchar strftimeBuf[MAX_STRFTIME_BUF_LEN];
- if ( doc >= 0 ) {
- GObject *o;
- GtkCList *cl;
- GList *l;
- gchar *rowText[2];
- gint row = 0;
- gdc_mark_data *gdcmd;
+ if (doc >= 0)
+ {
+ GObject *o;
+ GtkListStore *model;
+ GList *l;
- w = GTK_WIDGET( g_object_get_data( G_OBJECT(dcal->transPopup),
- "dateLabel" ) );
- date = g_date_new_dmy( 1, dcal->month, dcal->year );
- g_date_add_days( date, doc );
- /* Note: the ISO date format (%F or equivalently
- * %Y-%m-%d) is not a good idea here since many
- * locales will want to use a very different date
- * format. Please leave the specification of the date
- * format up to the locale and use %x here. */
- g_date_strftime( strftimeBuf, MAX_STRFTIME_BUF_LEN-1, "%x", date );
- gtk_label_set_text( GTK_LABEL(w), strftimeBuf );
+ w = GTK_WIDGET(g_object_get_data(G_OBJECT(dcal->transPopup), "dateLabel"));
+ date = g_date_new_dmy(1, dcal->month, dcal->year);
+ g_date_add_days(date, doc);
+ /* Note: the ISO date format (%F or equivalently
+ * %Y-%m-%d) is not a good idea here since many
+ * locales will want to use a very different date
+ * format. Please leave the specification of the date
+ * format up to the locale and use %x here. */
+ g_date_strftime(strftimeBuf, MAX_STRFTIME_BUF_LEN-1, "%x", date);
+ gtk_label_set_text(GTK_LABEL(w), strftimeBuf);
- o = G_OBJECT(dcal->transPopup);
- cl = GTK_CLIST( g_object_get_data(o, "clist" ) );
- gtk_clist_clear( cl );
- for ( l = dcal->marks[doc]; l; l = l->next ) {
- gdcmd = (gdc_mark_data*)l->data;
- rowText[0] = ( gdcmd->name ? gdcmd->name : _("(unnamed)") );
- rowText[1] = gdcmd->info;
- gtk_clist_insert( cl, row++, rowText );
- }
+ o = G_OBJECT(dcal->transPopup);
+ model = GTK_LIST_STORE(g_object_get_data(o, "model"));
+ gtk_list_store_clear(model);
+ for (l = dcal->marks[doc]; l; l = l->next)
+ {
+ GtkTreeIter iter;
+ gdc_mark_data *gdcmd;
- // FIXME: free 'date'?
- }
+ gdcmd = (gdc_mark_data*)l->data;
+ gtk_list_store_insert(model, &iter, INT_MAX);
+ gtk_list_store_set(model, &iter, 0, (gdcmd->name ? gdcmd->name : _("(unnamed)")), 1, gdcmd->info, -1);
+ }
+
+ g_date_free(date);
+ }
}
static gint
-gnc_dense_cal_button_press( GtkWidget *widget,
- GdkEventButton *evt )
+gnc_dense_cal_button_press(GtkWidget *widget,
+ GdkEventButton *evt)
{
- gint doc;
- GncDenseCal *dcal = GNC_DENSE_CAL(widget);
+ gint doc;
+ GncDenseCal *dcal = GNC_DENSE_CAL(widget);
- doc = wheres_this( dcal, evt->x, evt->y );
- dcal->showPopup = ~(dcal->showPopup);
- if ( dcal->showPopup && doc >= 0 ) {
- // Do the move twice in case the WM is ignoring the first one
- // because the window hasn't been shown, yet. The WM is free
- // to ignore our move and place windows according to it's own
- // strategy, but hopefully it'll listen to us. Certainly the
- // second move after show_all'ing the window should do the
- // trick with a bit of flicker.
- gtk_window_move(GTK_WINDOW(dcal->transPopup), evt->x_root+5, evt->y_root+5);
- populate_hover_window( dcal, doc );
- gtk_widget_show_all( GTK_WIDGET(dcal->transPopup) );
- gtk_window_move(GTK_WINDOW(dcal->transPopup), evt->x_root+5, evt->y_root+5);
- } else {
- gtk_widget_hide( GTK_WIDGET(dcal->transPopup) );
- }
- return FALSE;
+ doc = wheres_this(dcal, evt->x, evt->y);
+ dcal->showPopup = ~(dcal->showPopup);
+ if (dcal->showPopup && doc >= 0)
+ {
+ // Do the move twice in case the WM is ignoring the first one
+ // because the window hasn't been shown, yet. The WM is free
+ // to ignore our move and place windows according to it's own
+ // strategy, but hopefully it'll listen to us. Certainly the
+ // second move after show_all'ing the window should do the
+ // trick with a bit of flicker.
+ gtk_window_move(GTK_WINDOW(dcal->transPopup), evt->x_root+5, evt->y_root+5);
+ populate_hover_window(dcal, doc);
+ gtk_widget_show_all(GTK_WIDGET(dcal->transPopup));
+ gtk_window_move(GTK_WINDOW(dcal->transPopup), evt->x_root+5, evt->y_root+5);
+ }
+ else
+ {
+ gtk_widget_hide(GTK_WIDGET(dcal->transPopup));
+ }
+ return FALSE;
}
static gint
-gnc_dense_cal_motion_notify( GtkWidget *widget,
- GdkEventMotion *event )
+gnc_dense_cal_motion_notify(GtkWidget *widget,
+ GdkEventMotion *event)
{
- GncDenseCal *dcal;
- gint doc;
- int unused;
- int x_root_offset, y_root_offset;
- GdkModifierType unused2;
+ GncDenseCal *dcal;
+ gint doc;
+ int unused;
+ int x_root_offset, y_root_offset;
+ GdkModifierType unused2;
- dcal = GNC_DENSE_CAL(widget);
- if ( ! dcal->showPopup )
- return FALSE;
+ dcal = GNC_DENSE_CAL(widget);
+ if (!dcal->showPopup)
+ return FALSE;
- x_root_offset = event->x_root;
- y_root_offset = event->y_root;
+ x_root_offset = event->x_root;
+ y_root_offset = event->y_root;
- /* As per http://www.gtk.org/tutorial/sec-eventhandling.html */
- if ( event->is_hint ) {
- gdk_window_get_pointer( event->window, &unused, &unused, &unused2 );
- }
- gdk_window_move( GTK_WIDGET(dcal->transPopup)->window,
- x_root_offset+5, y_root_offset+5 );
- doc = wheres_this( dcal, event->x, event->y );
- if ( doc >= 0 ) {
- populate_hover_window( dcal, doc );
- gtk_widget_show_all( GTK_WIDGET(dcal->transPopup) );
- } else {
- gtk_widget_hide( GTK_WIDGET(dcal->transPopup) );
- }
- return TRUE;
+ /* As per http://www.gtk.org/tutorial/sec-eventhandling.html */
+ if (event->is_hint)
+ gdk_window_get_pointer(event->window, &unused, &unused, &unused2);
+ gdk_window_move(GTK_WIDGET(dcal->transPopup)->window,
+ x_root_offset+5, y_root_offset+5);
+ doc = wheres_this(dcal, event->x, event->y);
+ if (doc >= 0)
+ {
+ populate_hover_window(dcal, doc);
+ gtk_widget_show_all(GTK_WIDGET(dcal->transPopup));
+ }
+ else
+ {
+ gtk_widget_hide(GTK_WIDGET(dcal->transPopup));
+ }
+ return TRUE;
}
static inline int
-day_width_at( GncDenseCal *dcal, guint xScale )
+day_width_at(GncDenseCal *dcal, guint xScale)
{
- return xScale + MINOR_BORDER_SIZE;
+ return xScale + MINOR_BORDER_SIZE;
}
static inline int
-day_width( GncDenseCal *dcal )
+day_width(GncDenseCal *dcal)
{
- return day_width_at( dcal, dcal->x_scale );
+ return day_width_at(dcal, dcal->x_scale);
}
static inline int
-day_height_at( GncDenseCal *dcal, guint yScale )
+day_height_at(GncDenseCal *dcal, guint yScale)
{
- return yScale + MINOR_BORDER_SIZE;
+ return yScale + MINOR_BORDER_SIZE;
}
static inline int
-day_height( GncDenseCal *dcal )
+day_height(GncDenseCal *dcal)
{
- return day_height_at( dcal, dcal->y_scale );
+ return day_height_at(dcal, dcal->y_scale);
}
static inline int
-week_width_at( GncDenseCal *dcal, guint xScale )
+week_width_at(GncDenseCal *dcal, guint xScale)
{
- return day_width_at(dcal, xScale) * 7;
+ return day_width_at(dcal, xScale) * 7;
}
static inline int
-week_width( GncDenseCal *dcal )
+week_width(GncDenseCal *dcal)
{
- return week_width_at( dcal, dcal->x_scale );
+ return week_width_at(dcal, dcal->x_scale);
}
static inline int
-week_height_at( GncDenseCal *dcal, guint yScale )
+week_height_at(GncDenseCal *dcal, guint yScale)
{
- return day_height_at(dcal, yScale);
+ return day_height_at(dcal, yScale);
}
static inline int
-week_height( GncDenseCal *dcal )
+week_height(GncDenseCal *dcal)
{
- return week_height_at(dcal, dcal->y_scale);
+ return week_height_at(dcal, dcal->y_scale);
}
static inline int
-col_width_at( GncDenseCal *dcal, guint xScale )
+col_width_at(GncDenseCal *dcal, guint xScale)
{
- return (week_width_at(dcal, xScale)
- + dcal->label_width
- + COL_BORDER_SIZE);
+ return (week_width_at(dcal, xScale)
+ + dcal->label_width
+ + COL_BORDER_SIZE);
}
static inline int
-col_width( GncDenseCal *dcal )
+col_width(GncDenseCal *dcal)
{
- return col_width_at( dcal, dcal->x_scale );
+ return col_width_at(dcal, dcal->x_scale);
}
static inline int
-col_height( GncDenseCal *dcal )
+col_height(GncDenseCal *dcal)
{
- return week_height(dcal)
- * num_weeks_per_col(dcal);
+ return week_height(dcal) * num_weeks_per_col(dcal);
}
static inline int
-num_cols( GncDenseCal *dcal )
+num_cols(GncDenseCal *dcal)
{
- return ceil( (float)dcal->numMonths / (float)dcal->monthsPerCol );
+ return ceil((float)dcal->numMonths / (float)dcal->monthsPerCol);
}
static inline int
-num_weeks( GncDenseCal *dcal )
+num_weeks(GncDenseCal *dcal)
{
- /* FIXME: calculate, remove 'recompute_extents' */
- return dcal->num_weeks;
+ return dcal->num_weeks;
}
static
-int num_weeks_per_col( GncDenseCal *dcal )
+int num_weeks_per_col(GncDenseCal *dcal)
{
- int num_weeks_toRet, numCols, i;
- GDate *start,*end;
- int startWeek, endWeek;
+ int num_weeks_toRet, numCols, i;
+ GDate *start,*end;
+ int startWeek, endWeek;
- start = g_date_new();
- end = g_date_new();
+ start = g_date_new();
+ end = g_date_new();
- num_weeks_toRet = 0;
- numCols = num_cols(dcal);
+ num_weeks_toRet = 0;
+ numCols = num_cols(dcal);
- for ( i=0; i<numCols; i++ ) {
- g_date_set_dmy( start, 1,
- ((dcal->month - 1 +
- (i * dcal->monthsPerCol)) % 12)
- + 1,
- dcal->year + floor((dcal->month - 1
- + (i*dcal->monthsPerCol))
- / 12) );
- *end = *start;
- /* Add the smaller of (the number of months in the
- * calendar-display, minus the number of months shown in the
- * previous columns) or (the number of months in a column) */
- g_date_add_months( end, MIN( dcal->numMonths,
- MIN( dcal->monthsPerCol,
- dcal->numMonths
- - ((i-1)
- * dcal->monthsPerCol) ) ) );
- g_date_subtract_days( end, 1 );
- startWeek = g_date_get_sunday_week_of_year( start );
- endWeek = g_date_get_sunday_week_of_year( end );
- if ( endWeek < startWeek ) {
- endWeek += g_date_get_sunday_weeks_in_year( g_date_get_year(start) );
- }
- num_weeks_toRet = MAX( num_weeks_toRet, (endWeek - startWeek)+1 );
- }
- return num_weeks_toRet;
+ for (i=0; i<numCols; i++)
+ {
+ g_date_set_dmy(start, 1,
+ ((dcal->month - 1
+ + (i * dcal->monthsPerCol)) % 12)
+ + 1,
+ dcal->year + floor((dcal->month - 1
+ + (i*dcal->monthsPerCol))
+ / 12));
+ *end = *start;
+ /* Add the smaller of (the number of months in the
+ * calendar-display, minus the number of months shown in the
+ * previous columns) or (the number of months in a column) */
+ g_date_add_months(end, MIN(dcal->numMonths,
+ MIN(dcal->monthsPerCol,
+ dcal->numMonths
+ - ((i-1)
+ * dcal->monthsPerCol))));
+ g_date_subtract_days(end, 1);
+ startWeek = g_date_get_sunday_week_of_year(start);
+ endWeek = g_date_get_sunday_week_of_year(end);
+ if (endWeek < startWeek)
+ {
+ endWeek += g_date_get_sunday_weeks_in_year(g_date_get_year(start));
+ }
+ num_weeks_toRet = MAX(num_weeks_toRet, (endWeek - startWeek)+1);
+ }
+ return num_weeks_toRet;
}
/**
@@ -1261,167 +1228,173 @@
* size of the month.
**/
static void
-month_coords( GncDenseCal *dcal, int monthOfCal, GList **outList )
+month_coords(GncDenseCal *dcal, int monthOfCal, GList **outList)
{
- gint weekRow, colNum, previousMonthsInCol, monthOffset;
- gint start;
- GDate *startD, *endD;
- GdkRectangle *rect;
- gint startWk, endWk;
+ gint weekRow, colNum, previousMonthsInCol, monthOffset;
+ gint start;
+ GDate *startD, *endD;
+ GdkRectangle *rect;
+ gint startWk, endWk;
- if ( monthOfCal > dcal->numMonths ) {
- return;
- }
- colNum = floor(monthOfCal / dcal->monthsPerCol);
- monthOffset = colNum * dcal->monthsPerCol;
- previousMonthsInCol = MAX( 0, (monthOfCal % dcal->monthsPerCol) );
+ if (monthOfCal > dcal->numMonths)
+ return;
- startD = g_date_new();
- endD = g_date_new();
- // FIXME: clean these up?
+ colNum = floor(monthOfCal / dcal->monthsPerCol);
+ monthOffset = colNum * dcal->monthsPerCol;
+ previousMonthsInCol = MAX(0, (monthOfCal % dcal->monthsPerCol));
- /* Calculate the number of weeks in the column before the month we're
- * interested in. */
- weekRow = 0;
- if ( previousMonthsInCol > 0 ) {
- g_date_set_dmy( startD, 1,
- ((dcal->month - 1 + monthOffset) % 12) + 1,
- dcal->year + floor((dcal->month-1+monthOffset)/12) );
- /* get the week of the top of the column */
- startWk = g_date_get_sunday_week_of_year( startD );
- /* get the week of the end of the previous months */
- *endD = *startD;
- g_date_add_months( endD, previousMonthsInCol );
- g_date_subtract_days( endD, 1 );
- endWk = g_date_get_sunday_week_of_year( endD );
- if ( endWk < startWk ) {
- endWk += g_date_get_sunday_weeks_in_year( g_date_get_year(startD) );
- }
- /* determine how many weeks are before the month we're
- * interested in. */
- weekRow = endWk - startWk;
- if ( g_date_get_weekday(endD) == G_DATE_SATURDAY ) {
- weekRow++;
- }
- }
+ startD = g_date_new();
+ endD = g_date_new();
- g_date_set_dmy( startD, 1,
- ((dcal->month - 1 + monthOfCal) % 12) + 1,
- dcal->year + floor((dcal->month-1+monthOfCal)/12) );
- *endD = *startD;
- g_date_add_months( endD, 1 );
- g_date_subtract_days( endD, 1 );
- /* Get the first week. */
- {
- start = g_date_get_weekday( startD ) % 7;
- rect = g_new0( GdkRectangle, 1 );
- rect->x = dcal->leftPadding
- + MINOR_BORDER_SIZE
- + (colNum * (col_width(dcal) + COL_BORDER_SIZE))
- + dcal->label_width
- + (start * day_width(dcal));
- rect->y = dcal->topPadding
- + dcal->dayLabelHeight
- + MINOR_BORDER_SIZE
- + (weekRow * week_height(dcal) );
- rect->width = (7 - start) * day_width(dcal);
- rect->height = week_height(dcal);
- *outList = g_list_append(*outList, (gpointer)rect );
- rect = NULL;
- }
+ /* Calculate the number of weeks in the column before the month we're
+ * interested in. */
+ weekRow = 0;
+ if (previousMonthsInCol > 0)
+ {
+ g_date_set_dmy(startD, 1,
+ ((dcal->month - 1 + monthOffset) % 12) + 1,
+ dcal->year + floor((dcal->month-1+monthOffset)/12));
+ /* get the week of the top of the column */
+ startWk = g_date_get_sunday_week_of_year(startD);
+ /* get the week of the end of the previous months */
+ *endD = *startD;
+ g_date_add_months(endD, previousMonthsInCol);
+ g_date_subtract_days(endD, 1);
+ endWk = g_date_get_sunday_week_of_year(endD);
+ if (endWk < startWk)
+ {
+ endWk += g_date_get_sunday_weeks_in_year(g_date_get_year(startD));
+ }
+ /* determine how many weeks are before the month we're
+ * interested in. */
+ weekRow = endWk - startWk;
+ if (g_date_get_weekday(endD) == G_DATE_SATURDAY)
+ {
+ weekRow++;
+ }
+ }
- /* Get the middle weeks. */
- {
- gint i, weekStart, weekEnd;
+ g_date_set_dmy(startD, 1,
+ ((dcal->month - 1 + monthOfCal) % 12) + 1,
+ dcal->year + floor((dcal->month-1+monthOfCal)/12));
+ *endD = *startD;
+ g_date_add_months(endD, 1);
+ g_date_subtract_days(endD, 1);
+ /* Get the first week. */
+ {
+ start = g_date_get_weekday(startD) % 7;
+ rect = g_new0(GdkRectangle, 1);
+ rect->x = dcal->leftPadding
+ + MINOR_BORDER_SIZE
+ + (colNum * (col_width(dcal) + COL_BORDER_SIZE))
+ + dcal->label_width
+ + (start * day_width(dcal));
+ rect->y = dcal->topPadding
+ + dcal->dayLabelHeight
+ + MINOR_BORDER_SIZE
+ + (weekRow * week_height(dcal));
+ rect->width = (7 - start) * day_width(dcal);
+ rect->height = week_height(dcal);
+ *outList = g_list_append(*outList, (gpointer)rect);
+ rect = NULL;
+ }
- weekStart = g_date_get_sunday_week_of_year(startD)+1;
- weekEnd = g_date_get_sunday_week_of_year(endD);
- for ( i=weekStart; i<weekEnd; i++ ) {
- rect = g_new0( GdkRectangle, 1 );
- rect->x = dcal->leftPadding
- + MINOR_BORDER_SIZE
- + dcal->label_width
- + (colNum * (col_width(dcal) + COL_BORDER_SIZE));
- rect->y = dcal->topPadding
- + dcal->dayLabelHeight
- + MINOR_BORDER_SIZE
- + ((weekRow + (i-weekStart) + 1) * week_height(dcal));
- rect->width = week_width(dcal);
- rect->height = week_height(dcal);
+ /* Get the middle weeks. */
+ {
+ gint i, weekStart, weekEnd;
- *outList = g_list_append( *outList, (gpointer)rect );
- rect = NULL;
- }
- }
+ weekStart = g_date_get_sunday_week_of_year(startD)+1;
+ weekEnd = g_date_get_sunday_week_of_year(endD);
+ for (i=weekStart; i<weekEnd; i++) {
+ rect = g_new0(GdkRectangle, 1);
+ rect->x = dcal->leftPadding
+ + MINOR_BORDER_SIZE
+ + dcal->label_width
+ + (colNum * (col_width(dcal) + COL_BORDER_SIZE));
+ rect->y = dcal->topPadding
+ + dcal->dayLabelHeight
+ + MINOR_BORDER_SIZE
+ + ((weekRow + (i-weekStart) + 1) * week_height(dcal));
+ rect->width = week_width(dcal);
+ rect->height = week_height(dcal);
+
+ *outList = g_list_append(*outList, (gpointer)rect);
+ rect = NULL;
+ }
+ }
- /* Get the last week. */
- {
- rect = g_new0( GdkRectangle, 1 );
- rect->x = dcal->leftPadding
- + MINOR_BORDER_SIZE
- + dcal->label_width
- + (colNum * (col_width(dcal) + COL_BORDER_SIZE));
- rect->y = dcal->topPadding
- + MINOR_BORDER_SIZE
- + dcal->dayLabelHeight
- + ((weekRow
- + (g_date_get_sunday_week_of_year(endD)
- - g_date_get_sunday_week_of_year(startD)))
- * week_height(dcal));
- rect->width = ((g_date_get_weekday(endD) % 7)+1) * day_width(dcal);
- rect->height = week_height(dcal);
+ /* Get the last week. */
+ {
+ rect = g_new0(GdkRectangle, 1);
+ rect->x = dcal->leftPadding
+ + MINOR_BORDER_SIZE
+ + dcal->label_width
+ + (colNum * (col_width(dcal) + COL_BORDER_SIZE));
+ rect->y = dcal->topPadding
+ + MINOR_BORDER_SIZE
+ + dcal->dayLabelHeight
+ + ((weekRow
+ + (g_date_get_sunday_week_of_year(endD)
+ - g_date_get_sunday_week_of_year(startD)))
+ * week_height(dcal));
+ rect->width = ((g_date_get_weekday(endD) % 7)+1) * day_width(dcal);
+ rect->height = week_height(dcal);
- *outList = g_list_append( *outList, (gpointer)rect );
- rect = NULL;
- }
+ *outList = g_list_append(*outList, (gpointer)rect);
+ rect = NULL;
+ }
+
+ g_date_free(startD);
+ g_date_free(endD);
}
/* FIXME: make this more like month_coords */
static void
-doc_coords( GncDenseCal *dcal, int dayOfCal,
- int *x1, int *y1, int *x2, int *y2 )
+doc_coords(GncDenseCal *dcal, int dayOfCal,
+ int *x1, int *y1, int *x2, int *y2)
{
- GDate d;
- gint docMonth;
- gint d_week_of_cal, top_of_col_week_of_cal;
- gint colNum, dayCol, weekRow;
+ GDate d;
+ gint docMonth;
+ gint d_week_of_cal, top_of_col_week_of_cal;
+ gint colNum, dayCol, weekRow;
- /* FIXME: add range checks */
- g_date_set_dmy( &d, 1, dcal->month, dcal->year );
- g_date_add_days( &d, dayOfCal );
- docMonth = g_date_get_month( &d );
- if ( g_date_get_year( &d ) != dcal->year ) {
- docMonth += 12;
- }
- colNum = floor( (float)(docMonth - dcal->month) / (float)dcal->monthsPerCol );
- dayCol = g_date_get_weekday( &d ) % 7;
- d_week_of_cal = g_date_get_sunday_week_of_year( &d );
- g_date_set_dmy( &d, 1, dcal->month, dcal->year );
- g_date_add_months( &d, (colNum * dcal->monthsPerCol) );
- top_of_col_week_of_cal = g_date_get_sunday_week_of_year( &d );
- if ( d_week_of_cal < top_of_col_week_of_cal ) {
- d_week_of_cal +=
- g_date_get_sunday_weeks_in_year( dcal->year );
- }
- weekRow = d_week_of_cal - top_of_col_week_of_cal;
+ /* FIXME: add range checks */
+ g_date_set_dmy(&d, 1, dcal->month, dcal->year);
+ g_date_add_days(&d, dayOfCal);
+ docMonth = g_date_get_month(&d);
+ if (g_date_get_year(&d) != dcal->year)
+ {
+ docMonth += 12;
+ }
+ colNum = floor((float)(docMonth - dcal->month) / (float)dcal->monthsPerCol);
+ dayCol = g_date_get_weekday(&d) % 7;
+ d_week_of_cal = g_date_get_sunday_week_of_year(&d);
+ g_date_set_dmy(&d, 1, dcal->month, dcal->year);
+ g_date_add_months(&d, (colNum * dcal->monthsPerCol));
+ top_of_col_week_of_cal = g_date_get_sunday_week_of_year(&d);
+ if (d_week_of_cal < top_of_col_week_of_cal)
+ {
+ d_week_of_cal += g_date_get_sunday_weeks_in_year(dcal->year);
+ }
+ weekRow = d_week_of_cal - top_of_col_week_of_cal;
- /* top-left corner */
- /* FIXME: this has the math to make the mark-cells come out right,
- * which it shouldn't. */
- *x1 = dcal->leftPadding
- + MINOR_BORDER_SIZE
- + dcal->label_width
- + (colNum * (col_width(dcal) + COL_BORDER_SIZE))
- + (dayCol * day_width(dcal))
- + (day_width(dcal)/4);
- *y1 = dcal->topPadding
- + MINOR_BORDER_SIZE
- + dcal->dayLabelHeight
- + (weekRow * week_height(dcal))
- + (day_height(dcal)/4);
+ /* top-left corner */
+ /* FIXME: this has the math to make the mark-cells come out right,
+ * which it shouldn't. */
+ *x1 = dcal->leftPadding
+ + MINOR_BORDER_SIZE
+ + dcal->label_width
+ + (colNum * (col_width(dcal) + COL_BORDER_SIZE))
+ + (dayCol * day_width(dcal))
+ + (day_width(dcal)/4);
+ *y1 = dcal->topPadding
+ + MINOR_BORDER_SIZE
+ + dcal->dayLabelHeight
+ + (weekRow * week_height(dcal))
+ + (day_height(dcal)/4);
- *x2 = *x1 + (day_width(dcal)/2);
- *y2 = *y1 + (day_height(dcal)/2);
+ *x2 = *x1 + (day_width(dcal)/2);
+ *y2 = *y1 + (day_height(dcal)/2);
}
/**
@@ -1429,211 +1402,310 @@
* '-1' if invalid.
**/
static gint
-wheres_this( GncDenseCal *dcal, int x, int y )
+wheres_this(GncDenseCal *dcal, int x, int y)
{
- gint colNum, weekRow, dayCol, dayOfCal;
- GDate d, startD;
+ gint colNum, weekRow, dayCol, dayOfCal;
+ GDate d, startD;
- x -= dcal->leftPadding;
- y -= dcal->topPadding;
+ x -= dcal->leftPadding;
+ y -= dcal->topPadding;
- if ( (x < 0) || (y < 0) ) {
- /* DEBUG( "x(%d) or y(%d) < 0", x, y ); */
- return -1;
- }
- if ( (x >= GTK_WIDGET(dcal)->allocation.width)
- || (y >= GTK_WIDGET(dcal)->allocation.height) ) {
- /*DEBUG( "x(%d) > allocation.width(%d) or y(%d) > allocation->height(%d)",
- x, y,
- GTK_WIDGET(dcal)->allocation.width,
- GTK_WIDGET(dcal)->allocation.height );*/
- return -1;
- }
+ if ((x < 0) || (y < 0))
+ {
+ return -1;
+ }
+ if ((x >= GTK_WIDGET(dcal)->allocation.width)
+ || (y >= GTK_WIDGET(dcal)->allocation.height))
+ {
+ return -1;
+ }
- /* "outside of displayed table" check */
- if ( x >= (num_cols(dcal) * (col_width(dcal) + COL_BORDER_SIZE)) ) {
- /*DEBUG( "x(%d) > ( col_width(%d) * num_cols(%d) )",
- x, col_width(dcal), num_cols(dcal) );*/
- return -1;
- }
- if ( y >= col_height(dcal) ) {
- /*DEBUG( "y(%d) > col_height(%d)",
- y, col_height(dcal) );*/
- return -1;
- }
+ /* "outside of displayed table" check */
+ if (x >= (num_cols(dcal) * (col_width(dcal) + COL_BORDER_SIZE)))
+ {
+ return -1;
+ }
+ if (y >= col_height(dcal))
+ {
+ return -1;
+ }
- /* coords -> year-relative-values */
- colNum = floor( x / (col_width(dcal)+COL_BORDER_SIZE) );
+ /* coords -> year-relative-values */
+ colNum = floor(x / (col_width(dcal)+COL_BORDER_SIZE));
+
+ x %= (col_width(dcal)+COL_BORDER_SIZE);
+ x -= dcal->label_width;
+ if (x < 0)
+ {
+ return -1;
+ }
+ if (x >= day_width(dcal) * 7)
+ {
+ return -1;
+ }
- x %= (col_width(dcal)+COL_BORDER_SIZE);
- x -= dcal->label_width;
- if ( x < 0 ) {
- /* DEBUG( "X is over the label." );*/
- return -1;
- }
- if ( x >= day_width(dcal) * 7 ) {
- /*DEBUG( "X is in the col_border space." );*/
- return -1;
- }
+ y -= dcal->dayLabelHeight;
+ if (y < 0)
+ {
+ return -1;
+ }
- y -= dcal->dayLabelHeight;
- if ( y < 0 ) {
- /*DEBUG( "Y is over the label." );*/
- return -1;
- }
+ dayCol = floor((float)x / (float)day_width(dcal));
+ weekRow = floor((float)y / (float)week_height(dcal));
- dayCol = floor( (float)x / (float)day_width(dcal) );
- weekRow = floor( (float)y / (float)week_height(dcal) );
+ g_date_set_dmy(&startD, 1, dcal->month, dcal->year);
+ d = startD;
+ g_date_add_months(&d, (colNum * dcal->monthsPerCol));
+ dayCol -= (g_date_get_weekday(&d) % 7);
+ if (weekRow == 0)
+ {
+ if (dayCol < 0)
+ {
+ return -1;
+ }
+ }
+ g_date_add_days(&d, dayCol + (weekRow * 7));
- g_date_set_dmy( &startD, 1, dcal->month, dcal->year );
- d = startD;
- g_date_add_months( &d, (colNum * dcal->monthsPerCol) );
- dayCol -= (g_date_get_weekday(&d) % 7);
- if ( weekRow == 0 ) {
- if ( dayCol < 0 ) {
- /*DEBUG( "Before the beginning of the first month." );*/
- return -1;
- }
- }
- g_date_add_days( &d, dayCol + (weekRow * 7) );
+ /* Check to make sure we're within the column's displayed range. */
+ {
+ GDate ccd;
+ g_date_set_dmy(&ccd, 1, dcal->month, dcal->year);
+ g_date_add_months(&ccd, (colNum+1) * dcal->monthsPerCol);
+ if (g_date_get_julian(&d) >= g_date_get_julian(&ccd))
+ {
+ return -1;
+ }
+ }
- /* Check to make sure we're within the column's displayed range. */
- {
- GDate ccd;
- g_date_set_dmy( &ccd, 1, dcal->month, dcal->year );
- g_date_add_months( &ccd, (colNum+1) * dcal->monthsPerCol );
- if ( g_date_get_julian(&d) >= g_date_get_julian(&ccd) ) {
- /*DEBUG( "%d outside of column range [%d]",
- g_date_get_julian(&d), g_date_get_julian(&ccd) );*/
- return -1;
- }
- }
+ dayOfCal = g_date_get_julian(&d) - g_date_get_julian(&startD);
- dayOfCal = g_date_get_julian(&d) - g_date_get_julian(&startD);
+ /* one more check before returning... */
+ g_date_subtract_months(&d, dcal->numMonths);
+ if (g_date_get_julian(&d) >= g_date_get_julian(&startD))
+ {
+ /* we're past the end of the displayed calendar, thus -1 */
+ g_debug("%d >= %d", g_date_get_julian(&d), g_date_get_julian(&startD));
+ return -1;
+ }
- /* one more check before returning... */
- g_date_subtract_months( &d, dcal->numMonths );
- if ( g_date_get_julian(&d) >= g_date_get_julian(&startD) ) {
- /* we're past the end of the displayed calendar, thus -1 */
- DEBUG( "%d >= %d",
- g_date_get_julian( &d ), g_date_get_julian( &startD ) );
- return -1;
- }
-
- return dayOfCal;
+ return dayOfCal;
}
static gint
-gdc_get_doc_offset( GncDenseCal *dcal, GDate *d )
+gdc_get_doc_offset(GncDenseCal *dcal, GDate *d)
{
- gint toRet;
- /* soc == start-of-calendar */
- GDate soc;
+ gint toRet;
+ /* soc == start-of-calendar */
+ GDate soc;
- g_date_set_dmy( &soc, 1, dcal->month, dcal->year );
- /* ensure not before calendar start. */
- if ( g_date_get_julian(d) < g_date_get_julian(&soc) ) {
- return -1;
- }
- /* do computation here, since we're going to change the
- * start-of-calendar date. */
- toRet = g_date_get_julian(d) - g_date_get_julian(&soc);
- /* ensure not after end of visible calendar. */
- g_date_add_months( &soc, dcal->numMonths );
- if ( g_date_get_julian(d) > g_date_get_julian(&soc) ) {
- return -1;
- }
- /* return pre-computed value. */
- return toRet;
+ g_date_clear(&soc, 1);
+ g_date_set_dmy(&soc, 1, dcal->month, dcal->year);
+ /* ensure not before calendar start. */
+ if (g_date_get_julian(d) < g_date_get_julian(&soc))
+ return -1;
+ /* do computation here, since we're going to change the
+ * start-of-calendar date. */
+ toRet = g_date_get_julian(d) - g_date_get_julian(&soc);
+ /* ensure not after end of visible calendar. */
+ g_date_add_months(&soc, dcal->numMonths);
+ if (g_date_get_julian(d) > g_date_get_julian(&soc))
+ return -1;
+ /* return pre-computed value. */
+ return toRet;
}
+static void
+gdc_add_tag_markings(GncDenseCal *cal, guint tag)
+{
+ gchar *name, *info;
+ gint num_marks, idx;
+ GDate **dates;
+
+ // copy the values into the old marking function.
+ name = gnc_dense_cal_model_get_name(cal->model, tag);
+ info = gnc_dense_cal_model_get_info(cal->model, tag);
+ num_marks = gnc_dense_cal_model_get_instance_count(cal->model, tag);
+
+ if (num_marks == 0)
+ return;
+
+ dates = g_new0(GDate*, num_marks);
+ for (idx = 0; idx < num_marks; idx++)
+ {
+ dates[idx] = g_date_new();
+ gnc_dense_cal_model_get_instance(cal->model, tag, idx, dates[idx]);
+ }
+
+ gdc_mark_add(cal, tag, name, info, num_marks, dates);
+
+ for (idx = 0; idx < num_marks; idx++)
+ {
+ g_date_free(dates[idx]);
+ }
+ g_free(dates);
+}
+
+static void
+gdc_add_markings(GncDenseCal *cal)
+{
+ GList *tags;
+ tags = gnc_dense_cal_model_get_contained(cal->model);
+ for (; tags != NULL; tags = tags->next)
+ {
+ guint tag = GPOINTER_TO_UINT(tags->data);
+ gdc_add_tag_markings(cal, tag);
+ }
+}
+
+static void
+gdc_remove_markings(GncDenseCal *cal)
+{
+ GList *tags;
+ tags = gnc_dense_cal_model_get_contained(cal->model);
+ for (; tags != NULL; tags = tags->next)
+ {
+ guint tag = GPOINTER_TO_UINT(tags->data);
+ gdc_mark_remove(cal, tag);
+ }
+}
+
+static void
+gdc_model_added_cb(GncDenseCalModel *model, guint added_tag, gpointer user_data)
+{
+ GncDenseCal *cal = GNC_DENSE_CAL(user_data);
+ g_debug("gdc_model_added_cb update\n");
+ gdc_add_tag_markings(cal, added_tag);
+}
+
+static void
+gdc_model_update_cb(GncDenseCalModel *model, guint update_tag, gpointer user_data)
+{
+ GncDenseCal *cal = GNC_DENSE_CAL(user_data);
+ g_debug("gdc_model_update_cb update for tag [%d]\n", update_tag);
+ gdc_mark_remove(cal, update_tag);
+ gdc_add_tag_markings(cal, update_tag);
+}
+
+static void
+gdc_model_removing_cb(GncDenseCalModel *model, guint remove_tag, gpointer user_data)
+{
+ GncDenseCal *cal = GNC_DENSE_CAL(user_data);
+ g_debug("gdc_model_removing_cb update [%d]\n", remove_tag);
+ gdc_mark_remove(cal, remove_tag);
+}
+
+void
+gnc_dense_cal_set_model(GncDenseCal *cal, GncDenseCalModel *model)
+{
+ if (cal->model != NULL)
+ {
+ gdc_remove_markings(cal);
+ g_object_unref(G_OBJECT(cal->model));
+ cal->model = NULL;
+ }
+ cal->model = model;
+ g_object_ref(G_OBJECT(model));
+ g_signal_connect(G_OBJECT(cal->model), "added", (GCallback)gdc_model_added_cb, cal);
+ g_signal_connect(G_OBJECT(cal->model), "update", (GCallback)gdc_model_update_cb, cal);
+ g_signal_connect(G_OBJECT(cal->model), "removing", (GCallback)gdc_model_removing_cb, cal);
+
+ gdc_add_markings(cal);
+}
+
/**
* Marks the given array of GDate*s on the calendar with the given name.
**/
-guint
-gnc_dense_cal_mark( GncDenseCal *dcal,
- guint size, GDate **dateArray,
- gchar *name, gchar *info )
+static void
+gdc_mark_add(GncDenseCal *dcal,
+ guint tag,
+ gchar *name,
+ gchar *info,
+ guint size,
+ GDate **dateArray)
{
- guint i;
- gint doc;
- gdc_mark_data *newMark;
- GDate *d;
+ guint i;
+ gint doc;
+ gdc_mark_data *newMark;
+ GDate *d;
- if ( size == 0 ) {
- PERR( "0 size not allowed\n" );
- return -1;
- }
+ if (size == 0)
+ {
+ g_error("0 size not allowed\n");
+ return;
+ }
- newMark = g_new0( gdc_mark_data, 1 );
- newMark->name = NULL;
- if ( name ) {
- newMark->name = g_strdup(name);
- }
- newMark->info = NULL;
- if ( info ) {
- newMark->info = g_strdup(info);
- }
- newMark->tag = dcal->lastMarkTag++;
- newMark->ourMarks = NULL;
+ newMark = g_new0(gdc_mark_data, 1);
+ newMark->name = NULL;
+ if (name)
+ newMark->name = g_strdup(name);
+ newMark->info = NULL;
+ if (info)
+ newMark->info = g_strdup(info);
+ newMark->tag = tag;
+ newMark->ourMarks = NULL;
+ g_debug("saving mark with tag [%d]\n", newMark->tag);
- for ( i=0; i<size; i++ ) {
- d = dateArray[i];
- doc = gdc_get_doc_offset( dcal, d );
- if ( doc < 0 ) {
- continue;
- }
- if ( doc >= dcal->numMarks ) {
- /* It's not going to get any better, so just
- * stop processing. */
- break;
- }
- dcal->marks[doc] = g_list_append( dcal->marks[doc], newMark );
- newMark->ourMarks = g_list_append( newMark->ourMarks,
- GINT_TO_POINTER(doc) );
- }
- dcal->markData = g_list_append( dcal->markData, (gpointer)newMark );
- gnc_dense_cal_draw_to_buffer( dcal );
- gtk_widget_queue_draw( GTK_WIDGET( dcal ) );
- return newMark->tag;
+ for (i=0; i<size; i++)
+ {
+ d = dateArray[i];
+ doc = gdc_get_doc_offset(dcal, d);
+ if (doc < 0)
+ continue;
+ if (doc >= dcal->numMarks)
+ {
+ /* It's not going to get any better, so just
+ * stop processing. */
+ break;
+ }
+ dcal->marks[doc] = g_list_append(dcal->marks[doc], newMark);
+ newMark->ourMarks = g_list_append(newMark->ourMarks,
+ GINT_TO_POINTER(doc));
+ }
+ dcal->markData = g_list_append(dcal->markData, (gpointer)newMark);
+ gnc_dense_cal_draw_to_buffer(dcal);
+ gtk_widget_queue_draw(GTK_WIDGET(dcal));
}
-void
-gnc_dense_cal_mark_remove( GncDenseCal *dcal, guint markToRemove )
+static void
+gdc_mark_remove(GncDenseCal *dcal, guint mark_to_remove)
{
- GList *l, *calMarkL;
- gint doc;
- gdc_mark_data *gdcmd;
+ GList *iter, *calendar_marks;
+ gint day_of_cal;
+ gdc_mark_data *mark_data;
- /* Ignore non-realistic marks */
- if ( (gint)markToRemove == -1 ) {
- DEBUG( "markToRemove = -1" );
- return;
- }
+ /* Ignore non-realistic marks */
+ if ((gint)mark_to_remove == -1)
+ {
+ g_debug("mark_to_remove = -1");
+ return;
+ }
- gdcmd = NULL;
- for ( l = dcal->markData; l; l=l->next ) {
- gdcmd = (gdc_mark_data*)l->data;
- if ( gdcmd->tag == markToRemove )
- break;
- }
- g_assert( l != NULL );
- if ( l == NULL ) {
- DEBUG( "l == null" );
- return;
- }
- g_assert( gdcmd != NULL );
+ mark_data = NULL;
+ for (iter = dcal->markData; iter != NULL; iter = iter->next)
+ {
+ mark_data = (gdc_mark_data*)iter->data;
+ if (mark_data->tag == mark_to_remove)
+ break;
+ }
+ if (iter == NULL)
+ {
+ g_warning("couldn't find tag [%d]", mark_to_remove);
+ return;
+ }
+ if (mark_data == NULL)
+ {
+ g_debug("mark_data == null");
+ return;
+ }
- l = NULL;
- for ( calMarkL = gdcmd->ourMarks;
- calMarkL;
- calMarkL = calMarkL->next ) {
- doc = GPOINTER_TO_INT(calMarkL->data);
- dcal->marks[doc] = g_list_remove( dcal->marks[doc], gdcmd );
- }
- g_list_free( gdcmd->ourMarks );
- dcal->markData = g_list_remove( dcal->markData, gdcmd );
- g_free( gdcmd );
- gnc_dense_cal_draw_to_buffer( dcal );
- gtk_widget_queue_draw( GTK_WIDGET(dcal) );
+ for (calendar_marks = mark_data->ourMarks; calendar_marks != NULL; calendar_marks = calendar_marks->next)
+ {
+ day_of_cal = GPOINTER_TO_INT(calendar_marks->data);
+ dcal->marks[day_of_cal] = g_list_remove(dcal->marks[day_of_cal], mark_data);
+ }
+ g_list_free(mark_data->ourMarks);
+ dcal->markData = g_list_remove(dcal->markData, mark_data);
+ g_free(mark_data);
+ gnc_dense_cal_draw_to_buffer(dcal);
+ gtk_widget_queue_draw(GTK_WIDGET(dcal));
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-dense-cal.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,14 +1,11 @@
-#ifndef _DENSECAL_H_
-#define _DENSECAL_H_
-
/********************************************************************\
* gnc-dense-cal.h : a custom densely-dispalyed calendar widget *
- * Copyright (C) 2002 Joshua Sled <jsled at asynchronous.org> *
+ * Copyright (C) 2002,2006 Joshua Sled <jsled at asynchronous.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. *
+ * published by the Free Software Foundation, under version 2 of *
+ * the License. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@ -23,14 +20,17 @@
* Boston, MA 02110-1301, USA gnu at gnu.org *
\********************************************************************/
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
+#ifndef _GNC_DENSE_CAL_H
+#define _GNC_DENSE_CAL_H
+
+#include "config.h"
+
+#include <FreqSpec.h>
#include <glib.h>
+#include "gnc-dense-cal-model.h"
+#include <gtk/gtk.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define GNC_TYPE_DENSE_CAL (gnc_dense_cal_get_type ())
#define GNC_DENSE_CAL(obj) GTK_CHECK_CAST (obj, gnc_dense_cal_get_type (), GncDenseCal)
@@ -40,92 +40,91 @@
typedef struct _GncDenseCal GncDenseCal;
typedef struct _GncDenseCalClass GncDenseCalClass;
-typedef struct _gdc_month_coords {
- gint x, y;
+typedef struct _gdc_month_coords
+{
+ gint x, y;
} gdc_month_coords;
-enum GDC_COLORS {
- MONTH_THIS = 0,
- MONTH_THAT,
- MAX_COLORS
+enum GDC_COLORS
+{
+ MONTH_THIS = 0,
+ MONTH_THAT,
+ MAX_COLORS
};
struct _GncDenseCal
{
- GtkWidget widget;
+ GtkWidget widget;
- GdkPixmap *drawbuf;
+ GdkPixmap *drawbuf;
- gboolean initialized;
+ gboolean initialized;
- gboolean showPopup;
- GtkWindow *transPopup;
+ gboolean showPopup;
+ GtkWindow *transPopup;
- gint min_x_scale;
- gint min_y_scale;
+ gint min_x_scale;
+ gint min_y_scale;
- gint x_scale;
- gint y_scale;
+ gint x_scale;
+ gint y_scale;
- gint numMonths;
- gint monthsPerCol;
- gint num_weeks; /* computed */
+ gint numMonths;
+ gint monthsPerCol;
+ gint num_weeks; /* computed */
- GDateMonth month;
- gint year;
- gint firstOfMonthOffset;
+ GDateMonth month;
+ gint year;
+ gint firstOfMonthOffset;
- gint leftPadding;
- gint topPadding;
+ gint leftPadding;
+ gint topPadding;
- gboolean needInitMonthLabels;
- gdc_month_coords monthPositions[12];
- GdkFont *monthLabelFont;
- GdkFont *dayLabelFont;
- GdkPixmap *monthLabels[12];
+ gdc_month_coords monthPositions[12];
- GdkColor weekColors[MAX_COLORS];
+ GdkColor weekColors[MAX_COLORS];
- guint label_lbearing;
- guint label_ascent;
- guint label_width;
- guint label_height;
- guint dayLabelHeight;
+ guint label_width;
+ guint label_height;
+ guint dayLabelHeight;
- guint lastMarkTag;
+ GncDenseCalModel *model;
- /**
- * A GList of gdc_mark_data structs, one for each active/valid markTag.
- **/
- GList *markData;
- int numMarks;
- /* array of GList*s of per-cell markings. */
- GList **marks;
+ guint lastMarkTag;
- int disposed; /* private */
+ /**
+ * A GList of gdc_mark_data structs, one for each active/valid markTag.
+ **/
+ GList *markData;
+ int numMarks;
+ /* array of GList*s of per-cell markings. */
+ GList **marks;
+
+ int disposed; /* private */
};
struct _GncDenseCalClass
{
- GtkWidgetClass parent_class;
- void (*marks_lost_cb)( GncDenseCal *dcal, gpointer user_data );
+ GtkWidgetClass parent_class;
};
-typedef struct _gdc_mark_data {
- gchar *name;
- gchar *info;
- guint tag;
- /* GdkColor markStyle; */
- /**
- * A GList of the dcal->marks indexes containing this mark.
- **/
- GList *ourMarks;
+typedef struct _gdc_mark_data
+{
+ gchar *name;
+ gchar *info;
+ guint tag;
+ /**
+ * A GList of the dcal->marks indexes containing this mark.
+ **/
+ GList *ourMarks;
} gdc_mark_data;
GtkWidget* gnc_dense_cal_new (void);
+GtkWidget* gnc_dense_cal_new_with_model (GncDenseCalModel *model);
GType gnc_dense_cal_get_type (void);
-void gnc_dense_cal_set_month( GncDenseCal *dcal, GDateMonth mon );
+void gnc_dense_cal_set_model(GncDenseCal *cal, GncDenseCalModel *model);
+void gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon);
/**
* @param year Julian year: 2000 = 2000AD.
**/
@@ -137,13 +136,6 @@
GDateMonth gnc_dense_cal_get_month( GncDenseCal *dcal );
GDateYear gnc_dense_cal_get_year( GncDenseCal *dcal );
-guint gnc_dense_cal_mark( GncDenseCal *dcal,
- guint size, GDate **daysArray,
- gchar *name, gchar *info );
-void gnc_dense_cal_mark_remove( GncDenseCal *dcal, guint markToRemove );
+G_END_DECLS
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _DENSECAL_H_ */
+#endif /* _GNC_DENSE_CAL_H */
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-embedded-window.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-embedded-window.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-embedded-window.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -134,12 +134,12 @@
{
GncEmbeddedWindowPrivate *priv;
- ENTER("window %p, page %p", window, page);
g_return_if_fail (GNC_IS_EMBEDDED_WINDOW (window));
g_return_if_fail (GNC_IS_PLUGIN_PAGE (page));
priv = GNC_EMBEDDED_WINDOW_GET_PRIVATE(window);
g_return_if_fail (priv->page == NULL);
+ ENTER("window %p, page %p", window, page);
priv->page = page;
page->window = GTK_WIDGET(window);
page->notebook_page = gnc_plugin_page_create_widget (page);
@@ -159,12 +159,13 @@
{
GncEmbeddedWindowPrivate *priv;
- ENTER("window %p, page %p", window, page);
g_return_if_fail (GNC_IS_EMBEDDED_WINDOW (window));
g_return_if_fail (GNC_IS_PLUGIN_PAGE (page));
priv = GNC_EMBEDDED_WINDOW_GET_PRIVATE(window);
g_return_if_fail (priv->page == page);
+ ENTER("window %p, page %p", window, page);
+
if (!page->notebook_page) {
LEAVE("no displayed widget");
return;
@@ -248,10 +249,10 @@
GncEmbeddedWindow *window;
GncEmbeddedWindowPrivate *priv;
- ENTER("object %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_EMBEDDED_WINDOW (object));
+ ENTER("object %p", object);
window = GNC_EMBEDDED_WINDOW (object);
priv = GNC_EMBEDDED_WINDOW_GET_PRIVATE(window);
@@ -271,10 +272,10 @@
GncEmbeddedWindow *window;
GncEmbeddedWindowPrivate *priv;
- ENTER("object %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_EMBEDDED_WINDOW (object));
+ ENTER("object %p", object);
window = GNC_EMBEDDED_WINDOW (object);
priv = GNC_EMBEDDED_WINDOW_GET_PRIVATE(window);
if (priv->page) {
@@ -382,7 +383,7 @@
g_critical("Failed to load ui file.\n Filename %s\n Error %s",
ui_fullname, error->message);
g_error_free(error);
- g_free(ui_fullname);
+ g_free(ui_fullname);
LEAVE("window %p", window);
return window;
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-file.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-file.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -889,7 +889,7 @@
/* -- this session code is NOT identical in FileOpen and FileSaveAs -- */
new_session = qof_session_new ();
- qof_session_begin (new_session, newfile, FALSE, FALSE);
+ qof_session_begin (new_session, newfile, FALSE, TRUE);
io_err = qof_session_get_error (new_session);
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
/********************************************************************\
* gnc-frequency.c -- GnuCash widget for frequency editing. *
- * Copyright (C) 2001,2002 Joshua Sled <jsled at asynchronous.org> *
+ * Copyright (C) 2001,2002,2007 Joshua Sled <jsled at asynchronous.org>*
* Copyright (C) 2003 Linas Vepstas <linas at linas.org> *
* Copyright (C) 2006 David Hampton <hampton at employees.org> *
* *
@@ -38,7 +38,10 @@
#include "gnc-frequency.h"
#include "gnc-ui-util.h"
-static QofLogModule log_module = GNC_MOD_SX;
+#define LOG_MOD "gnc.gui.frequency"
+static QofLogModule log_module = LOG_MOD;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN LOG_MOD
/** Private Defs ********************/
@@ -51,7 +54,7 @@
/** Private Prototypes ********************/
-static void gnc_frequency_class_init( GNCFrequencyClass *klass );
+static void gnc_frequency_class_init( GncFrequencyClass *klass );
static void freq_combo_changed( GtkComboBox *b, gpointer d );
static void start_date_changed( GNCDateEdit *gde, gpointer d );
@@ -66,7 +69,7 @@
static void triyearly_sel_changed( GtkButton *b, gpointer d );
static void semiyearly_sel_changed( GtkButton *b, gpointer d );
-static void year_range_sels_changed( GNCFrequency *gf,
+static void year_range_sels_changed( GncFrequency *gf,
int monthsInRange,
GtkWidget *occurW,
GtkWidget *dayOfMonthW );
@@ -109,49 +112,49 @@
GType
gnc_frequency_get_type()
{
- static GType gncfreq_type = 0;
- if (gncfreq_type == 0) {
- static GTypeInfo gncfreq_info = {
- sizeof(GNCFrequencyClass),
- NULL,
- NULL,
- (GClassInitFunc)gnc_frequency_class_init,
- NULL,
- NULL,
- sizeof(GNCFrequency),
- 0,
- (GInstanceInitFunc)gnc_frequency_init
- };
+ static GType gncfreq_type = 0;
+ if (gncfreq_type == 0) {
+ static GTypeInfo gncfreq_info = {
+ sizeof(GncFrequencyClass),
+ NULL,
+ NULL,
+ (GClassInitFunc)gnc_frequency_class_init,
+ NULL,
+ NULL,
+ sizeof(GncFrequency),
+ 0,
+ (GInstanceInitFunc)gnc_frequency_init
+ };
+
+ gncfreq_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GncFrequency",
+ &gncfreq_info, 0);
+ }
- gncfreq_type = g_type_register_static (GTK_TYPE_VBOX,
- "GNCFrequency",
- &gncfreq_info, 0);
- }
-
- return gncfreq_type;
+ return gncfreq_type;
}
static void
-gnc_frequency_class_init( GNCFrequencyClass *klass )
+gnc_frequency_class_init( GncFrequencyClass *klass )
{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
+ GObjectClass *object_class;
+
+ object_class = G_OBJECT_CLASS (klass);
- gnc_frequency_signals[GNCFREQ_CHANGED] =
- g_signal_new ("changed",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GNCFrequencyClass, changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
+ gnc_frequency_signals[GNCFREQ_CHANGED] =
+ g_signal_new ("changed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GncFrequencyClass, changed),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE,
+ 0);
}
void
-gnc_frequency_init( GNCFrequency *gf )
+gnc_frequency_init(GncFrequency *gf)
{
int i;
GtkVBox *vb;
@@ -211,10 +214,10 @@
/* initialize the combo boxes */
for ( i=0; comboBoxes[i].name != NULL; i++ ) {
o = glade_xml_get_widget( gf->gxml, comboBoxes[i].name );
- gtk_combo_box_set_active(GTK_COMBO_BOX(o), 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(o), 0);
if ( comboBoxes[i].fn != NULL ) {
g_signal_connect( o, "changed",
- G_CALLBACK(comboBoxes[i].fn), gf );
+ G_CALLBACK(comboBoxes[i].fn), gf );
}
}
@@ -227,7 +230,7 @@
spinVals[i].name );
adj = gtk_spin_button_get_adjustment( GTK_SPIN_BUTTON(o) );
g_signal_connect( adj, "value_changed",
- G_CALLBACK(spinVals[i].fn), gf );
+ G_CALLBACK(spinVals[i].fn), gf );
}
}
@@ -235,19 +238,19 @@
for ( i=0; i<7; i++ ) {
o = glade_xml_get_widget( gf->gxml, CHECKBOX_NAMES[i] );
g_signal_connect( o, "clicked",
- G_CALLBACK(weekly_days_changed), gf );
+ G_CALLBACK(weekly_days_changed), gf );
}
gtk_widget_show_all( GTK_WIDGET(&gf->widget) );
/* respond to start date changes */
g_signal_connect( gf->startDate, "date_changed",
- G_CALLBACK(start_date_changed), gf );
+ G_CALLBACK(start_date_changed), gf );
}
static void
-do_frequency_setup( GNCFrequency *gf, FreqSpec *fs, time_t *secs)
+do_frequency_setup( GncFrequency *gf, FreqSpec *fs, time_t *secs)
{
UIFreqType uift;
int i, page;
@@ -291,10 +294,9 @@
struct tm stm;
/* set the date */
if ( xaccFreqSpecGetOnce( fs, &theDate ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d vs. FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d vs. FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ));
+ return;
}
g_date_to_struct_tm( &theDate, &stm );
gnc_date_edit_set_time( gf->startDate, mktime(&stm) );
@@ -305,10 +307,9 @@
GtkWidget *o;
int dailyMult = -1;
if ( xaccFreqSpecGetDaily( fs, &dailyMult ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d vs. FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d vs. FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
o = glade_xml_get_widget( gf->gxml, "daily_spin" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON( o ), dailyMult );
@@ -324,15 +325,14 @@
/* set the mult */
fsList = xaccFreqSpecCompositeGet( fs );
if ( g_list_length( fsList ) != 5 ) {
- PERR( "Invalid Daily[M-F] FreqSpec" );
- return;
+ g_warning("Invalid Daily[M-F] FreqSpec");
+ return;
}
subFS = (FreqSpec*)fsList->data;
if ( xaccFreqSpecGetWeekly( subFS, &weekMult, &dayOfWeek ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d vs. FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d vs. FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
o = glade_xml_get_widget( gf->gxml, "dailymf_spin" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(o), weekMult );
@@ -352,43 +352,39 @@
subFS = (FreqSpec*)(list->data);
if ( weeklyMult == -1 ) {
if ( subFS == NULL ) {
- PERR( "subFS is null\n" );
- return;
+ g_critical("subFS is null");
+ return;
}
if ( xaccFreqSpecGetWeekly( subFS,
&weeklyMult,
&dayOfWeek ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
} else {
int otherWeeklyMult = -1;
if ( subFS == NULL ) {
- PERR( "subFS is null\n" );
- return;
+ g_critical("subFS is null");
+ return;
}
if ( xaccFreqSpecGetWeekly( subFS,
&otherWeeklyMult,
&dayOfWeek ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
if ( weeklyMult != otherWeeklyMult ) {
- PERR( "Inconsistent weekly FreqSpec "
- "multipliers seen "
- "[first: %d vs. other: %d]\n",
- weeklyMult, otherWeeklyMult );
- return;
+ g_warning("Inconsistent weekly FreqSpec multipliers seen [first: %d vs. other: %d]",
+ weeklyMult, otherWeeklyMult );
+ return;
}
}
if ( dayOfWeek > 6 ) {
- PERR( "dayOfWeek > 6 [%d]", dayOfWeek );
- return;
+ g_warning( "dayOfWeek > 6 [%d]", dayOfWeek );
+ return;
}
str = CHECKBOX_NAMES[dayOfWeek];
o = glade_xml_get_widget( gf->gxml, str );
@@ -415,10 +411,9 @@
subFS = (FreqSpec*)(g_list_nth( list, 0 )->data);
if ( xaccFreqSpecGetMonthly( subFS, &monthlyMult,
&firstDayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
gtk_spin_button_set_value( GTK_SPIN_BUTTON(o), monthlyMult );
/* first date */
@@ -429,8 +424,8 @@
o = glade_xml_get_widget( gf->gxml, "semimonthly_second" );
if ( xaccFreqSpecGetMonthly( subFS, &monthlyMult,
&secondDayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type\n" );
- return;
+ g_warning( "Inappropriate FreqSpec type" );
+ return;
}
gtk_combo_box_set_active( GTK_COMBO_BOX(o), secondDayOfMonth-1 );
}
@@ -442,10 +437,9 @@
if ( xaccFreqSpecGetMonthly( fs, &monthlyMult,
&dayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
o = glade_xml_get_widget( gf->gxml, "monthly_spin" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(o), monthlyMult );
@@ -460,14 +454,13 @@
if ( xaccFreqSpecGetMonthly( fs, &monthlyMult,
&dayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
if ( monthlyMult != 3 ) {
- PERR( "monthly multiplier != 3 [=%d]", monthlyMult );
- return;
+ g_warning("monthly multiplier != 3 [=%d]", monthlyMult);
+ return;
}
year_range_menu_helper( glade_xml_get_widget( gf->gxml,
"quarterly_day" ),
@@ -482,14 +475,13 @@
if ( xaccFreqSpecGetMonthly( fs, &monthlyMult,
&dayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
if ( monthlyMult != 4 ) {
- PERR( "Month-multiplier != 4 [=%d]", monthlyMult );
- return;
+ g_warning("Month-multiplier != 4 [=%d]", monthlyMult);
+ return;
}
year_range_menu_helper( glade_xml_get_widget( gf->gxml,
"triyearly_day" ),
@@ -504,14 +496,13 @@
if ( xaccFreqSpecGetMonthly( fs, &monthlyMult,
&dayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
if ( monthlyMult != 6 ) {
- PERR( "month-mult != 6 [=%d]", monthlyMult );
- return;
+ g_warning( "month-mult != 6 [=%d]", monthlyMult );
+ return;
}
year_range_menu_helper( glade_xml_get_widget( gf->gxml,
"semiyearly_day" ),
@@ -527,14 +518,13 @@
if ( xaccFreqSpecGetMonthly( fs, &monthlyMult,
&dayOfMonth, &monthOffset ) < 0 ) {
- PERR( "Inappropriate FreqSpec type "
- "[gnc-frequency: %d, FreqSpec: %d]\n",
- uift, xaccFreqSpecGetUIType( fs ) );
- return;
+ g_warning("Inappropriate FreqSpec type [gnc-frequency: %d, FreqSpec: %d]",
+ uift, xaccFreqSpecGetUIType( fs ) );
+ return;
}
if ( (monthlyMult % 12) != 0) {
- PERR( "monthly-mult %% 12 != 0 [=%d]", ( monthlyMult % 12 ) );
- return;
+ g_warning( "monthly-mult %% 12 != 0 [=%d]", ( monthlyMult % 12 ) );
+ return;
}
/* set the mult */
@@ -548,16 +538,15 @@
}
break;
default:
- PERR( "unknown ui freq type %d [%d, %s]\n",
- uift, __LINE__, __FILE__ );
- break;
+ g_critical( "unknown ui freq type %d", uift);
+ break;
}
g_signal_emit_by_name( gf, "changed" );
}
void
-gnc_frequency_setup_default( GNCFrequency *gf, FreqSpec *fs, GDate *date )
+gnc_frequency_setup_default( GncFrequency *gf, FreqSpec *fs, GDate *date )
{
time_t secs;
@@ -598,7 +587,7 @@
}
void
-gnc_frequency_setup( GNCFrequency *gf, FreqSpec *fs, GDate *date )
+gnc_frequency_setup( GncFrequency *gf, FreqSpec *fs, GDate *date )
{
time_t secs;
@@ -621,14 +610,14 @@
GtkWidget *
gnc_frequency_new( FreqSpec *fs, GDate *date )
{
- GNCFrequency *toRet;
+ GncFrequency *toRet;
toRet = g_object_new( gnc_frequency_get_type(), NULL );
gnc_frequency_setup_default( toRet, fs, date );
return GTK_WIDGET(toRet);
}
void
-gnc_frequency_save_state( GNCFrequency *gf, FreqSpec *fs, GDate *outDate )
+gnc_frequency_save_state( GncFrequency *gf, FreqSpec *fs, GDate *outDate )
{
gint page;
gint day;
@@ -638,12 +627,12 @@
gint tmpInt;
int i;
GDate gd;
- time_t tmpTimeT;
+ time_t start_tt;
- tmpTimeT = gnc_date_edit_get_date( gf->startDate );
+ start_tt = gnc_date_edit_get_date( gf->startDate );
if ( NULL != outDate )
{
- g_date_set_time_t( outDate, tmpTimeT );
+ g_date_set_time_t( outDate, start_tt );
}
if (NULL == fs) return;
@@ -656,7 +645,7 @@
gnc_suspend_gui_refresh();
g_date_clear (&gd, 1);
- g_date_set_time_t( &gd, tmpTimeT );
+ g_date_set_time_t( &gd, start_tt );
/*uift = xaccFreqSpecGetUIType( fs );*/
uift = PAGES[page].uiFTVal;
@@ -664,9 +653,11 @@
/* Based on value, parse widget values into FreqSpec */
switch ( uift ) {
case UIFREQ_NONE:
- /* hmmm... shouldn't really be allowed. */
+ xaccFreqSpecSetNone(fs);
+ xaccFreqSpecSetUIType(fs, UIFREQ_NONE);
break;
case UIFREQ_ONCE:
+ xaccFreqSpecSetOnceDate(fs, &gd);
xaccFreqSpecSetUIType( fs, uift );
break;
case UIFREQ_DAILY:
@@ -771,8 +762,8 @@
o = glade_xml_get_widget( gf->gxml, "semimonthly_second" );
day = gtk_combo_box_get_active( GTK_COMBO_BOX(o) )+1;
tmpFS = xaccFreqSpecMalloc(gnc_get_current_book ());
- tmpTimeT = gnc_date_edit_get_date( gf->startDate );
- g_date_set_time_t( &gd, tmpTimeT );
+ start_tt = gnc_date_edit_get_date( gf->startDate );
+ g_date_set_time_t( &gd, start_tt );
g_date_to_struct_tm( &gd, &stm);
if ( day >= stm.tm_mday ) {
/* next month */
@@ -788,15 +779,19 @@
}
case UIFREQ_MONTHLY:
{
- struct tm stm;
o = glade_xml_get_widget( gf->gxml, "monthly_spin" );
tmpInt = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o));
- g_date_to_struct_tm( &gd, &stm);
o = glade_xml_get_widget( gf->gxml, "monthly_day" );
day = gtk_combo_box_get_active( GTK_COMBO_BOX(o) ) + 1;
- stm.tm_mday = day;
- g_date_set_time_t( &gd, mktime( &stm ) );
+ g_date_set_time_t(&gd, time(NULL));
+ g_date_set_month(&gd, 1);
+ g_date_set_day(&gd, day);
+ {
+ gchar buf[128];
+ g_date_strftime(buf, 127, "%c", &gd);
+ g_debug("monthly date [%s]\n", buf);
+ }
xaccFreqSpecSetMonthly( fs, &gd, tmpInt );
xaccFreqSpecSetUIType( fs, uift );
break;
@@ -820,9 +815,8 @@
xaccFreqSpecSetUIType( fs, uift );
break;
default:
- PERR( "Unknown UIFreqType %d [%d, %s]\n",
- uift, __LINE__, __FILE__ );
- break;
+ g_critical("Unknown UIFreqType %d", uift);
+ break;
}
gnc_resume_gui_refresh();
}
@@ -836,7 +830,7 @@
static void
weekly_days_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
+ GncFrequency *gf;
gf = GNC_FREQUENCY(d);
g_signal_emit_by_name( gf, "changed" );
@@ -845,15 +839,15 @@
static void
monthly_sel_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
+ GncFrequency *gf;
GtkWidget *o;
guint dayOfMonth;
struct tm *tmptm;
time_t tmptt;
- gf = (GNCFrequency*)d;
+ gf = (GncFrequency*)d;
- o = glade_xml_get_widget( ((GNCFrequency*)d)->gxml,
+ o = glade_xml_get_widget( ((GncFrequency*)d)->gxml,
"monthly_day" );
dayOfMonth = gtk_combo_box_get_active( GTK_COMBO_BOX(o) ) + 1;
@@ -874,13 +868,13 @@
static void
semimonthly_sel_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
+ GncFrequency *gf;
GtkWidget *o;
gint tmpint;
time_t tmptt;
struct tm *tmptm;
- gf = (GNCFrequency*)d;
+ gf = (GncFrequency*)d;
tmptt = gnc_date_edit_get_date( gf->startDate );
tmptm = localtime( &tmptt );
@@ -907,8 +901,8 @@
static void
quarterly_sel_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
- gf = (GNCFrequency*)d;
+ GncFrequency *gf;
+ gf = (GncFrequency*)d;
year_range_sels_changed( gf, 3,
glade_xml_get_widget( gf->gxml, "quarterly_occur" ),
glade_xml_get_widget( gf->gxml, "quarterly_day" ) );
@@ -917,8 +911,8 @@
static void
triyearly_sel_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
- gf = (GNCFrequency*)d;
+ GncFrequency *gf;
+ gf = (GncFrequency*)d;
year_range_sels_changed( gf, 4,
glade_xml_get_widget( gf->gxml, "triyearly_occur" ),
glade_xml_get_widget( gf->gxml, "triyearly_day" ) );
@@ -927,15 +921,15 @@
static void
semiyearly_sel_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
- gf = (GNCFrequency*)d;
+ GncFrequency *gf;
+ gf = (GncFrequency*)d;
year_range_sels_changed( gf, 6,
glade_xml_get_widget( gf->gxml, "semiyearly_occur" ),
glade_xml_get_widget( gf->gxml, "semiyearly_day" ) );
}
static void
-year_range_sels_changed( GNCFrequency *gf,
+year_range_sels_changed( GncFrequency *gf,
int monthsInRange,
GtkWidget *occurW,
GtkWidget *dayOfMonthW )
@@ -962,12 +956,12 @@
static void
yearly_sel_changed( GtkButton *b, gpointer d )
{
- GNCFrequency *gf;
+ GncFrequency *gf;
GtkWidget *o;
time_t tmptt;
struct tm *tmptm;
- gf = (GNCFrequency*)d;
+ gf = (GncFrequency*)d;
tmptt = gnc_date_edit_get_date( gf->startDate );
tmptm = localtime( &tmptt );
@@ -1005,7 +999,7 @@
static void
freq_combo_changed( GtkComboBox *b, gpointer d )
{
- GNCFrequency *gf = (GNCFrequency*)d;
+ GncFrequency *gf = (GncFrequency*)d;
int optIdx;
UIFreqType uift;
time_t startDate, tmpDate;
@@ -1013,8 +1007,8 @@
GtkWidget *o;
/* Set the new page. */
- optIdx = gtk_combo_box_get_active( GTK_COMBO_BOX(((GNCFrequency*)d)->freqComboBox) );
- gtk_notebook_set_current_page( ((GNCFrequency*)d)->nb, optIdx );
+ optIdx = gtk_combo_box_get_active( GTK_COMBO_BOX(((GncFrequency*)d)->freqComboBox) );
+ gtk_notebook_set_current_page( ((GncFrequency*)d)->nb, optIdx );
/* setup initial values for new page, as possible. */
uift = PAGES[optIdx].uiFTVal;
@@ -1032,44 +1026,44 @@
tmpDate = mktime( tmpTm );
tmpTm = localtime( &tmpDate );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- minn( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
+ minn( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
o = glade_xml_get_widget( gf->gxml, "semimonthly_second" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- maxn( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
+ maxn( tmpTm->tm_mday, tmpDayOfMonth ) - 1 );
}
break;
case UIFREQ_MONTHLY:
/* on the <startdate_dom> */
o = glade_xml_get_widget( gf->gxml, "monthly_day" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mday - 1 );
+ tmpTm->tm_mday - 1 );
break;
case UIFREQ_QUARTERLY:
/* on the <startdate_dom> */
o = glade_xml_get_widget( gf->gxml, "quarterly_day" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mday - 1 );
+ tmpTm->tm_mday - 1 );
break;
case UIFREQ_TRI_ANUALLY:
/* on the <startdate_dom> */
o = glade_xml_get_widget( gf->gxml, "triyearly_day" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mday - 1 );
+ tmpTm->tm_mday - 1 );
break;
case UIFREQ_SEMI_YEARLY:
/* on the <startdate_dom> */
o = glade_xml_get_widget( gf->gxml, "semiyearly_day" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mday - 1 );
+ tmpTm->tm_mday - 1 );
break;
case UIFREQ_YEARLY:
/* on the <startdate_mon>, <startdate_dom> */
o = glade_xml_get_widget( gf->gxml, "yearly_month" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mon );
+ tmpTm->tm_mon );
o = glade_xml_get_widget( gf->gxml, "yearly_day" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mday - 1 );
+ tmpTm->tm_mday - 1 );
break;
default:
/* nuttin can be done, for whatever reason. */
@@ -1087,22 +1081,22 @@
struct tm *tmpTm;
tmpTm = localtime( &startDate );
gtk_combo_box_set_active( GTK_COMBO_BOX(occurOptMenu),
- tmpTm->tm_mon % monthsInRange );
+ tmpTm->tm_mon % monthsInRange );
gtk_combo_box_set_active( GTK_COMBO_BOX(dayOptMenu),
- tmpTm->tm_mday - 1 );
+ tmpTm->tm_mday - 1 );
}
static void
start_date_changed( GNCDateEdit *gde, gpointer d )
{
- GNCFrequency *gf;
+ GncFrequency *gf;
GtkWidget *o;
struct tm *tmpTm;
time_t dateFromGDE;
gint page;
UIFreqType uift;
- gf = (GNCFrequency*)d;
+ gf = (GncFrequency*)d;
dateFromGDE = gnc_date_edit_get_date( gde );
@@ -1167,14 +1161,14 @@
o = glade_xml_get_widget( gf->gxml, "yearly_month" );
tmpTm = localtime( &dateFromGDE );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mon );
+ tmpTm->tm_mon );
o = glade_xml_get_widget( gf->gxml, "yearly_day" );
gtk_combo_box_set_active( GTK_COMBO_BOX(o),
- tmpTm->tm_mday-1 );
+ tmpTm->tm_mday-1 );
break;
default:
- PERR( "unknown uift value %d\n", uift );
- break;
+ g_critical("unknown uift value %d", uift);
+ break;
}
g_signal_emit_by_name( gf, "changed" );
}
@@ -1183,19 +1177,19 @@
/* Relabel some of the labels */
void
-gnc_frequency_set_frequency_label_text (GNCFrequency *gf, const gchar *txt)
+gnc_frequency_set_frequency_label_text (GncFrequency *gf, const gchar *txt)
{
GtkLabel *lbl;
- if (!gf || !txt) return;
+ if (!gf || !txt) return;
lbl = GTK_LABEL (glade_xml_get_widget (gf->gxml, "freq label"));
gtk_label_set_text (lbl, txt);
}
void
-gnc_frequency_set_date_label_text (GNCFrequency *gf, const gchar *txt)
+gnc_frequency_set_date_label_text (GncFrequency *gf, const gchar *txt)
{
GtkLabel *lbl;
- if (!gf || !txt) return;
+ if (!gf || !txt) return;
lbl = GTK_LABEL (glade_xml_get_widget (gf->gxml, "startdate label"));
gtk_label_set_text (lbl, txt);
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-frequency.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,17 +29,17 @@
#include "FreqSpec.h"
#define GNC_TYPE_FREQUENCY (gnc_frequency_get_type())
-#define GNC_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_FREQUENCY, GNCFrequency)
-#define GNC_FREQENCY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_FREQUENCY, GNCFrequency)
+#define GNC_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_FREQUENCY, GncFrequency)
+#define GNC_FREQENCY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_FREQUENCY, GncFrequency)
#define GNC_IS_FREQUENCY(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GNC_TYPE_FREQUENCY)
/**
- * A GNCFrequency is a VBox containing a scrollable GtkNotebook [and other
+ * A GncFrequency is a VBox containing a scrollable GtkNotebook [and other
* widgets] which allows the user to specify the frequency [of a scheduled
* transaction or budgeting category, for instance], manipulating a FreqSpec
* object in the process.
**/
-typedef struct _GNCFrequency
+typedef struct _GncFrequency
{
GtkVBox widget;
@@ -48,14 +48,14 @@
GtkComboBox *freqComboBox;
GNCDateEdit *startDate;
GladeXML *gxml;
-} GNCFrequency;
+} GncFrequency;
-typedef struct _GNCFrequencyClass
+typedef struct _GncFrequencyClass
{
GtkVBoxClass parent_class;
- void (*changed) (GNCFrequency *gf);
-} GNCFrequencyClass;
+ void (*changed) (GncFrequency *gf);
+} GncFrequencyClass;
struct pageDataTuple
{
@@ -67,42 +67,41 @@
GType gnc_frequency_get_type( void );
/**
- * Create a new freq spec widget.
+ * Create a new GncFrequencey widget.
* The menus and panels will be initialized to correspond to the
* settings in the FreqSpec, and the date window will show the
* indicated date. Either or both may be NULL.
* For the default freq spec widget, use 'NULL'.
**/
-GtkWidget * gnc_frequency_new( FreqSpec *fs, GDate *date );
-void gnc_frequency_init( GNCFrequency *gf );
+GtkWidget* gnc_frequency_new(FreqSpec *fs, GDate *start_date);
+void gnc_frequency_init( GncFrequency *gf );
/**
- * Change the given GNCFrequency with the given FreqSpec and GDate.
+ * Change the given GncFrequency with the given FreqSpec and GDate.
* If the FreqSpec is NULL, then no change is made to the widget menus.
* If the date is NULL, then no change is made to the widget date field.
**/
-void gnc_frequency_setup( GNCFrequency *gf, FreqSpec *fs, GDate *date );
+void gnc_frequency_setup( GncFrequency *gf, FreqSpec *fs, GDate *date );
/**
* Saves the state of the GNCFrequenecy widget.
* Updates the given FreqSpec if it's not NULL.
* Places the date in outDate, if it's not NULL.
**/
-void gnc_frequency_save_state( GNCFrequency *gf, FreqSpec *fs, GDate *outDate);
+void gnc_frequency_save_state( GncFrequency *gf, FreqSpec *fs, GDate *outDate);
/**
* Set the label text for the frequency option menu. In the current
* implementation, the default label text is "Frequency:"
*/
-void gnc_frequency_set_frequency_label_text (GNCFrequency *gf, const gchar *txt);
+void gnc_frequency_set_frequency_label_text (GncFrequency *gf, const gchar *txt);
/**
* Set the label text for the date entry widget. In the current
* impelmentation, the default label text is "Start Date:"
*/
-void gnc_frequency_set_date_label_text (GNCFrequency *gf, const gchar *txt);
+void gnc_frequency_set_date_label_text (GncFrequency *gf, const gchar *txt);
-void
-gnc_frequency_setup_default( GNCFrequency *gf, FreqSpec *fs, GDate *date );
+void gnc_frequency_setup_default( GncFrequency *gf, FreqSpec *fs, GDate *date );
#endif /* !defined( GNC_FREQUENCY_H ) */
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-html-graph-gog.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-html-graph-gog.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-html-graph-gog.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -59,7 +59,10 @@
* - general graph cleanup
**/
-static QofLogModule log_module = GNC_MOD_GUI;
+#define LOG_MOD "gnc.gui.html.graph.gog"
+static QofLogModule log_module = LOG_MOD;
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN LOG_MOD
static int handle_piechart(gnc_html * html, GtkHTMLEmbedded * eb, gpointer d);
static int handle_barchart(gnc_html * html, GtkHTMLEmbedded * eb, gpointer d);
@@ -81,7 +84,7 @@
gnc_html_graph_gog_init(void)
{
- PINFO( "init gog graphing" );
+ g_debug( "init gog graphing" );
libgoffice_init();
@@ -231,23 +234,22 @@
static void
set_chart_titles(GogObject *chart, const char *title, const char* sub_title)
{
- GString *totalTitle;
- GOData *titleScalar;
+ gchar *my_sub_title, *total_title;
+ GOData *title_scalar;
GogObject *tmp;
- totalTitle = g_string_sized_new(32);
- g_string_printf(totalTitle, "%s", title);
- if (sub_title != NULL)
- {
- g_string_append_printf(totalTitle, " (%s)", sub_title);
- }
+ if (sub_title)
+ my_sub_title = g_strdup_printf("%s(%s)", title ? " " : "", sub_title);
+ else
+ my_sub_title = g_strdup("");
+ total_title = g_strdup_printf("%s%s", title ? title : "", my_sub_title);
+
tmp = gog_object_add_by_name(chart, "Title", NULL);
- titleScalar = go_data_scalar_str_new(totalTitle->str, FALSE);
- gog_dataset_set_dim(GOG_DATASET(tmp), 0, titleScalar, NULL);
+ title_scalar = go_data_scalar_str_new(total_title, TRUE);
+ gog_dataset_set_dim(GOG_DATASET(tmp), 0, title_scalar, NULL);
- // @@fixme -- record or ref the string for freeing...
- g_string_free(totalTitle, FALSE);
+ g_free(my_sub_title);
}
static void
@@ -442,7 +444,7 @@
//"vary_style_by_element", TRUE,
"type", bar_type,
"overlap_percentage", bar_overlap,
- NULL);
+ NULL);
label_data = go_data_vector_str_new ((char const * const *)row_labels, data_rows, NULL);
{
// foreach row:
@@ -456,8 +458,8 @@
gog_object_set_name (GOG_OBJECT (series), col_labels[i], &err);
if (err != NULL)
{
- PERR("error setting name [%s] on series [%d]: [%s]\n",
- col_labels[i], i, err->message);
+ g_warning("error setting name [%s] on series [%d]: [%s]",
+ col_labels[i], i, err->message);
}
g_object_ref (label_data);
@@ -471,10 +473,10 @@
style = gog_styled_object_get_style (GOG_STYLED_OBJECT (series));
style->fill.type = GOG_FILL_STYLE_PATTERN;
if (gdk_color_parse (col_colors[i], &color)) {
- style->fill.auto_back = FALSE;
- go_pattern_set_solid (&style->fill.pattern, GDK_TO_UINT (color));
+ style->fill.auto_back = FALSE;
+ go_pattern_set_solid (&style->fill.pattern, GDK_TO_UINT (color));
} else {
- PERR("cannot parse color %s.", col_colors[i]);
+ g_warning("cannot parse color [%s]", col_colors[i]);
}
}
}
@@ -494,7 +496,7 @@
add_pixbuf_graph_widget (eb, graph);
- PINFO("barchart rendered.");
+ g_debug("barchart rendered.");
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-html.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-html.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-html.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
@@ -1290,7 +1291,7 @@
static gboolean
raw_html_receiver (gpointer engine,
const gchar *data,
- guint len,
+ size_t len,
gpointer user_data)
{
FILE *fh = (FILE *) user_data;
@@ -1311,7 +1312,7 @@
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (filepath != NULL, FALSE);
- fh = fopen (filepath, "w");
+ fh = g_fopen (filepath, "w");
if (!fh)
return FALSE;
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-main-window.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-main-window.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,10 +39,6 @@
#include <glib/gi18n.h>
#include <libguile.h>
#include "guile-mappings.h"
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
-#include "gtk-compat.h"
#include "gnc-plugin.h"
#include "gnc-plugin-manager.h"
@@ -403,6 +399,9 @@
#define WINDOW_GEOMETRY "Window Geometry"
#define WINDOW_POSITION "Window Position"
#define WINDOW_MAXIMIZED "Window Maximized"
+#define TOOLBAR_VISIBLE "Toolbar Visible"
+#define STATUSBAR_VISIBLE "Statusbar Visible"
+#define SUMMARYBAR_VISIBLE "Summarybar Visible"
#define WINDOW_FIRSTPAGE "First Page"
#define WINDOW_PAGECOUNT "Page Count"
#define WINDOW_PAGEORDER "Page Order"
@@ -511,9 +510,10 @@
gnc_main_window_restore_window (GncMainWindow *window, GncMainWindowSaveData *data)
{
GncMainWindowPrivate *priv;
+ GtkAction *action;
gint *pos, *geom, *order;
gsize length;
- gboolean max;
+ gboolean max, visible, desired_visibility;
gchar *window_group;
gint page_start, page_count, i;
GError *error = NULL;
@@ -612,6 +612,46 @@
gtk_window_maximize(GTK_WINDOW(window));
}
+ /* Common view menu items */
+ action = gnc_main_window_find_action(window, "ViewToolbarAction");
+ visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+ desired_visibility = g_key_file_get_boolean(data->key_file, window_group,
+ TOOLBAR_VISIBLE, &error);
+ if (error) {
+ g_warning("error reading group %s key %s: %s",
+ window_group, TOOLBAR_VISIBLE, error->message);
+ g_error_free(error);
+ error = NULL;
+ } else if (visible != desired_visibility) {
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action),desired_visibility);
+ }
+
+ action = gnc_main_window_find_action(window, "ViewSummaryAction");
+ visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+ desired_visibility = g_key_file_get_boolean(data->key_file, window_group,
+ SUMMARYBAR_VISIBLE, &error);
+ if (error) {
+ g_warning("error reading group %s key %s: %s",
+ window_group, TOOLBAR_VISIBLE, error->message);
+ g_error_free(error);
+ error = NULL;
+ } else if (visible != desired_visibility) {
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action),desired_visibility);
+ }
+
+ action = gnc_main_window_find_action(window, "ViewStatusbarAction");
+ visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+ desired_visibility = g_key_file_get_boolean(data->key_file, window_group,
+ STATUSBAR_VISIBLE, &error);
+ if (error) {
+ g_warning("error reading group %s key %s: %s",
+ window_group, TOOLBAR_VISIBLE, error->message);
+ g_error_free(error);
+ error = NULL;
+ } else if (visible != desired_visibility) {
+ gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action),desired_visibility);
+ }
+
/* Now populate the window with pages. */
for (i = 0; i < page_count; i++) {
data->page_offset = page_start;
@@ -752,8 +792,9 @@
gnc_main_window_save_window (GncMainWindow *window, GncMainWindowSaveData *data)
{
GncMainWindowPrivate *priv;
+ GtkAction *action;
gint i, num_pages, coords[4], *order;
- gboolean maximized;
+ gboolean maximized, visible;
gchar *window_group;
/* Setup */
@@ -802,6 +843,20 @@
coords[2], coords[3],
maximized ? "maximized" : "not maximized");
+ /* Common view menu items */
+ action = gnc_main_window_find_action(window, "ViewToolbarAction");
+ visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+ g_key_file_set_boolean(data->key_file, window_group,
+ TOOLBAR_VISIBLE, visible);
+ action = gnc_main_window_find_action(window, "ViewSummaryAction");
+ visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+ g_key_file_set_boolean(data->key_file, window_group,
+ SUMMARYBAR_VISIBLE, visible);
+ action = gnc_main_window_find_action(window, "ViewStatusbarAction");
+ visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
+ g_key_file_set_boolean(data->key_file, window_group,
+ STATUSBAR_VISIBLE, visible);
+
/* Save individual pages in this window */
g_list_foreach(priv->installed_pages, (GFunc)gnc_main_window_save_page, data);
@@ -3219,7 +3274,6 @@
gnc_gnome_help (HF_HELP, NULL);
}
-#ifdef HAVE_GTK26
/** This is a helper function to find a data file and suck it into
* memory.
*
@@ -3321,49 +3375,8 @@
if (authors) g_strfreev(authors);
g_object_unref (logo);
}
-#else
-static void
-gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window)
-{
- GtkWidget *about;
- /* Translators: This is the "About" message. */
- const gchar *message = _("The GnuCash personal finance manager.\n"
- "The GNU way to manage your money!\n"
- "http://www.gnucash.org/");
- const gchar *copyright = "© 1998-2002 Linas Vepstas";
- const gchar *authors[] = {
- "Derek Atkins <derek at ihtfp.com>",
- "Rob Browning <rlb at cs.utexas.edu>",
- "Bill Gribble <grib at billgribble.com>",
- "David Hampton <hampton at employees.org>",
- "James LewisMoss <dres at debian.org>",
- "Robert Graham Merkel <rgmerk at mira.net>",
- "Dave Peticolas <dave at krondo.com>",
- "Joshua Sled <jsled at asynchronous.org>",
- "Christian Stimming <stimming at tuhh.de>",
- "Linas Vepstas <linas at linas.org>",
- NULL
- };
- const gchar *documenters[] = {
- NULL
- };
- /* Translators: Insert your translator's credits here so that
- they will be shown in the "About" dialog. */
- const gchar *translator_credits = _("translator_credits");
- GdkPixbuf *logo;
- logo = gnc_gnome_get_gdkpixbuf ("appicon.png");
- about = gnome_about_new ("GnuCash", VERSION, copyright, message, authors, documenters,
- strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
- logo);
-
- g_object_unref (logo);
- gtk_dialog_run (GTK_DIALOG (about));
-}
-#endif
-
-
/************************************************************
* *
************************************************************/
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-file-history.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-file-history.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-file-history.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -34,7 +34,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <glib/gprintf.h>
-#include "gtk-compat.h"
#include <string.h>
#include "gnc-gkeyfile-utils.h"
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-page.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-page.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin-page.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -50,11 +50,7 @@
#define GNC_PLUGIN_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_PLUGIN_PAGE, GncPluginPageClass))
/* typedefs & structures */
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
-
/** The instance data structure for a content plugin. */
typedef struct GncPluginPage {
GObject gobject; /**< The parent object data. */
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-plugin.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -356,17 +356,20 @@
gchar *pathname;
gint merge_id;
- ENTER("ui_merge %p, action_group %p, filename %s",
- ui_merge, action_group, filename);
g_return_val_if_fail (ui_merge, 0);
g_return_val_if_fail (action_group, 0);
g_return_val_if_fail (filename, 0);
+ ENTER("ui_merge %p, action_group %p, filename %s",
+ ui_merge, action_group, filename);
gtk_ui_manager_insert_action_group (ui_merge, action_group, 0);
pathname = gnc_gnome_locate_ui_file (filename);
if (pathname == NULL)
- return 0;
+ {
+ LEAVE("fail");
+ return 0;
+ }
merge_id = gtk_ui_manager_add_ui_from_file (ui_merge, pathname, &error);
DEBUG("merge_id is %d", merge_id);
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -81,10 +81,10 @@
static void gnc_query_list_set_query_sort (GNCQueryList *list, gboolean new_column);
-GtkType
+GType
gnc_query_list_get_type (void)
{
- static GtkType gnc_query_list_type = 0;
+ static GType gnc_query_list_type = 0;
if (!gnc_query_list_type)
{
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-query-list.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -82,7 +82,7 @@
* public functions *
***********************************************************/
-GtkType gnc_query_list_get_type (void);
+GType gnc_query_list_get_type (void);
/* The param_list remains owned by the caller but is used by the
* query-list; do not destroy it until you destroy this query-list.
Copied: gnucash/branches/remove-group2/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c (from rev 15563, gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c)
Copied: gnucash/branches/remove-group2/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h (from rev 15563, gnucash/trunk/src/gnome-utils/gnc-sx-instance-dense-cal-adapter.h)
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-account.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -53,7 +53,7 @@
/** Implementation of GtkTreeModel **************************************/
static void gnc_tree_model_account_tree_model_init (GtkTreeModelIface *iface);
-static guint gnc_tree_model_account_get_flags (GtkTreeModel *tree_model);
+static GtkTreeModelFlags gnc_tree_model_account_get_flags (GtkTreeModel *tree_model);
static int gnc_tree_model_account_get_n_columns (GtkTreeModel *tree_model);
static GType gnc_tree_model_account_get_column_type (GtkTreeModel *tree_model,
int index);
@@ -217,10 +217,11 @@
GncTreeModelAccountPrivate *priv;
GncTreeModelAccount *model;
- ENTER("model %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (object));
+ ENTER("model %p", object);
+
model = GNC_TREE_MODEL_ACCOUNT (object);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -241,10 +242,11 @@
GncTreeModelAccountPrivate *priv;
GncTreeModelAccount *model;
- ENTER("model %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (object));
+ ENTER("model %p", object);
+
model = GNC_TREE_MODEL_ACCOUNT (object);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -356,7 +358,7 @@
iface->iter_parent = gnc_tree_model_account_iter_parent;
}
-static guint
+static GtkTreeModelFlags
gnc_tree_model_account_get_flags (GtkTreeModel *tree_model)
{
return 0;
@@ -430,12 +432,13 @@
Account *account, *parent;
gint i, *indices;
+ g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
+
{
gchar *path_string = gtk_tree_path_to_string(path);
ENTER("model %p, iter %p, path %s", tree_model, iter, path_string);
g_free(path_string);
}
- g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
model = GNC_TREE_MODEL_ACCOUNT (tree_model);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -482,12 +485,13 @@
GtkTreePath *path;
gint i;
- ENTER("model %p, iter %s", model, iter_to_string(iter));
g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model), NULL);
g_return_val_if_fail (iter != NULL, NULL);
g_return_val_if_fail (iter->user_data != NULL, NULL);
g_return_val_if_fail (iter->stamp == model->stamp, NULL);
+ ENTER("model %p, iter %s", model, iter_to_string(iter));
+
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
if (priv->root == NULL) {
LEAVE("failed (1)");
@@ -577,13 +581,14 @@
gboolean negative; /* used to set "deficit style" aka red numbers */
gchar *string;
- ENTER("model %p, iter %s, col %d", tree_model,
- iter_to_string(iter), column);
g_return_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model));
g_return_if_fail (iter != NULL);
g_return_if_fail (iter->user_data != NULL);
g_return_if_fail (iter->stamp == model->stamp);
+ ENTER("model %p, iter %s, col %d", tree_model,
+ iter_to_string(iter), column);
+
account = (Account *) iter->user_data;
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -791,12 +796,13 @@
Account *account, *parent;
gint i;
- ENTER("model %p, iter %s", tree_model, iter_to_string(iter));
g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
g_return_val_if_fail (iter->stamp == model->stamp, FALSE);
+ ENTER("model %p, iter %s", tree_model, iter_to_string(iter));
+
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
parent = (Account *) iter->user_data2;
@@ -832,13 +838,9 @@
GncTreeModelAccount *model;
Account *account, *parent;
- if (parent_iter) {
- ENTER("model %p, iter %p (to be filed in), parent_iter %s",
- tree_model, iter, iter_to_string(parent_iter));
- } else {
- ENTER("model %p, iter %p (to be filed in), parent_iter (null)", tree_model, iter);
- }
g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
+ ENTER("model %p, iter %p (to be filed in), parent %s",
+ tree_model, iter, (parent_iter ? iter_to_string(parent_iter) : "(null)"));
model = GNC_TREE_MODEL_ACCOUNT (tree_model);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -855,14 +857,17 @@
iter->user_data2 = NULL;
iter->user_data3 = GINT_TO_POINTER (0);
iter->stamp = model->stamp;
- LEAVE("iter (3) %s", iter_to_string(iter));
+ LEAVE("iter (2) %s", iter_to_string(iter));
return TRUE;
}
- g_return_val_if_fail (parent_iter->user_data != NULL, FALSE);
- g_return_val_if_fail (parent_iter->stamp == model->stamp, FALSE);
+ gnc_leave_return_val_if_fail (parent_iter != NULL, FALSE);
+ gnc_leave_return_val_if_fail (parent_iter->user_data != NULL, FALSE);
+ gnc_leave_return_val_if_fail (parent_iter->stamp == model->stamp, FALSE);
+
parent = (Account *)parent_iter->user_data;
account = gnc_account_nth_child (parent, 0);
+
if (account == NULL) {
iter->stamp = 0;
LEAVE("failed (child account is null)");
@@ -885,15 +890,16 @@
GncTreeModelAccountPrivate *priv;
Account *account;
- ENTER("model %p, iter %s", tree_model, iter_to_string(iter));
g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
+ ENTER("model %p, iter %s", tree_model, iter_to_string(iter));
+
model = GNC_TREE_MODEL_ACCOUNT (tree_model);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
- g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (iter->user_data != NULL, FALSE);
- g_return_val_if_fail (iter->stamp == model->stamp, FALSE);
+ gnc_leave_return_val_if_fail (iter != NULL, FALSE);
+ gnc_leave_return_val_if_fail (iter->user_data != NULL, FALSE);
+ gnc_leave_return_val_if_fail (iter->stamp == model->stamp, FALSE);
account = (Account *) iter->user_data;
if (gnc_account_n_children(account) > 0) {
@@ -913,8 +919,8 @@
GncTreeModelAccountPrivate *priv;
gint num;
+ g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
ENTER("model %p, iter %s", tree_model, iter_to_string(iter));
- g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
model = GNC_TREE_MODEL_ACCOUNT (tree_model);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -926,9 +932,9 @@
return 1;
}
- g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (iter->user_data != NULL, FALSE);
- g_return_val_if_fail (iter->stamp == model->stamp, FALSE);
+ gnc_leave_return_val_if_fail (iter != NULL, FALSE);
+ gnc_leave_return_val_if_fail (iter->user_data != NULL, FALSE);
+ gnc_leave_return_val_if_fail (iter->stamp == model->stamp, FALSE);
num = gnc_account_n_children(iter->user_data);
LEAVE("count is %d", num);
@@ -947,7 +953,6 @@
if (parent_iter) {
gchar *parent_string;
-
parent_string = strdup(iter_to_string(parent_iter));
ENTER("model %p, iter %s, parent_iter %s, n %d",
tree_model, iter_to_string(iter),
@@ -957,7 +962,7 @@
ENTER("model %p, iter %s, parent_iter (null), n %d",
tree_model, iter_to_string(iter), n);
}
- g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
+ gnc_leave_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
model = GNC_TREE_MODEL_ACCOUNT (tree_model);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
@@ -977,11 +982,11 @@
return TRUE;
}
- g_return_val_if_fail (parent_iter->user_data != NULL, FALSE);
- g_return_val_if_fail (parent_iter->stamp == model->stamp, FALSE);
+ gnc_leave_return_val_if_fail (parent_iter->user_data != NULL, FALSE);
+ gnc_leave_return_val_if_fail (parent_iter->stamp == model->stamp, FALSE);
+
parent = (Account *)parent_iter->user_data;
account = gnc_account_nth_child(parent, n);
-
if (account == NULL) {
iter->stamp = 0;
LEAVE("failed (2)");
@@ -1018,14 +1023,14 @@
ENTER("model %p, iter %s, child (null)",
tree_model, iter_to_string(iter));
}
- g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
+ gnc_leave_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (tree_model), FALSE);
model = GNC_TREE_MODEL_ACCOUNT (tree_model);
priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
- g_return_val_if_fail (child != NULL, FALSE);
- g_return_val_if_fail (child->user_data != NULL, FALSE);
- g_return_val_if_fail (child->stamp == model->stamp, FALSE);
+ gnc_leave_return_val_if_fail (child != NULL, FALSE);
+ gnc_leave_return_val_if_fail (child->user_data != NULL, FALSE);
+ gnc_leave_return_val_if_fail (child->stamp == model->stamp, FALSE);
account = (Account *) child->user_data;
account = gnc_account_get_parent(account);
@@ -1087,10 +1092,10 @@
gint i;
ENTER("model %p, account %p, iter %p", model, account, iter);
- g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model), FALSE);
- g_return_val_if_fail ((account != NULL), FALSE);
- g_return_val_if_fail ((iter != NULL), FALSE);
-
+ gnc_leave_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model), FALSE);
+ gnc_leave_return_val_if_fail ((account != NULL), FALSE);
+ gnc_leave_return_val_if_fail ((iter != NULL), FALSE);
+
iter->user_data = account;
iter->stamp = model->stamp;
@@ -1128,8 +1133,8 @@
GtkTreePath *tree_path;
ENTER("model %p, account %p", model, account);
- g_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model), NULL);
- g_return_val_if_fail (account != NULL, NULL);
+ gnc_leave_return_val_if_fail (GNC_IS_TREE_MODEL_ACCOUNT (model), NULL);
+ gnc_leave_return_val_if_fail (account != NULL, NULL);
if (!gnc_tree_model_account_get_iter_from_account (model, account,
&tree_iter)) {
@@ -1250,13 +1255,13 @@
DEBUG("add account %p (%s)", account, xaccAccountGetName(account));
path = gnc_tree_model_account_get_path_from_account(model, account);
if (!path) {
- DEBUG("can't generate path");
- break;
+ DEBUG("can't generate path");
+ break;
}
increment_stamp(model);
if (!gnc_tree_model_account_get_iter(GTK_TREE_MODEL(model), &iter, path)) {
- DEBUG("can't generate iter");
- break;
+ DEBUG("can't generate iter");
+ break;
}
gtk_tree_model_row_inserted (GTK_TREE_MODEL(model), path, &iter);
propagate_change(GTK_TREE_MODEL(model), path, 1);
@@ -1264,14 +1269,14 @@
case QOF_EVENT_REMOVE:
if (!ed) /* Required for a remove. */
- break;
+ break;
parent = ed->node ? GNC_ACCOUNT(ed->node) : priv->root;
parent_name = ed->node ? xaccAccountGetName(parent) : "Root";
DEBUG("remove child %d of account %p (%s)", ed->idx, parent, parent_name);
path = gnc_tree_model_account_get_path_from_account(model, parent);
if (!path) {
- DEBUG("can't generate path");
- break;
+ DEBUG("can't generate path");
+ break;
}
increment_stamp(model);
gtk_tree_path_append_index (path, ed->idx);
@@ -1283,19 +1288,19 @@
DEBUG("modify account %p (%s)", account, xaccAccountGetName(account));
path = gnc_tree_model_account_get_path_from_account(model, account);
if (!path) {
- DEBUG("can't generate path");
- break;
+ DEBUG("can't generate path");
+ break;
}
if (!gnc_tree_model_account_get_iter(GTK_TREE_MODEL(model), &iter, path)) {
- DEBUG("can't generate iter");
- break;
+ DEBUG("can't generate iter");
+ break;
}
gtk_tree_model_row_changed(GTK_TREE_MODEL(model), path, &iter);
propagate_change(GTK_TREE_MODEL(model), path, -1);
break;
default:
- DEBUG("unknown event type");
+ LEAVE("unknown event type");
return;
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-commodity.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-commodity.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-commodity.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -53,7 +53,7 @@
static void gnc_tree_model_commodity_dispose (GObject *object);
static void gnc_tree_model_commodity_tree_model_init (GtkTreeModelIface *iface);
-static guint gnc_tree_model_commodity_get_flags (GtkTreeModel *tree_model);
+static GtkTreeModelFlags gnc_tree_model_commodity_get_flags (GtkTreeModel *tree_model);
static int gnc_tree_model_commodity_get_n_columns (GtkTreeModel *tree_model);
static GType gnc_tree_model_commodity_get_column_type (GtkTreeModel *tree_model,
int index);
@@ -164,11 +164,11 @@
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
- ENTER("model %p", object);
-
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_TREE_MODEL_COMMODITY (object));
+ ENTER("model %p", object);
+
model = GNC_TREE_MODEL_COMMODITY (object);
priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model);
priv->book = NULL;
@@ -184,10 +184,10 @@
GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv;
- ENTER("model %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_TREE_MODEL_COMMODITY (object));
+ ENTER("model %p", object);
model = GNC_TREE_MODEL_COMMODITY (object);
priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model);
@@ -208,6 +208,8 @@
GncTreeModelCommodityPrivate *priv;
const GList *item;
+ ENTER("");
+
item = gnc_gobject_tracking_get_list(GNC_TREE_MODEL_COMMODITY_NAME);
for ( ; item; item = g_list_next(item)) {
model = (GncTreeModelCommodity *)item->data;
@@ -227,6 +229,7 @@
priv->event_handler_id =
qof_event_register_handler (gnc_tree_model_commodity_event_handler, model);
+ LEAVE("");
return GTK_TREE_MODEL (model);
}
@@ -366,7 +369,7 @@
iface->iter_parent = gnc_tree_model_commodity_iter_parent;
}
-static guint
+static GtkTreeModelFlags
gnc_tree_model_commodity_get_flags (GtkTreeModel *tree_model)
{
return 0;
@@ -447,7 +450,10 @@
list = gnc_commodity_table_get_namespaces_list(ct);
i = gtk_tree_path_get_indices (path)[0];
- g_return_val_if_fail (i >= 0 && i < g_list_length (list), FALSE);
+ {
+ if (!(i >= 0 && i < g_list_length (list))) { LEAVE(""); }
+ g_return_val_if_fail (i >= 0 && i < g_list_length (list), FALSE);
+ }
namespace = g_list_nth_data (list, i);
if (depth == 1) {
@@ -461,7 +467,10 @@
list = gnc_commodity_namespace_get_commodity_list(namespace);
i = gtk_tree_path_get_indices (path)[1];
- g_return_val_if_fail (i >= 0 && i < g_list_length (list), FALSE);
+ {
+ if (!(i >= 0 && i < g_list_length (list))) { LEAVE(""); }
+ g_return_val_if_fail (i >= 0 && i < g_list_length (list), FALSE);
+ }
commodity = g_list_nth_data (list, i);
iter->stamp = model->stamp;
@@ -483,13 +492,13 @@
gnc_commodity_namespace *namespace;
GList *ns_list;
- ENTER("model %p, iter %p (%s)", tree_model, iter, iter_to_string(iter));
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), NULL);
model = GNC_TREE_MODEL_COMMODITY (tree_model);
g_return_val_if_fail (iter != NULL, NULL);
g_return_val_if_fail (iter->user_data != NULL, NULL);
g_return_val_if_fail (iter->user_data2 != NULL, NULL);
g_return_val_if_fail (iter->stamp == model->stamp, NULL);
+ ENTER("model %p, iter %p (%s)", tree_model, iter, iter_to_string(iter));
priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model);
ct = priv->commodity_table;
@@ -640,7 +649,6 @@
GList *list;
int n;
- ENTER("model %p, iter %p(%s)", tree_model, iter, iter_to_string(iter));
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (tree_model), FALSE);
model = GNC_TREE_MODEL_COMMODITY (tree_model);
g_return_val_if_fail (iter != NULL, FALSE);
@@ -648,6 +656,7 @@
g_return_val_if_fail (iter->user_data2 != NULL, FALSE);
g_return_val_if_fail (iter->stamp == model->stamp, FALSE);
+ ENTER("model %p, iter %p(%s)", tree_model, iter, iter_to_string(iter));
priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model);
if (iter->user_data == ITER_IS_NAMESPACE) {
ct = priv->commodity_table;
@@ -733,9 +742,9 @@
gnc_commodity_namespace *namespace;
GList *list;
+ g_return_val_if_fail (iter != NULL, FALSE);
ENTER("model %p, iter %p (%s)", tree_model,
iter, iter_to_string(iter));
- g_return_val_if_fail (iter != NULL, FALSE);
if (iter->user_data != ITER_IS_NAMESPACE) {
LEAVE("no children (not ns)");
@@ -886,11 +895,12 @@
GList *list;
gint n;
- ENTER("model %p, commodity %p, iter %p", model, commodity, iter);
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (model), FALSE);
g_return_val_if_fail ((commodity != NULL), FALSE);
g_return_val_if_fail ((iter != NULL), FALSE);
+ ENTER("model %p, commodity %p, iter %p", model, commodity, iter);
+
namespace = gnc_commodity_get_namespace_ds(commodity);
if (namespace == NULL) {
LEAVE("no namespace");
@@ -929,9 +939,9 @@
GtkTreeIter tree_iter;
GtkTreePath *tree_path;
- ENTER("model %p, commodity %p", model, commodity);
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (model), NULL);
g_return_val_if_fail (commodity != NULL, NULL);
+ ENTER("model %p, commodity %p", model, commodity);
if (!gnc_tree_model_commodity_get_iter_from_commodity (model, commodity, &tree_iter)) {
LEAVE("no iter");
@@ -963,19 +973,26 @@
GList *list;
gint n;
- ENTER("model %p, namespace %p, iter %p", model, namespace, iter);
g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (model), FALSE);
g_return_val_if_fail ((namespace != NULL), FALSE);
g_return_val_if_fail ((iter != NULL), FALSE);
+ ENTER("model %p, namespace %p, iter %p", model, namespace, iter);
+
priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model);
list = gnc_commodity_table_get_namespaces_list(priv->commodity_table);
if (list == NULL)
+ {
+ LEAVE("");
return FALSE;
+ }
n = g_list_index(list, namespace);
if (n == -1)
+ {
+ LEAVE("");
return FALSE;
+ }
iter->stamp = model->stamp;
iter->user_data = ITER_IS_NAMESPACE;
@@ -1114,10 +1131,10 @@
gtk_tree_model_row_changed (GTK_TREE_MODEL(model), path, &iter);
namespace = gnc_tree_model_commodity_get_namespace (model, &iter);
if (namespace) {
- list = gnc_commodity_namespace_get_commodity_list(namespace);
- if (g_list_length(list) == 0) {
- gtk_tree_model_row_has_child_toggled(GTK_TREE_MODEL(model), path, &iter);
- }
+ list = gnc_commodity_namespace_get_commodity_list(namespace);
+ if (g_list_length(list) == 0) {
+ gtk_tree_model_row_has_child_toggled(GTK_TREE_MODEL(model), path, &iter);
+ }
}
}
}
@@ -1206,13 +1223,14 @@
remove_data *data;
const gchar *name;
- ENTER("entity %p, event %d, model %p, event data %p",
- entity, event_type, user_data, event_data);
model = (GncTreeModelCommodity *)user_data;
/* hard failures */
g_return_if_fail(GNC_IS_TREE_MODEL_COMMODITY(model));
+ ENTER("entity %p, event %d, model %p, event data %p",
+ entity, event_type, user_data, event_data);
+
/* get type specific data */
if (GNC_IS_COMMODITY(entity)) {
gnc_commodity *commodity;
@@ -1237,6 +1255,7 @@
}
}
} else {
+ LEAVE("");
return;
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-selection.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-selection.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-model-selection.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -34,7 +34,7 @@
static void gnc_tree_model_selection_finalize (GObject *object);
static void gnc_tree_model_selection_tree_model_init (GtkTreeModelIface *iface);
-static guint gnc_tree_model_selection_get_flags (GtkTreeModel *tree_model);
+static GtkTreeModelFlags gnc_tree_model_selection_get_flags (GtkTreeModel *tree_model);
static int gnc_tree_model_selection_get_n_columns (GtkTreeModel *tree_model);
static GType gnc_tree_model_selection_get_column_type (GtkTreeModel *tree_model,
int index);
@@ -342,7 +342,7 @@
iface->iter_parent = gnc_tree_model_selection_iter_parent;
}
-static guint
+static GtkTreeModelFlags
gnc_tree_model_selection_get_flags (GtkTreeModel *tree_model)
{
GncTreeModelSelection *model;
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-account.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-account.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-account.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,10 +28,6 @@
#include <glib/gi18n.h>
#include <string.h>
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
-
#include "gnc-tree-view.h"
#include "gnc-tree-model-account.h"
#include "gnc-tree-model-account-types.h"
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-commodity.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-commodity.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-commodity.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -125,10 +125,10 @@
GncTreeViewCommodity *view;
GncTreeViewCommodityPrivate *priv;
- ENTER("view %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY (object));
+ ENTER("view %p", object);
view = GNC_TREE_VIEW_COMMODITY (object);
priv = GNC_TREE_VIEW_COMMODITY_GET_PRIVATE (view);
@@ -142,10 +142,10 @@
{
GncTreeViewCommodity *view;
- ENTER("view %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY (object));
+ ENTER("view %p", object);
view = GNC_TREE_VIEW_COMMODITY (object);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
@@ -697,12 +697,12 @@
GtkTreeModel *f_model, *s_model;
filter_user_data *fd = data;
+ g_return_if_fail(GNC_IS_TREE_VIEW_COMMODITY(view));
+ g_return_if_fail((ns_func != NULL) || (cm_func != NULL));
+
ENTER("view %p, ns func %p, cm func %p, data %p, destroy %p",
view, ns_func, cm_func, data, destroy);
- g_return_if_fail(GNC_IS_TREE_VIEW_COMMODITY(view));
- g_return_if_fail((ns_func != NULL) || (cm_func != NULL));
-
fd = g_malloc(sizeof(filter_user_data));
fd->user_ns_fn = ns_func;
fd->user_cm_fn = cm_func;
@@ -730,10 +730,9 @@
{
GtkTreeModel *f_model, *s_model;
- ENTER("view %p", view);
-
g_return_if_fail(GNC_IS_TREE_VIEW_COMMODITY(view));
+ ENTER("view %p", view);
s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (s_model));
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
@@ -758,10 +757,10 @@
GtkTreeIter iter;
gnc_commodity *commodity;
- ENTER("view %p", view);
g_return_val_if_fail (GNC_IS_TREE_VIEW_COMMODITY (view), NULL);
g_return_val_if_fail (s_path != NULL, NULL);
+ ENTER("view %p", view);
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_path = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (s_model), s_path);
if (!f_path) {
@@ -802,9 +801,10 @@
GtkTreeIter iter, f_iter, s_iter;
gnc_commodity *commodity;
- ENTER("view %p", view);
g_return_val_if_fail (GNC_IS_TREE_VIEW_COMMODITY (view), NULL);
+ ENTER("view %p", view);
+
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
if (!gtk_tree_selection_get_selected (selection, &s_model, &s_iter)) {
LEAVE("no commodity, get_selected failed");
@@ -845,7 +845,10 @@
gtk_tree_selection_unselect_all (selection);
if (commodity == NULL)
+ {
+ LEAVE("");
return;
+ }
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
@@ -1016,9 +1019,9 @@
GtkTreePath *s_path;
gnc_commodity *commodity;
- ENTER("view %p", view);
g_return_val_if_fail (GNC_IS_TREE_VIEW_COMMODITY (view), NULL);
+ ENTER("view %p", view);
s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
gtk_tree_view_get_cursor (GTK_TREE_VIEW(view), &s_path, NULL);
if (s_path) {
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-price.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-price.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view-price.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -126,8 +126,8 @@
GncTreeViewPricePrivate *priv;
ENTER("view %p", object);
- g_return_if_fail (object != NULL);
- g_return_if_fail (GNC_IS_TREE_VIEW_PRICE (object));
+ gnc_leave_return_if_fail (object != NULL);
+ gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_PRICE (object));
view = GNC_TREE_VIEW_PRICE (object);
priv = GNC_TREE_VIEW_PRICE_GET_PRIVATE (view);
@@ -143,8 +143,8 @@
GncTreeViewPrice *view;
ENTER("view %p", object);
- g_return_if_fail (object != NULL);
- g_return_if_fail (GNC_IS_TREE_VIEW_PRICE (object));
+ gnc_leave_return_if_fail (object != NULL);
+ gnc_leave_return_if_fail (GNC_IS_TREE_VIEW_PRICE (object));
view = GNC_TREE_VIEW_PRICE (object);
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1918,7 +1918,6 @@
return column;
}
-#if HAVE_GTK26
GtkTreeViewColumn *
gnc_tree_view_add_combo_column (GncTreeView *view,
const gchar *column_title,
@@ -1976,7 +1975,6 @@
gnc_tree_view_append_column (view, column);
return column;
}
-#endif
GtkCellRenderer *
gnc_tree_view_column_get_renderer(GtkTreeViewColumn *column)
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.h
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnc-tree-view.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -188,7 +188,7 @@
gint model_data_column,
gint model_visibility_column,
GtkTreeIterCompareFunc column_sort_fn);
-#if HAVE_GTK26
+
/** This function adds a new combobox column to a GncTreeView base
* view. The parameters it takes in common with
* gnc_tree_view_add_text_column() behave the same as there. In
@@ -206,7 +206,6 @@
GtkTreeModel *combo_tree_model,
gint combo_model_text_column,
GtkTreeIterCompareFunc column_sort_fn);
-#endif
/** This function adds a new numeric column to a GncTreeView base
* view. It takes all the parameters necessary to hook a
Modified: gnucash/branches/remove-group2/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gncmod-gnome-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gncmod-gnome-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,14 +1,13 @@
/*********************************************************************
* gncmod-gnome-utils.c
- * module definition/initialization for the gnome utilities
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the gnome utilities
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -25,32 +24,26 @@
#include "gnc-druid-provider-multifile-gnome.h"
/* version of the gnc module system interface we require */
-int libgncmod_gnome_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_gnome_utils_LTX_gnc_module_current = 0;
-int libgncmod_gnome_utils_LTX_gnc_module_revision = 0;
-int libgncmod_gnome_utils_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_gnome_utils_LTX_gnc_module_path(void);
-char *libgncmod_gnome_utils_LTX_gnc_module_description(void);
-int libgncmod_gnome_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_gnome_utils_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_gnome_utils_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/gnome-utils");
}
-char *
-libgncmod_gnome_utils_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Utilities for using Gnome/Gtk with GnuCash");
}
static void
-lmod(char * mn)
+lmod(char * mn)
{
char * form = g_strdup_printf("(use-modules %s)\n", mn);
scm_c_eval_string(form);
@@ -60,7 +53,7 @@
extern SCM scm_init_sw_gnome_utils_module(void);
int
-libgncmod_gnome_utils_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
return FALSE;
@@ -84,7 +77,7 @@
scm_init_sw_gnome_utils_module();
lmod("(sw_gnome_utils)");
lmod("(gnucash gnome-utils)");
-
+
/* Initialize the options-ui database */
if (refcount == 0) {
gnc_options_ui_initialize ();
@@ -101,7 +94,7 @@
}
int
-libgncmod_gnome_utils_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/gnome-utils/gnctreemodelsort.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/gnctreemodelsort.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/gnctreemodelsort.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -58,7 +58,6 @@
#include "gtk/gtktreednd.h" //CAS: path changed
//#include "gtk/gtkalias.h" //CAS: header commented
#include <glib/gi18n.h> //CAS: header added
-#include "gtk-compat.h" //CAS: header added
#define P_(x) _(x) //CAS: macro added
typedef struct _SortElt SortElt;
Property changes on: gnucash/branches/remove-group2/src/gnome-utils/test
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.deps
.libs
test-link-module
test-gnc-dialog
test-gnc-recurrence
semantic.cache
TAGS
*.exe
+ Makefile
Makefile.in
.deps
.libs
test-link-module
test-gnc-dialog
test-gnc-recurrence
test-sx
semantic.cache
TAGS
*.exe
Modified: gnucash/branches/remove-group2/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,5 @@
TESTS = \
- test-link-module test-load-module
+ test-link-module test-load-module test-sx
# The following tests are nice, but have absolutely no place in an
# automated testing system.
@@ -9,56 +9,53 @@
##lib_LTLIBRARIES = libgncgnome.la
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/network-utils \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/lib/libqof/qof \
+ --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/file \
+ --library-dir ${top_builddir}/src/network-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
- test-link-module test-gnc-recurrence test-gnc-dialog
+check_PROGRAMS = \
+ test-link-module test-gnc-recurrence test-gnc-dialog test-sx
INCLUDES= \
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
+ -I${top_srcdir}/src/engine/test-core \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
+ -I${top_srcdir}/src/test-core \
${GLIB_CFLAGS} ${GUILE_INCS} ${GNOME_CFLAGS} ${GLADE_CFLAGS} ${QOF_CFLAGS}
-test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
-test_gnc_recurrence_LDADD = ${GNOME_LIBS} \
+LDADD = \
+ ${GNOME_LIBS} \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
- ${top_builddir}/src/engine/libgncmod-engine.la
+ ${top_builddir}/src/engine/libgncmod-engine.la \
+ ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
+ ${top_builddir}/src/test-core/libgncmod-test.la
-test_gnc_dialog_LDADD = ${GNOME_LIBS} \
- ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
- ${top_builddir}/src/engine/libgncmod-engine.la
+test_gnc_recurrence_SOURCES=test-gnc-recurrence.c
test_link_module_SOURCES=test-link-module.c
-test_link_module_LDADD= \
+test_link_module_LDADD = \
${GUILE_LIBS} \
- ${top_builddir}/src/gnc-module/libgncmodule.la
+ ${top_builddir}/src/gnc-module/libgnc-module.la
EXTRA_DIST = \
test-load-module
testit:
libtool --mode execute gdb test-link-module
-
-
Copied: gnucash/branches/remove-group2/src/gnome-utils/test/test-sx.c (from rev 15563, gnucash/trunk/src/gnome-utils/test/test-sx.c)
Modified: gnucash/branches/remove-group2/src/gnome-utils/window-main-summarybar.c
===================================================================
--- gnucash/branches/remove-group2/src/gnome-utils/window-main-summarybar.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gnome-utils/window-main-summarybar.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -309,13 +309,13 @@
switch(total_mode)
{
case TOTAL_CURR_TOTAL:
- label_str = g_strdup_printf( _("%s, total:"), mnemonic );
+ label_str = g_strdup_printf( _("%s, Total:"), mnemonic );
break;
case TOTAL_NON_CURR_TOTAL:
- label_str = g_strdup_printf( _("%s, non currency commodities total:"), mnemonic );
+ label_str = g_strdup_printf( _("%s, Non Currency Commodities Total:"), mnemonic );
break;
case TOTAL_GRAND_TOTAL:
- label_str = g_strdup_printf( _("%s, grand total:"), mnemonic );
+ label_str = g_strdup_printf( _("%s, Grand Total:"), mnemonic );
break;
case TOTAL_SINGLE:
default:
Deleted: gnucash/branches/remove-group2/src/gtk-compat.h
===================================================================
--- gnucash/branches/remove-group2/src/gtk-compat.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/gtk-compat.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,29 +0,0 @@
-/*
- * gtk-compat.h - GTK version compatability mappings
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef HAVE_GTK26
-#define gtk_action_set_sensitive(action, xxx) \
- g_object_set((action), "sensitive", (xxx), NULL)
-#define gtk_action_set_visible(action, xxx) \
- g_object_set((action), "visible", (xxx), NULL)
-
-#define GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID -2
-#endif
-
Modified: gnucash/branches/remove-group2/src/import-export/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,12 +39,14 @@
import-utilities.h \
gnc-import-format-gnome.h
+libgncmod_generic_import_la_LDFLAGS = -avoid-version
+
libgncmod_generic_import_la_LIBADD = \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GNOME_LIBS} \
${GLADE_LIBS} \
${QOF_LIBS} \
@@ -75,3 +77,5 @@
EXTRA_DIST = \
$(glade_DATA) \
generic-import-design.txt
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.i-e\"
Modified: gnucash/branches/remove-group2/src/import-export/binary-import/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/binary-import/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/binary-import/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,5 +1,4 @@
SUBDIRS = . test
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-binary-import.la
@@ -29,7 +28,7 @@
druid-commodity.h
libgncmod_binary_import_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
Modified: gnucash/branches/remove-group2/src/import-export/binary-import/binary-import.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/binary-import/binary-import.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/binary-import/binary-import.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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="commodity_druid">
Modified: gnucash/branches/remove-group2/src/import-export/binary-import/gncmod-binary-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/binary-import/gncmod-binary-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/binary-import/gncmod-binary-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,13 +1,12 @@
/*********************************************************************
* gncmod-binary-import.c
* module definition/initialization for importing gnucash binary files
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-hooks.h"
@@ -16,32 +15,26 @@
#include "druid-commodity.h"
/* version of the gnc module system interface we require */
-int libgncmod_binary_import_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_binary_import_LTX_gnc_module_current = 0;
-int libgncmod_binary_import_LTX_gnc_module_revision = 0;
-int libgncmod_binary_import_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_binary_import_LTX_gnc_module_path(void);
-char *libgncmod_binary_import_LTX_gnc_module_description(void);
-int libgncmod_binary_import_LTX_gnc_module_init(int refcount);
-int libgncmod_binary_import_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_binary_import_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/import-export/binary-import");
}
-char *
-libgncmod_binary_import_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Utilities importing GnuCash binary files");
}
int
-libgncmod_binary_import_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
return FALSE;
@@ -64,6 +57,6 @@
}
int
-libgncmod_binary_import_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/import-export/csv/gnc-csv2glist.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/csv/gnc-csv2glist.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/csv/gnc-csv2glist.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -23,7 +23,7 @@
//#include "config.h"
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <string.h>
#include <sys/types.h>
#include <fcntl.h>
@@ -175,7 +175,7 @@
printf("usage:\n\tcsv2glist fname.csv\n");
}
- fp = fopen (argv[1], "r");
+ fp = g_fopen (argv[1], "r");
if (fp == NULL) return 1;
parsed_csv = gnc_csv_parse(fp);
Modified: gnucash/branches/remove-group2/src/import-export/generic-import.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/generic-import.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/generic-import.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -19,6 +19,7 @@
<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">True</property>
<signal name="map" handler="gnc_ui_generic_account_picker_map_cb"/>
@@ -93,6 +94,10 @@
<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>
@@ -114,6 +119,10 @@
<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>
@@ -159,6 +168,7 @@
<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">True</property>
<signal name="close" handler="on_matcher_cancel_clicked"/>
@@ -244,6 +254,10 @@
<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>
@@ -269,6 +283,8 @@
<property name="reorderable">True</property>
<property name="enable_search">False</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -308,6 +324,7 @@
<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">True</property>
<signal name="close" handler="on_matcher_cancel_clicked"/>
@@ -377,6 +394,10 @@
<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>
@@ -417,6 +438,10 @@
<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>
</child>
@@ -432,6 +457,10 @@
<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>
</child>
@@ -447,6 +476,10 @@
<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>
</child>
@@ -462,6 +495,10 @@
<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>
</child>
@@ -477,6 +514,10 @@
<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>
</child>
@@ -492,6 +533,10 @@
<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>
</child>
@@ -507,6 +552,10 @@
<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>
</child>
</widget>
@@ -537,6 +586,10 @@
<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>
@@ -569,6 +622,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -635,6 +689,10 @@
<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>
@@ -660,6 +718,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -683,6 +743,10 @@
<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>
@@ -708,6 +772,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -743,6 +809,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -803,6 +870,10 @@
<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>
@@ -830,6 +901,10 @@
<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>
@@ -877,6 +952,10 @@
<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="type">label_item</property>
@@ -906,6 +985,7 @@
<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="GtkTable" id="matcher_prefs">
@@ -975,6 +1055,10 @@
<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="left_attach">0</property>
@@ -1092,6 +1176,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/atm_fee_threshold</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="left_attach">0</property>
@@ -1118,6 +1206,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/auto_clear_threshold</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="left_attach">0</property>
@@ -1144,6 +1236,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/auto_add_threshold</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="left_attach">0</property>
@@ -1170,6 +1266,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/match_threshold</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="left_attach">0</property>
@@ -1223,6 +1323,7 @@
<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">True</property>
<signal name="close" handler="on_matcher_help_close_clicked" last_modification_time="Tue, 22 Nov 2005 08:11:11 GMT"/>
@@ -1281,6 +1382,10 @@
<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="left_attach">0</property>
@@ -1418,6 +1523,10 @@
<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="left_attach">0</property>
@@ -1442,6 +1551,10 @@
<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="left_attach">0</property>
@@ -1466,6 +1579,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</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="left_attach">0</property>
@@ -1490,6 +1607,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</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="left_attach">0</property>
@@ -1514,6 +1635,10 @@
<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="left_attach">1</property>
@@ -1538,6 +1663,10 @@
<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="left_attach">1</property>
@@ -1562,6 +1691,10 @@
<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="left_attach">1</property>
@@ -1586,6 +1719,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</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="left_attach">0</property>
@@ -1653,6 +1790,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</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>
</child>
</widget>
@@ -1685,6 +1826,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</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>
</child>
</widget>
@@ -1717,6 +1862,10 @@
<property name="yalign">0.5</property>
<property name="xpad">12</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>
</child>
</widget>
Modified: gnucash/branches/remove-group2/src/import-export/gncmod-generic-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/gncmod-generic-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/gncmod-generic-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,7 +5,7 @@
*/
#include "config.h"
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-import-format-gnome.h"
@@ -14,34 +14,29 @@
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_generic_import_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_generic_import_LTX_gnc_module_current = 0;
-int libgncmod_generic_import_LTX_gnc_module_revision = 0;
-int libgncmod_generic_import_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
/*static GNCModule engine; NOTUSED */
-/* forward references */
-char *libgncmod_generic_import_LTX_gnc_module_path(void);
-char *libgncmod_generic_import_LTX_gnc_module_description(void);
-int libgncmod_generic_import_LTX_gnc_module_init(int refcount);
-int libgncmod_generic_import_LTX_gnc_module_end(int refcount);
-
-
char *
-libgncmod_generic_import_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/import-export");
}
+
char *
-libgncmod_generic_import_LTX_gnc_module_description(void)
+gnc_module_description(void)
{
return g_strdup("Gnome GUI and C code for the generic import functions");
}
+
int
-libgncmod_generic_import_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
if(!gnc_module_load("gnucash/engine", 0))
{
@@ -67,7 +62,7 @@
}
int
-libgncmod_generic_import_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -42,14 +42,16 @@
hbci-interaction.h \
hbci-interactionP.h
+libgncmod_hbci_la_LDFLAGS = -avoid-version
+
libgncmod_hbci_la_LIBADD = \
${top_builddir}/src/import-export/libgncmod-generic-import.la \
- ${top_builddir}/src/gnome/libgncgnome.la \
+ ${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GNOME_LIBS} \
${GLADE_LIBS} \
${QOF_LIBS} \
@@ -85,3 +87,5 @@
gnc-plugin-hbci-ui.xml
EXTRA_DIST = ${gncscm_DATA} ${libgncmod_hbci_la_empty} ${ui_DATA}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.hbci\"
Modified: gnucash/branches/remove-group2/src/import-export/hbci/dialog-hbcitrans.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/dialog-hbcitrans.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/dialog-hbcitrans.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -43,7 +43,6 @@
#endif
#include <iconv.h>
-#include "gtk-compat.h"
#include "dialog-utils.h"
#include "gnc-glib-utils.h"
#include "gnc-ui.h"
@@ -366,10 +365,13 @@
break;
case SINGLE_DEBITNOTE:
gtk_label_set_text (GTK_LABEL (heading_label),
- /* Translators: Strings from this file are really only
- * needed inside Germany (HBCI is not supported anywhere
- * else). You may safely ignore strings from the
- * import-export/hbci subdirectory in other countries. */
+ /* Translators: Strings from this file are needed only in
+ * countries that have one of aqbanking's Online Banking
+ * techniques available. This is 'OFX DirectConnect'
+ * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet'
+ * (Switzerland). If none of these techniques are available
+ * in your country, you may safely ignore strings from the
+ * import-export/hbci subdirectory. */
_("Enter an Online Direct Debit Note"));
gtk_label_set_text (GTK_LABEL (recp_name_heading),
Modified: gnucash/branches/remove-group2/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/druid-hbci-initial.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/druid-hbci-initial.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,9 +25,12 @@
#include <gnome.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
#include <fcntl.h>
#include <unistd.h>
@@ -357,9 +360,9 @@
if (hbci_acc) {
old_value = g_hash_table_lookup (info->gnc_hash, hbci_acc);
- printf("on_accountlist_select_row: Selected hbci_acc id %s; old_value %p \n",
+ /* printf("on_accountlist_select_row: Selected hbci_acc id %s; old_value %p \n",
AB_Account_GetAccountNumber(hbci_acc),
- old_value);
+ old_value); */
longname = gnc_hbci_account_longname(hbci_acc);
if (AB_Account_GetCurrency (hbci_acc) &&
@@ -420,10 +423,10 @@
/* This is the point where we look for and start an external
application shipped with aqhbci that contains the setup druid for
- HBCI related stuff. It requires qt (but not kde). This
+ AqBanking related stuff. It requires qt (but not kde). This
application contains the very verbose step-by-step setup wizard
- for the HBCI account, and the application is shared with other
- AqBanking-based financial managers that offer the HBCI features
+ for the AqBanking account, and the application is shared with other
+ AqBanking-based financial managers that offer the AqBanking features
(e.g. KMyMoney). See gnucash-devel discussion here
https://lists.gnucash.org/pipermail/gnucash-devel/2004-December/012351.html
*/
@@ -530,7 +533,7 @@
if (wizard_exists) {
/* Really check whether the file exists */
- int fd = open( wizard_path, O_RDONLY );
+ int fd = g_open( wizard_path, O_RDONLY, 0 );
if ( fd == -1)
wizard_exists = FALSE;
else
@@ -540,6 +543,20 @@
druid_disable_next_button(info);
/* AB_Banking_DeactivateProvider(banking, backend_name); */
if (wizard_exists) {
+#ifdef G_OS_WIN32
+ /* FIXME: Use something different than fork() for the child
+ process here. See src/backend/file/io-gncxml-v2.c that has
+ the same problem. */
+ gnc_error_dialog
+ (info->window,
+ _("The Windows version of GnuCash does not (yet) have the "
+ "capability to start the external program \"%s Setup Wizard\". "
+ "Please start it yourself from the location \"%s\" "
+ "before you continue."),
+ backend_name, wizard_path);
+ res = 0;
+#else
+ /* Normal non-Windows operating system */
int wait_status;
int wait_result = 0;
@@ -557,13 +574,13 @@
pid = fork();
switch (pid) {
case -1:
- printf("Fork call failed. Cannot start AqHBCI setup wizard.");
+ printf("Fork call failed. Cannot start AqBanking setup wizard.");
res = -1;
AB_Banking_Init (info->api);
break;
case 0: /* child */
execl(wizard_path, wizard_path, NULL);
- printf("Fork call failed. Cannot start AqHBCI setup wizard.");
+ printf("Fork call failed. Cannot start AqBanking setup wizard.");
_exit(0);
default: /* parent */
res = 0;
@@ -579,6 +596,7 @@
AB_Banking_Init (info->api);
}
}
+#endif /* G_OS_WIN32 */
if (res == 0) {
#ifndef AQBANKING_WIZARD_ALLBACKENDS
@@ -595,13 +613,10 @@
printf("on_aqhbci_button: Oops, aqhbci wizard return nonzero value: %d. The called program was \"%s\".\n", res, wizard_path);
gnc_error_dialog
(info->window,
- /* Each of the %s is the name of the backend, e.g. "aqhbci". */
- _("The external program \"%s Setup Wizard\" returned a nonzero "
- "exit code which means it has not been finished successfully. "
- "The further HBCI setup can only be finished if the %s "
- "Setup Wizard is run successfully. Please try to start and "
- "successfully finish the %s Setup Wizard program again."),
- backend_name, backend_name, backend_name);
+ _("The external program \"AqBanking Setup Wizard\" failed "
+ "to run successfully. Online Banking can only be setup "
+ "if this wizard has run successfully. "
+ "Please try running the \"AqBanking Setup Wizard\" again."));
druid_disable_next_button(info);
}
} else {
@@ -609,10 +624,12 @@
gnc_error_dialog
(info->window,
/* Each of the %s is the name of the backend, e.g. "aqhbci". */
- _("The external program \"%s Setup Wizard\" has not been found. \n\n"
- "The package aqbanking is supposed to install the program "
- "\"%s-qt3-wizard\". Please check your installation of aqbanking."),
- backend_name, backend_name);
+ _("The external program \"AqBanking Setup Wizard\" has not "
+ "been found. \n\n"
+ "The aqbanking package should include the "
+ "program \"qt3-wizard\". Please check your installation to "
+ "ensure this program is present. On some distributions this "
+ "may require installing additional packages."));
druid_disable_next_button(info);
}
g_free (backend_name);
@@ -672,14 +689,14 @@
g_object_unref(info->accountstore);
renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("HBCI account name"),
+ column = gtk_tree_view_column_new_with_attributes(_("Online Banking Account Name"),
renderer,
"text", ACCOUNT_LIST_COL_HBCI_NAME,
NULL);
gtk_tree_view_append_column(info->accountview, column);
renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes(_("GnuCash account name"),
+ column = gtk_tree_view_column_new_with_attributes(_("GnuCash Account Name"),
renderer,
"text", ACCOUNT_LIST_COL_GNC_NAME,
NULL);
Modified: gnucash/branches/remove-group2/src/import-export/hbci/glade/hbci.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/glade/hbci.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/glade/hbci.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -6,7 +6,7 @@
<widget class="GtkWindow" id="HBCI Init Druid">
<property name="visible">True</property>
- <property name="title" translatable="yes">Initial HBCI Setup</property>
+ <property name="title" translatable="yes">Initial Online Banking Setup</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -19,6 +19,7 @@
<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="hbci_init_druid">
@@ -31,21 +32,21 @@
<widget class="GnomeDruidPageEdge" id="druidpagestart1">
<property name="visible">True</property>
<property name="position">GNOME_EDGE_START</property>
- <property name="title" translatable="yes">Initial HBCI Setup</property>
- <property name="text" translatable="yes">This druid helps you setting up your HBCI connection with your bank.
+ <property name="title" translatable="yes">Initial Online Banking Setup</property>
+ <property name="text" translatable="yes">This druid helps you setting up your Online Banking connection with your bank.
-You first need to apply for HBCI access at your bank. If your bank decides to grant you HBCI access, the bank will send you a letter, containing
+You first need to apply for Online Banking access at your bank. If your bank decides to grant you electronic access, they will send you a letter containing
* The bank code of your bank
* The user ID that identifies you to your bank
-* The Internet address of your bank's HBCI server
-* Information about the cryptographic public key of your bank ("Ini-Letter").
+* The Internet address of your bank's Online Banking server
+* For HBCI Online Banking, information about the cryptographic public key of your bank ("Ini-Letter").
This information will be needed in the following. Press "Forward" now.
-NOTE: NO WARRANTIES FOR ANYTHING. Some banks are running a poorly implemented HBCI. You should not rely on time-critical transfers through HBCI, since sometimes your bank does not give you correct feedback when a transfer has been rejected.
+NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online Banking server. You should not rely on time-critical transfers through Online Banking, because sometimes the bank does not give you correct feedback when a transfer is rejected.
-Press "Cancel" if you do not wish to setup any HBCI connection now.</property>
+Press "Cancel" if you do not wish to setup any Online Banking connection now.</property>
<property name="title_color">#ffffffffffff</property>
<property name="text_color">#000000000000</property>
<property name="background_color">#9999bfbf9999</property>
@@ -57,7 +58,7 @@
<child>
<widget class="GnomeDruidPageStandard" id="configfile_page">
<property name="visible">True</property>
- <property name="title" translatable="yes">Start AqHBCI Wizard</property>
+ <property name="title" translatable="yes">Start Online Banking Wizard</property>
<property name="title_foreground">#ffffffffffff</property>
<property name="background">#9999bfbf9999</property>
<property name="logo_background">#ffffffffffff</property>
@@ -85,7 +86,7 @@
<child>
<widget class="GtkLabel" id="label8877441">
<property name="visible">True</property>
- <property name="label" translatable="yes">The Setup of your HBCI connection is handled by the external program "AqHBCI Setup Wizard". Please press the button below to start this program. </property>
+ <property name="label" translatable="yes">The Setup of your Online Banking connection is handled by the external program "AqBanking Setup Wizard". Please press the button below to start this program. </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -95,6 +96,10 @@
<property name="yalign">0.5</property>
<property name="xpad">10</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>
@@ -114,7 +119,7 @@
<widget class="GtkButton" id="aqhbci_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Start AqHBCI Wizard</property>
+ <property name="label" translatable="yes">Start AqBanking Wizard</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -142,7 +147,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Start AqHBCI Setup Wizard</property>
+ <property name="label" translatable="yes">Start AqBanking Setup Wizard</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -152,6 +157,10 @@
<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="type">label_item</property>
@@ -172,7 +181,7 @@
<child>
<widget class="GnomeDruidPageStandard" id="account_match_page">
<property name="visible">True</property>
- <property name="title" translatable="yes">Match HBCI accounts with GnuCash accounts</property>
+ <property name="title" translatable="yes">Match Online Banking accounts with GnuCash accounts</property>
<property name="title_foreground">#ffffffffffff</property>
<property name="background">#9999bfbf9999</property>
<property name="logo_background">#ffffffffffff</property>
@@ -207,6 +216,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -220,7 +231,7 @@
<child>
<widget class="GtkLabel" id="label828">
<property name="visible">True</property>
- <property name="label" translatable="yes">Click on the line of a HBCI account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching.</property>
+ <property name="label" translatable="yes">Click on the line of an Online Banking account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -230,6 +241,10 @@
<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>
@@ -253,10 +268,10 @@
<widget class="GnomeDruidPageEdge" id="initial_finish_page">
<property name="visible">True</property>
<property name="position">GNOME_EDGE_FINISH</property>
- <property name="title" translatable="yes">HBCI Setup Finished</property>
- <property name="text" translatable="yes">Now the setup for all HBCI accounts that are matching to a GnuCash account is finished. You can now invoke HBCI actions on those accounts.
+ <property name="title" translatable="yes">Online Banking Setup Finished</property>
+ <property name="text" translatable="yes">The setup for matching Online Banking accounts to GnuCash accounts is now finished. You can now invoke Online Banking actions on those accounts.
-If you want to add another HBCI bank, user, or account, you can start this druid again anytime.
+If you want to add another bank, user, or account, you can start this druid again anytime.
Press "Apply" now.</property>
<property name="title_color">#ffffffffffff</property>
@@ -284,6 +299,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -382,6 +398,10 @@
<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>
@@ -423,6 +443,10 @@
<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>
@@ -485,6 +509,10 @@
<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="left_attach">0</property>
@@ -530,6 +558,10 @@
<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="left_attach">2</property>
@@ -575,6 +607,10 @@
<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="left_attach">0</property>
@@ -599,6 +635,10 @@
<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="left_attach">0</property>
@@ -623,6 +663,10 @@
<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="left_attach">0</property>
@@ -647,6 +691,10 @@
<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="left_attach">0</property>
@@ -684,6 +732,10 @@
<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="left_attach">0</property>
@@ -708,6 +760,10 @@
<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="left_attach">0</property>
@@ -732,6 +788,10 @@
<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="left_attach">0</property>
@@ -756,6 +816,10 @@
<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="left_attach">0</property>
@@ -780,6 +844,10 @@
<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="left_attach">0</property>
@@ -804,6 +872,10 @@
<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="left_attach">0</property>
@@ -828,6 +900,10 @@
<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="left_attach">2</property>
@@ -852,6 +928,10 @@
<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="left_attach">2</property>
@@ -876,6 +956,10 @@
<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="left_attach">2</property>
@@ -900,6 +984,10 @@
<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="left_attach">2</property>
@@ -1013,6 +1101,10 @@
<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>
@@ -1113,6 +1205,10 @@
<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>
@@ -1169,6 +1265,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<signal name="select_child" handler="on_template_list_select_child"/>
<signal name="selection_changed" handler="on_template_list_selection_changed"/>
<signal name="unselect_child" handler="on_template_list_unselect_child"/>
@@ -1198,6 +1296,10 @@
<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>
@@ -1347,7 +1449,7 @@
<widget class="GtkDialog" id="HBCI_connection_dialog">
<property name="border_width">6</property>
<property name="visible">True</property>
- <property name="title" translatable="yes">HBCI Connection Window</property>
+ <property name="title" translatable="yes">Online Banking Connection Window</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -1360,6 +1462,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1427,6 +1530,10 @@
<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>
@@ -1469,6 +1576,10 @@
<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="left_attach">0</property>
@@ -1493,6 +1604,10 @@
<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="left_attach">0</property>
@@ -1517,6 +1632,10 @@
<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="left_attach">0</property>
@@ -1534,6 +1653,7 @@
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
<property name="pulse_step">0.10000000149</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1609,6 +1729,10 @@
<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>
@@ -1630,6 +1754,10 @@
<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>
@@ -1729,6 +1857,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1795,6 +1924,10 @@
<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>
@@ -1816,6 +1949,10 @@
<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>
@@ -1846,6 +1983,10 @@
<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="left_attach">0</property>
@@ -1889,6 +2030,10 @@
<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="left_attach">0</property>
@@ -1913,6 +2058,10 @@
<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="left_attach">0</property>
@@ -2081,7 +2230,7 @@
<widget class="GtkDialog" id="HBCI_version_dialog">
<property name="visible">True</property>
- <property name="title" translatable="yes">HBCI Version</property>
+ <property name="title" translatable="yes">Online Banking Version</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -2092,6 +2241,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -2148,7 +2298,7 @@
<child>
<widget class="GtkLabel" id="label8877436">
<property name="visible">True</property>
- <property name="label" translatable="yes">Choose a HBCI Version to use with the selected bank:</property>
+ <property name="label" translatable="yes">Choose an Online Banking Version to use with the selected bank:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -2158,6 +2308,10 @@
<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>
@@ -2196,6 +2350,10 @@
<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>
</child>
</widget>
@@ -2231,6 +2389,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -2298,6 +2457,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/import-export/hbci/glade/hbcipass.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/glade/hbcipass.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/glade/hbcipass.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -78,6 +79,10 @@
<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>
@@ -106,6 +111,10 @@
<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>
@@ -157,6 +166,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -218,6 +228,10 @@
<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>
@@ -278,6 +292,10 @@
<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="left_attach">0</property>
@@ -323,6 +341,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/import-export/hbci/glade/hbciprefs.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/glade/hbciprefs.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/glade/hbciprefs.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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="GtkTable" id="hbci_prefs">
@@ -29,7 +30,7 @@
<child>
<widget class="GtkLabel" id="label55">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>HBCI</b></property>
+ <property name="label" translatable="yes"><b>Online Banking</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -39,6 +40,10 @@
<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="left_attach">0</property>
@@ -53,7 +58,7 @@
<child>
<widget class="GtkCheckButton" id="gconf/dialogs/import/hbci/remember_pin">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Remember the PIN for HBCI in memory during a session.</property>
+ <property name="tooltip" translatable="yes">Remember the Online Banking PIN in memory during a session.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Remember _PIN</property>
<property name="use_underline">True</property>
@@ -77,7 +82,7 @@
<child>
<widget class="GtkCheckButton" id="gconf/dialogs/import/hbci/verbose_debug">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Activate verbose debug messages for HBCI Online Banking.</property>
+ <property name="tooltip" translatable="yes">Activate verbose debug messages for Online Banking.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Verbose debug messages</property>
<property name="use_underline">True</property>
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,9 +25,10 @@
*/
#include "config.h"
-#include <glib.h>
+#include "gnc-file-aqb-import.h"
+
#include <glib/gi18n.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <string.h>
#include <sys/time.h>
#include <fcntl.h>
@@ -35,7 +36,6 @@
#include <aqbanking/version.h>
#include <aqbanking/banking.h>
#include <aqbanking/imexporter.h>
-#include <aqbanking/jobsingledebitnote.h>
#include "gnc-ui.h"
#include "qof.h"
@@ -49,90 +49,11 @@
#include "gnc-hbci-utils.h"
#include "gnc-hbci-gettrans.h"
#include "hbci-interaction.h"
-#include "dialog-hbcitrans.h"
-#include "import-main-matcher.h"
-#include "import-account-matcher.h"
-#include "gnc-hbci-gettrans.h"
-#include "gnc-file-aqb-import.h"
-
static QofLogModule log_module = GNC_MOD_IMPORT;
-/* Callback declarations */
-static const AB_TRANSACTION *
-translist_cb (const AB_TRANSACTION *element, void *user_data);
-static AB_IMEXPORTER_ACCOUNTINFO *
-accountinfolist_cb(AB_IMEXPORTER_ACCOUNTINFO *element, void *user_data);
-static gboolean
-gnc_hbci_multijob_execute(GtkWidget *parent, AB_BANKING *api,
- GList *job_list, GNCInteractor *interactor);
-static void multijob_cb (gpointer element, gpointer user_data);
-static void delpending_cb (gpointer element, gpointer user_data);
-struct import_data
-{
- Account *gnc_acc;
- GNCImportMainMatcher *importer_generic;
- AB_BANKING *ab;
- AB_ACCOUNT *hbci_account;
- GList *job_list;
- gboolean execute_transactions;
-};
-
-
-/* If aqbanking is older than 1.9.7, use our own copies of these
- foreach functions */
-#if ((AQBANKING_VERSION_MAJOR == 1) && \
- ((AQBANKING_VERSION_MINOR < 9) || \
- ((AQBANKING_VERSION_MINOR == 9) && \
- ((AQBANKING_VERSION_PATCHLEVEL < 7)))))
-static AB_IMEXPORTER_ACCOUNTINFO *
-AB_ImExporterContext_AccountInfoForEach(AB_IMEXPORTER_CONTEXT *iec,
- AB_IMEXPORTER_ACCOUNTINFO *
- (* func)(AB_IMEXPORTER_ACCOUNTINFO *element,
- void *user_data),
- void* user_data)
-{
- AB_IMEXPORTER_ACCOUNTINFO *it;
- AB_IMEXPORTER_ACCOUNTINFO *retval;
- g_assert(iec);
-
- it = AB_ImExporterContext_GetFirstAccountInfo (iec);
- while (it) {
- retval = func(it, user_data);
- if (retval) {
- return retval;
- }
- it = AB_ImExporterContext_GetNextAccountInfo (iec);
- }
- return 0;
-
-}
-static const AB_TRANSACTION *
-AB_ImExporterAccountInfo_TransactionsForEach(AB_IMEXPORTER_ACCOUNTINFO *iea,
- const AB_TRANSACTION *
- (* func)(const AB_TRANSACTION *element,
- void *user_data),
- void* user_data)
-{
- const AB_TRANSACTION *it;
- const AB_TRANSACTION *retval;
- g_assert(iea);
-
- it = AB_ImExporterAccountInfo_GetFirstTransaction (iea);
- while (it) {
- retval = func(it, user_data);
- if (retval) {
- return retval;
- }
- it = AB_ImExporterAccountInfo_GetNextTransaction (iea);
- }
- return 0;
-}
-#endif /* aqbanking < 1.9.7 */
-
-
/* See aqbanking-1.6.0beta/src/tools/aqbanking-tool/import.c for hints
on how to program aqbanking. */
@@ -149,11 +70,10 @@
char *default_dir;
int dtaus_fd;
- /* qof_log_check(MOD_IMPORT, QOF_LOG_TRACE); */
DEBUG("gnc_file_dtaus_import(): Begin...\n");
default_dir = gnc_get_default_directory(GCONF_SECTION);
- selected_filename = gnc_file_dialog(_("Select an DTAUS file to process"),
+ selected_filename = gnc_file_dialog(_("Select a file to import"),
NULL,
default_dir,
GNC_FILE_DIALOG_IMPORT);
@@ -169,11 +89,12 @@
DEBUG("Filename found: %s",selected_filename);
DEBUG("Opening selected file");
- dtaus_fd = open(selected_filename, O_RDONLY);
+ dtaus_fd = g_open(selected_filename, O_RDONLY, 0);
if (dtaus_fd == -1) {
DEBUG("Could not open file %s", selected_filename);
return;
}
+ g_free(selected_filename);
{
int result;
@@ -258,45 +179,41 @@
{
/* Now get all accountinfos */
- struct import_data data;
GNCImportMainMatcher *importer_generic_gui;
GtkWidget *parent = NULL;
gboolean successful = FALSE;
+ GList *ab_job_list;
/* Create importer GUI */
importer_generic_gui = gnc_gen_trans_list_new(parent, NULL, TRUE, 14);
- data.importer_generic = importer_generic_gui;
- data.ab = ab;
- data.job_list = NULL;
- data.execute_transactions = execute_transactions;
- /* Iterate through all accounts */
- AB_ImExporterContext_AccountInfoForEach(ctx, accountinfolist_cb, &data);
- /* all accounts finished. */
+ /* Import the transactions from the ctx into gnucash. */
+ ab_job_list = gnc_hbci_import_ctx(ab, ctx, importer_generic_gui,
+ execute_transactions);
+ /* Finished importing. */
- /* that's it */
- g_free(selected_filename);
+ /* We clean up here. */
+ AB_ImExporterContext_free(ctx);
if (execute_transactions) {
- /* and run the gnucash importer. */
+ /* Wait for the gnucash importer to be finished (it is being
+ run anyway). */
result = gnc_gen_trans_list_run (importer_generic_gui);
if (result)
/* Execute these jobs now. This function already delete()s the
job. */
/* no parent so far; otherwise add this: GNCInteractor_reparent (interactor, parent); */
- successful = gnc_hbci_multijob_execute (parent, ab, data.job_list, interactor);
+ successful = gnc_hbci_multijob_execute (parent, ab, ab_job_list, interactor);
/* else */
/* Delete all jobs from queue in any case. */
- g_list_foreach (data.job_list, delpending_cb, ab);
+ gnc_hbci_clearqueue (ab, ab_job_list);
}
else {
successful = TRUE;
}
- /* We clean up here. */
- AB_ImExporterContext_free(ctx);
if (successful) {
/* If execution was not successful, leave the log window
still intact and open. */
@@ -308,177 +225,5 @@
}
}
-static AB_IMEXPORTER_ACCOUNTINFO *
-accountinfolist_cb(AB_IMEXPORTER_ACCOUNTINFO *accinfo, void *user_data) {
- Account *gnc_acc;
- struct import_data *data = user_data;
- const char *bank_code =
- AB_ImExporterAccountInfo_GetBankCode(accinfo);
- const char *account_number =
- AB_ImExporterAccountInfo_GetAccountNumber(accinfo);
- const char *account_name =
- AB_ImExporterAccountInfo_GetAccountName(accinfo);
- gchar *online_id = g_strconcat (bank_code, account_number, NULL);
-
- gnc_acc = gnc_import_select_account(NULL,
- online_id, 1, account_name, NULL,
- ACCT_TYPE_NONE, NULL, NULL);
- g_free(online_id);
- if (gnc_acc) {
- /* Store chosen gnucash account in callback data */
- data->gnc_acc = gnc_acc;
- if (data->execute_transactions) {
- /* Retrieve the aqbanking account that belongs to this gnucash
- account */
- data->hbci_account = gnc_hbci_get_hbci_acc (data->ab, gnc_acc);
- if (data->hbci_account == NULL) {
- gnc_error_dialog (NULL, _("No HBCI account found for this gnucash account. These transactions will not be executed by HBCI."));
- }
- }
- else {
- data->hbci_account = NULL;
- }
-
- /* Iterate through all transactions. */
- AB_ImExporterAccountInfo_TransactionsForEach (accinfo, translist_cb, data);
- /* all transactions finished. */
- }
- return NULL;
-}
-
-static const AB_TRANSACTION *
-translist_cb (const AB_TRANSACTION *element, void *user_data) {
- AB_JOB *job;
- AB_TRANSACTION *trans = (AB_TRANSACTION*)element;
- GtkWidget *parent = NULL;
- struct import_data *data = user_data;
- struct trans_list_data hbci_userdata;
-
- /* This callback in the hbci module will add the imported
- transaction to gnucash's importer. */
- hbci_userdata.gnc_acc = data->gnc_acc;
- hbci_userdata.importer_generic = data->importer_generic;
- /* The call will use "trans" only as const* */
- gnc_hbci_trans_list_cb((AB_TRANSACTION*) trans, &hbci_userdata);
-
- if (data->hbci_account) {
- /* NEW: The imported transaction has been imported into
- gnucash. Now also add it as a job to aqbanking. */
- AB_Transaction_SetLocalBankCode (trans,
- AB_Account_GetBankCode (data->hbci_account));
- AB_Transaction_SetLocalAccountNumber (trans, AB_Account_GetAccountNumber (data->hbci_account));
- AB_Transaction_SetLocalCountry (trans, "DE");
-
- job =
- gnc_hbci_trans_dialog_enqueue(trans, data->ab,
- data->hbci_account, SINGLE_DEBITNOTE);
-
- /* Check whether we really got a job */
- if (!job) {
- /* Oops, no job, probably not supported by bank. */
- if (gnc_verify_dialog
- (parent,
- FALSE,
- "%s",
- _("The backend found an error during the preparation "
- "of the job. It is not possible to execute this job. \n"
- "\n"
- "Most probable the bank does not support your chosen "
- "job or your HBCI account does not have the permission "
- "to execute this job. More error messages might be "
- "visible on your console log.\n"
- "\n"
- "Do you want to enter the job again?"))) {
- gnc_error_dialog (parent, "Sorry, not implemented yet.");
- }
- /* else
- break; */
- }
- data->job_list = g_list_append(data->job_list, job);
- }
-
- return NULL;
-}
-
-gboolean
-gnc_hbci_multijob_execute(GtkWidget *parent, AB_BANKING *api,
- GList *job_list, GNCInteractor *interactor)
-{
- gboolean successful;
- g_assert(api);
-
- successful = gnc_AB_BANKING_execute (parent, api, NULL, interactor);
-
- /*printf("dialog-hbcitrans: Ok, result of api_execute was %d.\n",
- successful);*/
-
- if (!successful) {
- /* AB_BANKING_executeOutbox failed. */
- gnc_error_dialog (GNCInteractor_dialog (interactor),
- "%s",
- _("Executing the HBCI outbox failed. Please check the log window."));
- GNCInteractor_show_nodelete(interactor);
-
- g_list_foreach (job_list, multijob_cb, GNCInteractor_dialog (interactor));
- }
- /* Watch out! The job *has* to be removed from the queue
- here because otherwise it might be executed again. */
- /* AB_Banking_DequeueJob(api, job); is done in the calling function. */
- return successful;
-}
-
-void multijob_cb (gpointer element, gpointer user_data)
-{
- AB_JOB *job = element;
- GtkWidget *parent = user_data;
-
- if ((AB_Job_GetStatus (job) == AB_Job_StatusPending) ||
- (AB_Job_GetStatus (job) == AB_Job_StatusError)) {
- /* There was some error in this job. */
- if (AB_Job_GetType (job) == AB_Job_TypeDebitNote) {
- const AB_TRANSACTION *h_trans =
- AB_JobSingleDebitNote_GetTransaction (job);
- gchar *descr_name = gnc_hbci_descr_tognc (h_trans);
- gchar *value =
- gnc_AB_VALUE_toReadableString (AB_Transaction_GetValue (h_trans));
- gchar *errortext;
- errortext =
- g_strdup_printf(_("A debit note has been refused by the bank. The refused debit note has the following data:\n"
- "Remote bank code: \"%s\"\n"
- "Remote account number: \"%s\"\n"
- "Description and remote name: \"%s\"\n"
- "Value: \"%s\"\n"),
- AB_Transaction_GetRemoteBankCode (h_trans),
- AB_Transaction_GetRemoteAccountNumber (h_trans),
- descr_name,
- value);
- printf ("%s", errortext);
- gnc_error_dialog (parent, "%s", errortext);
- g_free (errortext);
- g_free (descr_name);
- } else {
- gnc_error_dialog
- (parent, "%s",
- _("One of the jobs was sent to the bank successfully, but the "
- "bank is refusing to execute the job. Please check "
- "the log window for the exact error message of the "
- "bank. The line with the error message contains a "
- "code number that is greater than 9000.\n"
- "\n"
- "The job has been removed from the queue."));
- /* FIXME: Might make more useful user feedback here. */
- }
- }
-}
-
-void delpending_cb (gpointer element, gpointer user_data)
-{
- AB_JOB *job = element;
- AB_BANKING *ab = user_data;
-
- if (AB_Job_GetStatus (job) == AB_Job_StatusPending)
- AB_Banking_DelPendingJob(ab, job);
-}
-
/** @} */
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.h
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-file-aqb-import.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,27 +25,32 @@
#ifndef DTAUS_IMPORT_H
#define DTAUS_IMPORT_H
-/** The gnc_file_dtaus_import() routine will pop up a standard file
- * selection dialogue asking the user to pick an DTAUS file. If one
- * is selected then the DTAUS file is opened and read. Its contents
- * are merged into the existing session (if any). The current
- * session continues to remain open for editing.
+#include <glib.h>
+
+/** This routine will pop up a standard file selection dialog asking
+ * the user to pick a file to import. This file will be opened and
+ * read. Its contents will be imported into the current book, using
+ * the import matcher from import-main-matcher.h.
*
* @param aqbanking_importername The aqbanking importer module that
- * should be used. Possible values: "dtaus", "csv", "swift".
+ * should be used. Possible values: "dtaus", "csv", "swift", or more.
*
- * @param aqbanking_profilename In aqbanking, each importer has one or
- * more "profiles" that define the actual data fields that should be
- * used. Possible values for swift: "swift-mt940" or "swift-mt942",
+ * @param aqbanking_formatname In aqbanking, each importer has one or
+ * more data formats available which define the actual data
+ * fields that should be used. In aqbanking, such a different format
+ * is called a "profile".
+ * Possible values for swift: "swift-mt940" or "swift-mt942",
* but for all others: "default", or more precisely: Look into
* $datadir/aqbanking/imexporters and look into the "name" field of
* the foo.conf files.
*
- * @param execute_transactions If TRUE, import the transactions and
- * additionally send them as online jobs over aqbanking/HBCI. If
- * FALSE, simply import the transactions and that's it.
+ * @param exec_as_aqbanking_jobs If TRUE, additionally queue the
+ * imported transactions as online jobs over aqbanking/HBCI. If FALSE,
+ * just import the transactions and that's it.
*/
void gnc_file_aqbanking_import (const gchar *aqbanking_importername,
- const gchar *aqbanking_profilename,
- gboolean execute_transactions);
+ const gchar *aqbanking_formatname,
+ gboolean exec_as_aqbanking_jobs);
+
+
#endif
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-getbalance.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-getbalance.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-getbalance.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -261,16 +261,20 @@
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
"%s",
- /* Translators: Strings from this file are really only
- * needed inside Germany (HBCI is not supported anywhere
- * else). You may safely ignore strings from the
- * import-export/hbci subdirectory in other countries.
- */
- _("The downloaded HBCI Balance was zero.\n\n"
+ /* Translators: Strings from this file are needed only in
+ * countries that have one of aqbanking's Online Banking
+ * techniques available. This is 'OFX DirectConnect'
+ * (U.S. and others), 'HBCI' (in Germany), or 'YellowNet'
+ * (Switzerland). If none of these techniques are available
+ * in your country, you may safely ignore strings from the
+ * import-export/hbci subdirectory. */
+ _("The downloaded Online Banking Balance was zero.\n\n"
"Either this is the correct balance, or your bank does not "
- "support Balance download in this HBCI version. In the latter "
- "case you should choose a higher HBCI version number in the HBCI "
- "Setup. After that, try again to download the HBCI Balance."));
+ "support Balance download in this Online Banking version. "
+ "In the latter case you should choose a different "
+ "Online Banking version number in the Online Banking "
+ "(AqBanking or HBCI) Setup. After that, try again to "
+ "download the Online Banking Balance."));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(GTK_WIDGET(dialog));
dialogres = FALSE;
@@ -282,7 +286,7 @@
char *booked_str = gnc_AB_VALUE_toReadableString (booked_val);
char *message1 = g_strdup_printf
(
- _("Result of HBCI job: \n"
+ _("Result of Online Banking job: \n"
"Account booked balance is %s"),
booked_str);
char *message2 =
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-gettrans.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-gettrans.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-gettrans.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -204,7 +204,7 @@
GTK_MESSAGE_INFO,
GTK_BUTTONS_OK,
"%s",
- _("The HBCI import returned no transactions "
+ _("The Online Banking import returned no transactions "
"for the selected time period."));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(GTK_WIDGET(dialog));
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-transfer.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-transfer.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-transfer.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -137,7 +137,7 @@
"of the job. It is not possible to execute this job. \n"
"\n"
"Most probable the bank does not support your chosen "
- "job or your HBCI account does not have the permission "
+ "job or your Online Banking account does not have the permission "
"to execute this job. More error messages might be "
"visible on your console log.\n"
"\n"
@@ -247,12 +247,12 @@
switch (trans_type) {
case SINGLE_DEBITNOTE:
- gnc_xfer_dialog_set_title (transdialog, _("Online HBCI Direct Debit Note"));
+ gnc_xfer_dialog_set_title (transdialog, _("Online Banking Direct Debit Note"));
case SINGLE_INTERNAL_TRANSFER:
- gnc_xfer_dialog_set_title (transdialog, _("Online HBCI Bank-Internal Transfer"));
+ gnc_xfer_dialog_set_title (transdialog, _("Online Banking Bank-Internal Transfer"));
case SINGLE_TRANSFER:
default:
- gnc_xfer_dialog_set_title (transdialog, _("Online HBCI Transaction"));
+ gnc_xfer_dialog_set_title (transdialog, _("Online Banking Transaction"));
}
/* Amount */
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,7 +26,6 @@
#include <glib/gi18n.h>
#include <errno.h>
#include <iconv.h>
-#include <langinfo.h>
#include <gwenhywfar/directory.h>
#include <gwenhywfar/logger.h>
@@ -37,12 +36,19 @@
#include "qof.h"
#include "gnc-glib-utils.h"
+#include "import-main-matcher.h"
+#include "import-account-matcher.h"
+
#define AQBANKING_NOWARN_DEPRECATED
#include "gnc-hbci-utils.h"
#include "hbci-interaction.h"
+#include "gnc-hbci-gettrans.h"
+#include "dialog-hbcitrans.h"
#include <aqbanking/version.h>
+#include <aqbanking/jobsingledebitnote.h>
+
/* static short module = MOD_IMPORT; */
/* Globale variables for AB_BANKING caching. */
@@ -51,6 +57,59 @@
static GNCInteractor *gnc_hbci_inter = NULL;
+/* If aqbanking is older than 1.9.7, use our own copies of these
+ foreach functions */
+#if ((AQBANKING_VERSION_MAJOR == 1) && \
+ ((AQBANKING_VERSION_MINOR < 9) || \
+ ((AQBANKING_VERSION_MINOR == 9) && \
+ ((AQBANKING_VERSION_PATCHLEVEL < 7)))))
+static AB_IMEXPORTER_ACCOUNTINFO *
+AB_ImExporterContext_AccountInfoForEach(AB_IMEXPORTER_CONTEXT *iec,
+ AB_IMEXPORTER_ACCOUNTINFO *
+ (* func)(AB_IMEXPORTER_ACCOUNTINFO *element,
+ void *user_data),
+ void* user_data)
+{
+ AB_IMEXPORTER_ACCOUNTINFO *it;
+ AB_IMEXPORTER_ACCOUNTINFO *retval;
+ g_assert(iec);
+
+ it = AB_ImExporterContext_GetFirstAccountInfo (iec);
+ while (it) {
+ retval = func(it, user_data);
+ if (retval) {
+ return retval;
+ }
+ it = AB_ImExporterContext_GetNextAccountInfo (iec);
+ }
+ return 0;
+
+}
+static const AB_TRANSACTION *
+AB_ImExporterAccountInfo_TransactionsForEach(AB_IMEXPORTER_ACCOUNTINFO *iea,
+ const AB_TRANSACTION *
+ (* func)(const AB_TRANSACTION *element,
+ void *user_data),
+ void* user_data)
+{
+ const AB_TRANSACTION *it;
+ const AB_TRANSACTION *retval;
+ g_assert(iea);
+
+ it = AB_ImExporterAccountInfo_GetFirstTransaction (iea);
+ while (it) {
+ retval = func(it, user_data);
+ if (retval) {
+ return retval;
+ }
+ it = AB_ImExporterAccountInfo_GetNextTransaction (iea);
+ }
+ return 0;
+}
+#endif /* aqbanking < 1.9.7 */
+
+
+
AB_BANKING * gnc_AB_BANKING_new_currentbook (GtkWidget *parent,
GNCInteractor **inter)
{
@@ -316,7 +375,7 @@
GNCInteractor_hide (inter);
gnc_error_dialog
(parent,
- _("Unfortunately this HBCI job is not supported "
+ _("Unfortunately this Online Banking job is not supported "
"by your bank or for your account. Aborting."));
return FALSE;
#endif
@@ -324,7 +383,7 @@
if (inter) GNCInteractor_hide (inter);
gnc_error_dialog
(parent,
- _("The server of your bank refused the HBCI connection. "
+ _("The server of your bank refused the Online Banking connection. "
"Please try again later. Aborting."));
return FALSE;
@@ -389,6 +448,8 @@
}
#endif
+/* ------------------------------------------------------- */
+
static gboolean hbci_Error_isOk(int err) {
switch (err) {
case 0:
@@ -463,6 +524,233 @@
}
}
+static void multijob_cb (gpointer element, gpointer user_data);
+
+gboolean
+gnc_hbci_multijob_execute(GtkWidget *parent, AB_BANKING *api,
+ GList *job_list, GNCInteractor *interactor)
+{
+ gboolean successful;
+ g_assert(api);
+
+ successful = gnc_AB_BANKING_execute (parent, api, NULL, interactor);
+
+ /*printf("dialog-hbcitrans: Ok, result of api_execute was %d.\n",
+ successful);*/
+
+ if (!successful) {
+ /* AB_BANKING_executeOutbox failed. */
+ gnc_error_dialog (GNCInteractor_dialog (interactor),
+ "%s",
+ _("Executing the Online Banking outbox failed. Please check the log window."));
+ GNCInteractor_show_nodelete(interactor);
+
+ g_list_foreach (job_list, multijob_cb, GNCInteractor_dialog (interactor));
+ }
+ /* Watch out! The job *has* to be removed from the queue
+ here because otherwise it might be executed again. */
+ /* AB_Banking_DequeueJob(api, job); is done in the calling function. */
+ return successful;
+}
+
+
+void multijob_cb (gpointer element, gpointer user_data)
+{
+ AB_JOB *job = element;
+ GtkWidget *parent = user_data;
+
+ if ((AB_Job_GetStatus (job) == AB_Job_StatusPending) ||
+ (AB_Job_GetStatus (job) == AB_Job_StatusError)) {
+ /* There was some error in this job. */
+ if (AB_Job_GetType (job) == AB_Job_TypeDebitNote) {
+ const AB_TRANSACTION *h_trans =
+ AB_JobSingleDebitNote_GetTransaction (job);
+ gchar *descr_name = gnc_hbci_descr_tognc (h_trans);
+ gchar *value =
+ gnc_AB_VALUE_toReadableString (AB_Transaction_GetValue (h_trans));
+ gchar *errortext;
+ errortext =
+ g_strdup_printf(_("A debit note has been refused by the bank. The refused debit note has the following data:\n"
+ "Remote bank code: \"%s\"\n"
+ "Remote account number: \"%s\"\n"
+ "Description and remote name: \"%s\"\n"
+ "Value: \"%s\"\n"),
+ AB_Transaction_GetRemoteBankCode (h_trans),
+ AB_Transaction_GetRemoteAccountNumber (h_trans),
+ descr_name,
+ value);
+ printf ("%s", errortext);
+ gnc_error_dialog (parent, "%s", errortext);
+ g_free (errortext);
+ g_free (descr_name);
+ } else {
+ gnc_error_dialog
+ (parent, "%s",
+ _("One of the jobs was sent to the bank successfully, but the "
+ "bank is refusing to execute the job. Please check "
+ "the log window for the exact error message of the "
+ "bank. The line with the error message contains a "
+ "code number that is greater than 9000.\n"
+ "\n"
+ "The job has been removed from the queue."));
+ /* FIXME: Might make more useful user feedback here. */
+ }
+ }
+}
+
+
+/* ------------------------------------------------------- */
+
+/* Callback declarations */
+static const AB_TRANSACTION *
+translist_cb (const AB_TRANSACTION *element, void *user_data);
+static AB_IMEXPORTER_ACCOUNTINFO *
+accountinfolist_cb(AB_IMEXPORTER_ACCOUNTINFO *element, void *user_data);
+
+struct import_data
+{
+ Account *gnc_acc;
+ GNCImportMainMatcher *importer_generic;
+ AB_BANKING *ab;
+ AB_ACCOUNT *hbci_account;
+ GList *job_list;
+ gboolean execute_transactions;
+};
+
+
+GList *
+gnc_hbci_import_ctx(AB_BANKING *ab, AB_IMEXPORTER_CONTEXT *ctx,
+ GNCImportMainMatcher *importer_generic_gui,
+ gboolean exec_as_aqbanking_jobs)
+{
+ struct import_data data;
+ data.importer_generic = importer_generic_gui;
+ data.ab = ab;
+ data.job_list = NULL;
+ data.execute_transactions = exec_as_aqbanking_jobs;
+
+ /* Iterate through all accounts */
+ AB_ImExporterContext_AccountInfoForEach(ctx, accountinfolist_cb, &data);
+ /* All accounts finished. Finished importing. */
+ return data.job_list;
+}
+
+
+static AB_IMEXPORTER_ACCOUNTINFO *
+accountinfolist_cb(AB_IMEXPORTER_ACCOUNTINFO *accinfo, void *user_data) {
+ Account *gnc_acc;
+ struct import_data *data = user_data;
+ const char *bank_code =
+ AB_ImExporterAccountInfo_GetBankCode(accinfo);
+ const char *account_number =
+ AB_ImExporterAccountInfo_GetAccountNumber(accinfo);
+ const char *account_name =
+ AB_ImExporterAccountInfo_GetAccountName(accinfo);
+ gchar *online_id = g_strconcat (bank_code, account_number, NULL);
+
+ gnc_acc = gnc_import_select_account(NULL,
+ online_id, 1, account_name, NULL,
+ ACCT_TYPE_NONE, NULL, NULL);
+ g_free(online_id);
+ if (gnc_acc) {
+ /* Store chosen gnucash account in callback data */
+ data->gnc_acc = gnc_acc;
+
+ if (data->execute_transactions) {
+ /* Retrieve the aqbanking account that belongs to this gnucash
+ account */
+ data->hbci_account = gnc_hbci_get_hbci_acc (data->ab, gnc_acc);
+ if (data->hbci_account == NULL) {
+ gnc_error_dialog (NULL, _("No Online Banking account found for this gnucash account. These transactions will not be executed by Online Banking."));
+ }
+ }
+ else {
+ data->hbci_account = NULL;
+ }
+
+ /* Iterate through all transactions. */
+ AB_ImExporterAccountInfo_TransactionsForEach (accinfo, translist_cb, data);
+ /* all transactions finished. */
+ }
+ return NULL;
+}
+
+static const AB_TRANSACTION *
+translist_cb (const AB_TRANSACTION *element, void *user_data) {
+ AB_JOB *job;
+ AB_TRANSACTION *trans = (AB_TRANSACTION*)element;
+ GtkWidget *parent = NULL;
+ struct import_data *data = user_data;
+ struct trans_list_data hbci_userdata;
+
+ /* This callback in the hbci module will add the imported
+ transaction to gnucash's importer. */
+ hbci_userdata.gnc_acc = data->gnc_acc;
+ hbci_userdata.importer_generic = data->importer_generic;
+ /* The call will use "trans" only as const* */
+ gnc_hbci_trans_list_cb((AB_TRANSACTION*) trans, &hbci_userdata);
+
+ if (data->hbci_account) {
+ /* NEW: The imported transaction has been imported into
+ gnucash. Now also add it as a job to aqbanking. */
+ AB_Transaction_SetLocalBankCode (trans,
+ AB_Account_GetBankCode (data->hbci_account));
+ AB_Transaction_SetLocalAccountNumber (trans, AB_Account_GetAccountNumber (data->hbci_account));
+ AB_Transaction_SetLocalCountry (trans, "DE");
+
+ job =
+ gnc_hbci_trans_dialog_enqueue(trans, data->ab,
+ data->hbci_account, SINGLE_DEBITNOTE);
+
+ /* Check whether we really got a job */
+ if (!job) {
+ /* Oops, no job, probably not supported by bank. */
+ if (gnc_verify_dialog
+ (parent,
+ FALSE,
+ "%s",
+ _("The backend found an error during the preparation "
+ "of the job. It is not possible to execute this job. \n"
+ "\n"
+ "Most probable the bank does not support your chosen "
+ "job or your Online Banking account does not have the permission "
+ "to execute this job. More error messages might be "
+ "visible on your console log.\n"
+ "\n"
+ "Do you want to enter the job again?"))) {
+ gnc_error_dialog (parent, "Sorry, not implemented yet.");
+ }
+ /* else
+ break; */
+ }
+ data->job_list = g_list_append(data->job_list, job);
+ }
+
+ return NULL;
+}
+
+
+/* ------------------------------------------------------- */
+
+static void delpending_cb (gpointer element, gpointer user_data);
+
+void
+gnc_hbci_clearqueue(AB_BANKING *ab, GList *ab_job_list)
+{
+ g_list_foreach (ab_job_list, delpending_cb, ab);
+}
+
+void delpending_cb (gpointer element, gpointer user_data)
+{
+ AB_JOB *job = element;
+ AB_BANKING *ab = user_data;
+
+ if (AB_Job_GetStatus (job) == AB_Job_StatusPending)
+ AB_Banking_DelPendingJob(ab, job);
+}
+
+/* ------------------------------------------------------- */
+
struct cb_struct {
gchar **result;
GIConv gnc_iconv_handler;
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.h
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-hbci-utils.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -27,11 +27,28 @@
#include <aqbanking/banking.h>
#include <aqbanking/transaction.h>
#include <aqbanking/account.h>
+#include <aqbanking/imexporter.h>
+#include <aqbanking/version.h>
+#if AQBANKING_VERSION_MAJOR > 2
+# define AB_Value_GetValue AB_Value_GetValueAsDouble
+# define GWEN_TYPE_UINT32 uint32_t
+# define GWEN_LoggerLevelError GWEN_LoggerLevel_Error
+# define GWEN_LoggerLevelWarning GWEN_LoggerLevel_Warning
+# define GWEN_LoggerLevelNotice GWEN_LoggerLevel_Notice
+# define GWEN_LoggerLevelInfo GWEN_LoggerLevel_Info
+# define GWEN_LoggerLevelDebug GWEN_LoggerLevel_Debug
+# define AB_Banking_LogLevelVerbous GWEN_LoggerLevel_Verbous
+# define AB_Banking_LogLevelNotice GWEN_LoggerLevel_Notice
+# define AB_BANKING_LOGLEVEL GWEN_LOGGER_LEVEL
+# define AB_Banking_new(arg1, arg2) AB_Banking_new(arg1, arg2, 0)
+# define AB_ERROR_FOUND GWEN_ERROR_FOUND
+#endif
#include "gnc-ui.h"
#include "Account.h"
#include "Transaction.h"
#include "gnc-book.h"
+#include "import-main-matcher.h"
#include "hbci-interaction.h"
@@ -97,7 +114,50 @@
gnc_AB_BANKING_execute (GtkWidget *parent, AB_BANKING *api,
AB_JOB *job, GNCInteractor *inter);
+/* Calls AB_Banking_executeQueue() with some supplementary stuff
+ * around it: set the debugLevel, show the GNCInteractor, and do some
+ * error checking afterwards by checking each AB_JOB in
+ * job_list. Returns TRUE upon success or FALSE if the calling dialog
+ * should abort. parent may be NULL, job_list (a GList of AB_JOBs) may
+ * be NULL (although in this case no HBCI result codes can be
+ * checked!), inter may be NULL; api must not be NULL. */
+gboolean
+gnc_hbci_multijob_execute(GtkWidget *parent, AB_BANKING *api,
+ GList *job_list, GNCInteractor *inter);
+/**
+ * Imports the account/transaction/balance data of an aqbanking
+ * "imexporter-context" into the matching gnucash accounts, using the
+ * given importer_generic_gui.
+ *
+ * If exec_as_jobs is TRUE, additionally queue each transaction as a
+ * new aqbanking online banking job.
+ *
+ * @param ab The AB_BANKING api object.
+ *
+ * @param ctx The "context" object that holds the actual transactions.
+ *
+ * @param importer_generic_gui The dialog which should display the
+ * to-be-imported transactions.
+ *
+ * @param exec_as_aqbanking_jobs If TRUE, additionally queue the
+ * imported transactions as online jobs over aqbanking/HBCI. If FALSE,
+ * just import the transactions and that's it.
+ *
+ * @return If exec_as_aqbanking_jobs was FALSE, this always returns
+ * NULL. Otherwise it returns a GList of the AB_JOBs that have been
+ * queued into aqbanking.
+ */
+GList *
+gnc_hbci_import_ctx(AB_BANKING *ab, AB_IMEXPORTER_CONTEXT *ctx,
+ GNCImportMainMatcher *importer_generic_gui,
+ gboolean exec_as_aqbanking_jobs);
+
+/** Clear all the AB_JOBs of the ab_job_list from aqbanking's
+ * queue. */
+void
+gnc_hbci_clearqueue(AB_BANKING *ab, GList *ab_job_list);
+
/* Create the appropriate description field for a Gnucash Transaction
* by the information given in the AB_TRANSACTION h_trans. The
* returned string must be g_free'd by the caller. */
@@ -112,6 +172,7 @@
* returned string must be g_free'd by the caller. If there was no
* purpose, an empty (but allocated) string is returned. */
char *gnc_hbci_getpurpose (const AB_TRANSACTION *h_trans);
+
/** Return the first customer that can act on the specified account,
or NULL if none was found (and an error message is printed on
stdout). */
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gnc-plugin-hbci.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gnc-plugin-hbci.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gnc-plugin-hbci.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,6 +39,10 @@
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h"
+/* for gnc_gconf_ */
+#include "gnc-gconf-utils.h"
+#include "hbci-interaction.h"
+
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = "gnucash-hbci";
@@ -92,17 +96,17 @@
{ "OnlineActionsAction", NULL, N_("_Online Actions"), NULL, NULL, NULL },
/* Menu Items */
- { "HbciSetupAction", NULL, N_("_HBCI Setup..."), NULL,
- N_("Initial setup of HBCI/AqBanking access"),
+ { "HbciSetupAction", NULL, N_("_Online Banking Setup..."), NULL,
+ N_("Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using AqBanking)"),
G_CALLBACK (gnc_plugin_hbci_cmd_setup) },
{ "HbciGetBalanceAction", NULL, N_("Get _Balance"), NULL,
- N_("Get the account balance online through HBCI/AqBanking"),
+ N_("Get the account balance online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_get_balance) },
{ "HbciGetTransAction", NULL, N_("Get _Transactions..."), NULL,
- N_("Get the transactions online through HBCI/AqBanking"),
+ N_("Get the transactions online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_get_transactions) },
{ "HbciIssueTransAction", NULL, N_("_Issue Transaction..."), NULL,
- N_("Issue a new transaction online through HBCI"),
+ N_("Issue a new transaction online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_issue_transaction) },
#if ((AQBANKING_VERSION_MAJOR > 1) || \
((AQBANKING_VERSION_MAJOR == 1) && \
@@ -111,11 +115,11 @@
((AQBANKING_VERSION_PATCHLEVEL > 0) || \
(AQBANKING_VERSION_BUILD > 2))))))
{ "HbciIssueIntTransAction", NULL, N_("I_nternal Transaction..."), NULL,
- N_("Issue a new bank-internal transaction online through HBCI/AqBanking"),
+ N_("Issue a new bank-internal transaction online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_issue_inttransaction) },
#endif
{ "HbciIssueDirectDebitAction", NULL, N_("_Direct Debit..."), NULL,
- N_("Issue a new direct debit note online through HBCI/AqBanking"),
+ N_("Issue a new direct debit note online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_issue_direct_debit) },
/* File -> Import menu item */
@@ -132,10 +136,10 @@
N_("Import a CSV file into GnuCash"),
G_CALLBACK (gnc_plugin_hbci_cmd_csv_import) },
{ "DtausImportSendAction", GTK_STOCK_CONVERT, N_("Import DTAUS and _send..."), NULL,
- N_("Import a DTAUS file into GnuCash and send the transfers online through HBCI/AqBanking"),
+ N_("Import a DTAUS file into GnuCash and send the transfers online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_dtaus_importsend) },
{ "CsvImportSendAction", GTK_STOCK_CONVERT, N_("Import CSV and s_end..."), NULL,
- N_("Import a CSV file into GnuCash and send the transfers online through HBCI/AqBanking"),
+ N_("Import a CSV file into GnuCash and send the transfers online through Online Banking"),
G_CALLBACK (gnc_plugin_hbci_cmd_csv_importsend) },
};
@@ -323,26 +327,39 @@
GncPluginPage *page;
const gchar *page_name;
Account *account = NULL;
+ const gchar *account_name;
ENTER("main window %p", window);
- g_return_val_if_fail (GNC_IS_MAIN_WINDOW(window), NULL);
+ if (!GNC_IS_MAIN_WINDOW(window)) {
+ LEAVE("no main_window");
+ return NULL;
+ }
/* Ensure we are called from a register page. */
page = gnc_main_window_get_current_page(window);
+ if (!GNC_IS_PLUGIN_PAGE(page)) {
+ LEAVE("no plugin_page");
+ return NULL;
+ }
page_name = gnc_plugin_page_get_plugin_name(page);
+ if (!page_name) {
+ LEAVE("no page_name of plugin_page");
+ return NULL;
+ }
- if (strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER_NAME) == 0) {
+ if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER_NAME) == 0) {
DEBUG("register page");
account =
gnc_plugin_page_register_get_account (GNC_PLUGIN_PAGE_REGISTER(page));
- } else if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
+ } else if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
DEBUG("account tree page");
account =
gnc_plugin_page_account_tree_get_current_account (GNC_PLUGIN_PAGE_ACCOUNT_TREE(page));
} else {
account = NULL;
}
- LEAVE("account %s(%p)", xaccAccountGetName(account), account);
+ account_name = xaccAccountGetName (account);
+ LEAVE("account %s(%p)", account_name ? account_name : "(null)", account);
return account;
}
@@ -360,8 +377,11 @@
GtkActionGroup *action_group;
GncMainWindow *window;
+ g_return_if_fail (GNC_IS_PLUGIN_PAGE (plugin_page));
window = GNC_MAIN_WINDOW(plugin_page->window);
+ g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
action_group = gnc_main_window_get_action_group(window, PLUGIN_ACTIONS_NAME);
+ g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
gnc_plugin_update_actions(action_group, need_account_actions,
"sensitive", account != NULL);
}
@@ -375,8 +395,18 @@
const gchar *page_name;
ENTER("main window %p, page %p", window, page);
+ if (!GNC_IS_PLUGIN_PAGE(page)) {
+ LEAVE("no plugin_page");
+ return;
+ }
+
page_name = gnc_plugin_page_get_plugin_name(page);
- if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
+ if (!page_name) {
+ LEAVE("no page_name of plugin_page");
+ return;
+ }
+
+ if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
DEBUG("account tree page, adding signal");
g_signal_connect (G_OBJECT(page),
"account_selected",
@@ -398,8 +428,16 @@
Account *account;
ENTER("main window %p, page %p", window, page);
+ if (!GNC_IS_MAIN_WINDOW (window)) {
+ LEAVE("no main_window");
+ return;
+ }
+
action_group = gnc_main_window_get_action_group(window,PLUGIN_ACTIONS_NAME);
- g_return_if_fail(action_group != NULL);
+ if (!GTK_IS_ACTION_GROUP (action_group)) {
+ LEAVE("no action_group");
+ return;
+ }
/* Reset everything to known state */
gnc_plugin_update_actions(action_group, need_account_actions,
@@ -417,11 +455,12 @@
/* Selectively make items visible */
page_name = gnc_plugin_page_get_plugin_name(page);
- if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
+ g_return_if_fail (page_name);
+ if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) {
DEBUG("account tree page");
gnc_plugin_update_actions(action_group, account_tree_actions,
"visible", TRUE);
- } else if (strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER_NAME) == 0) {
+ } else if (safe_strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER_NAME) == 0) {
DEBUG("register page");
gnc_plugin_update_actions(action_group, register_actions,
"visible", TRUE);
@@ -543,38 +582,50 @@
gnc_plugin_hbci_cmd_dtaus_importsend (GtkAction *action,
GncMainWindowActionData *data)
{
- gnc_file_aqbanking_import ("dtaus", "default", TRUE);
+ char *format = gnc_gconf_get_string(GCONF_SECTION, KEY_FORMAT_DTAUS, NULL);
+ gnc_file_aqbanking_import ("dtaus", format ? format : "default", TRUE);
+ g_free (format);
}
static void
gnc_plugin_hbci_cmd_csv_importsend (GtkAction *action,
GncMainWindowActionData *data)
{
- gnc_file_aqbanking_import ("csv", "default", TRUE);
+ char *format = gnc_gconf_get_string(GCONF_SECTION, KEY_FORMAT_CSV, NULL);
+ gnc_file_aqbanking_import ("csv", format ? format : "default", TRUE);
+ g_free (format);
}
static void
gnc_plugin_hbci_cmd_mt940_import (GtkAction *action,
GncMainWindowActionData *data)
{
- gnc_file_aqbanking_import ("swift", "swift-mt940", FALSE);
+ char *format = gnc_gconf_get_string(GCONF_SECTION, KEY_FORMAT_SWIFT940, NULL);
+ gnc_file_aqbanking_import ("swift", format ? format : "swift-mt940", FALSE);
+ g_free (format);
}
static void
gnc_plugin_hbci_cmd_mt942_import (GtkAction *action,
GncMainWindowActionData *data)
{
- gnc_file_aqbanking_import ("swift", "swift-mt942", FALSE);
+ char *format = gnc_gconf_get_string(GCONF_SECTION, KEY_FORMAT_SWIFT942, NULL);
+ gnc_file_aqbanking_import ("swift", format ? format : "swift-mt942", FALSE);
+ g_free (format);
}
static void
gnc_plugin_hbci_cmd_dtaus_import (GtkAction *action,
GncMainWindowActionData *data)
{
- gnc_file_aqbanking_import ("dtaus", "default", FALSE);
+ char *format = gnc_gconf_get_string(GCONF_SECTION, KEY_FORMAT_DTAUS, NULL);
+ gnc_file_aqbanking_import ("dtaus", format ? format : "default", FALSE);
+ g_free (format);
}
static void
gnc_plugin_hbci_cmd_csv_import (GtkAction *action,
GncMainWindowActionData *data)
{
- gnc_file_aqbanking_import ("csv", "default", FALSE);
+ char *format = gnc_gconf_get_string(GCONF_SECTION, KEY_FORMAT_CSV, NULL);
+ gnc_file_aqbanking_import ("csv", format ? format : "default", FALSE);
+ g_free (format);
}
/************************************************************
* Plugin Bootstrapping *
Modified: gnucash/branches/remove-group2/src/import-export/hbci/gncmod-hbci.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/gncmod-hbci.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/gncmod-hbci.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,14 +1,13 @@
/*********************************************************************
* gncmod-hbci.c
* module definition/initialization for HBCI support
- *
+ *
* Copyright (c) 2002 Christian <stimming at tuhh.de>
*********************************************************************/
#include "config.h"
-#include <gtk/gtk.h>
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -20,32 +19,27 @@
#include "dialog-preferences.h"
/* version of the gnc module system interface we require */
-int libgncmod_hbci_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_hbci_LTX_gnc_module_current = 0;
-int libgncmod_hbci_LTX_gnc_module_revision = 0;
-int libgncmod_hbci_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_hbci_LTX_gnc_module_path(void);
-char *libgncmod_hbci_LTX_gnc_module_description(void);
-int libgncmod_hbci_LTX_gnc_module_init(int refcount);
-int libgncmod_hbci_LTX_gnc_module_end(int refcount);
char *
-libgncmod_hbci_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/import-export/hbci");
}
-char *
-libgncmod_hbci_LTX_gnc_module_description(void) {
- return g_strdup("Support for HBCI protocol");
+char *
+gnc_module_description(void) {
+ return g_strdup("Support for Online Banking protocols");
}
int
-libgncmod_hbci_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
@@ -66,7 +60,7 @@
/* Add menu items with C callbacks */
gnc_plugin_hbci_create_plugin();
-
+
gnc_preferences_add_to_page("hbciprefs.glade", "hbci_prefs",
"Online Banking");
@@ -77,7 +71,7 @@
}
int
-libgncmod_hbci_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
gnc_AB_BANKING_delete(0);
/* Finalize gwen library */
Modified: gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -44,6 +44,31 @@
#include "dialog-pass.h"
#include "gnc-hbci-utils.h"
+#include <aqbanking/version.h>
+#if AQBANKING_VERSION_MAJOR > 2
+# include <gwenhywfar/gui.h>
+# define AB_Banking_SetMessageBoxFn GWEN_Gui_SetMessageBoxFn
+# define AB_Banking_SetInputBoxFn GWEN_Gui_SetInputBoxFn
+# define AB_Banking_SetShowBoxFn GWEN_Gui_SetShowBoxFn
+# define AB_Banking_SetHideBoxFn GWEN_Gui_SetHideBoxFn
+# define AB_Banking_SetProgressStartFn GWEN_Gui_SetProgressStartFn
+# define AB_Banking_SetProgressAdvanceFn GWEN_Gui_SetProgressAdvanceFn
+# define AB_Banking_SetProgressLogFn GWEN_Gui_SetProgressLogFn
+# define AB_Banking_SetProgressEndFn GWEN_Gui_SetProgressEndFn
+# define AB_Banking_SetGetTanFn GWEN_Gui_SetGetTanFn
+# define AB_BANKING_MSG_FLAGS_TYPE_ERROR GWEN_GUI_MSG_FLAGS_TYPE_ERROR
+# define AB_BANKING_INPUT_FLAGS_CONFIRM GWEN_GUI_INPUT_FLAGS_CONFIRM
+# define AB_BANKING_INPUT_FLAGS_SHOW GWEN_GUI_INPUT_FLAGS_SHOW
+# define AB_BANKING_PROGRESS_NONE GWEN_GUI_PROGRESS_NONE
+# define AB_Banking_GetUserData(arg) GWEN_INHERIT_GETDATA(GWEN_GUI, GNCInteractor, arg)
+# define AB_Banking_SetUserData(arg1, arg2)
+/* Note about other changes: Replace callback object AB_BANKING by
+ GWEN_GUI, to be created by GWEN_GUI_new; replace GetTan
+ callback by watching for INPUT_FLAGS_TAN in InputBox(). */
+#endif
+
+GWEN_INHERIT(AB_BANKING, GNCInteractor)
+
#define GCONF_SECTION_CONNECTION GCONF_SECTION "/connection_dialog"
gchar *gnc__extractText(const char *text);
@@ -503,7 +528,12 @@
}
-static void destr(void *bp, void *user_data)
+#ifndef GWENHYWFAR_CB
+/* Has been introduced in gwenhywfar>=2.4.1 for callback function
+ decoration on win32, but is empty everywhere else. */
+# define GWENHYWFAR_CB
+#endif
+static void GWENHYWFAR_CB destr(void *bp, void *user_data)
{
GNCInteractor *data = user_data;
if (data == NULL)
@@ -794,7 +824,6 @@
while (g_main_context_iteration(context, FALSE));
}
-GWEN_INHERIT(AB_BANKING, GNCInteractor)
/********************************************************
* Constructor
Modified: gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.h
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/hbci-interaction.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -29,6 +29,10 @@
#define KEY_CLOSE_ON_FINISH "close_on_finish"
#define KEY_REMEMBER_PIN "remember_pin"
#define KEY_VERBOSE_DEBUG "verbose_debug"
+#define KEY_FORMAT_DTAUS "format_dtaus"
+#define KEY_FORMAT_CSV "format_csv"
+#define KEY_FORMAT_SWIFT940 "format_swift_mt940"
+#define KEY_FORMAT_SWIFT942 "format_swift_mt942"
typedef struct _inter_data GNCInteractor;
Modified: gnucash/branches/remove-group2/src/import-export/hbci/hbci-interactionP.h
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/hbci-interactionP.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/hbci-interactionP.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,6 +26,7 @@
#include <aqbanking/banking.h>
#include <iconv.h>
+#include "gnc-hbci-utils.h"
typedef enum {
Modified: gnucash/branches/remove-group2/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/schemas/apps_gnucash_dialog_hbci.schemas.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -75,5 +75,69 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/hbci/format_dtaus</key>
+ <applyto>/apps/gnucash/dialogs/import/hbci/format_dtaus</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>default</default>
+ <locale name="C">
+ <short>DTAUS import data format</short>
+ <long>
+ This setting specifies the data format when importing DTAUS
+ files. The AqBanking library offers various import formats
+ (called "profiles") of which you can choose one here.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/hbci/format_csv</key>
+ <applyto>/apps/gnucash/dialogs/import/hbci/format_csv</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>default</default>
+ <locale name="C">
+ <short>CSV import data format</short>
+ <long>
+ This setting specifies the data format when importing CSV
+ files. The AqBanking library offers various import formats
+ (called "profiles") of which you can choose one here.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/hbci/format_swift_mt940</key>
+ <applyto>/apps/gnucash/dialogs/import/hbci/format_swift_mt940</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>swift-mt940</default>
+ <locale name="C">
+ <short>SWIFT MT940 import data format</short>
+ <long>
+ This setting specifies the data format when importing SWIFT
+ MT940 files. The AqBanking library offers various import
+ formats (called "profiles") of which you can choose one here.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/dialogs/import/hbci/format_swift_mt942</key>
+ <applyto>/apps/gnucash/dialogs/import/hbci/format_swift_mt942</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>swift-mt942</default>
+ <locale name="C">
+ <short>SWIFT MT942 import data format</short>
+ <long>
+ This setting specifies the data format when importing SWIFT
+ MT942 files. The AqBanking library offers various import
+ formats (called "profiles") of which you can choose one here.
+ </long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
Modified: gnucash/branches/remove-group2/src/import-export/hbci/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/hbci/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/hbci/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
TESTS=test-link-module
-noinst_PROGRAMS=test-link-module
+check_PROGRAMS=test-link-module
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD=../libgncmod-hbci.la
Modified: gnucash/branches/remove-group2/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/import-account-matcher.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/import-account-matcher.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -67,7 +67,7 @@
GtkTreeViewColumn *col;
/* Build a new account tree */
- TRACE("Begin");
+ DEBUG("Begin");
account_tree = gnc_tree_view_account_new(FALSE);
picker->account_tree = GNC_TREE_VIEW_ACCOUNT(account_tree);
gtk_tree_view_set_headers_visible (account_tree, TRUE);
@@ -113,6 +113,17 @@
gnc_tree_view_account_set_selected_account(picker->account_tree, new_account);
}
+/* When user double-clicks an account */
+static void
+account_tree_row_activated_cb(GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ struct _accountpickerdialog *picker)
+{
+ g_return_if_fail(picker && picker->dialog);
+
+ gtk_dialog_response(GTK_DIALOG(picker->dialog), GTK_RESPONSE_OK);
+}
+
static gpointer test_acct_online_id_match(Account *acct, gpointer param_online_id)
{
const gchar * current_online_id = gnc_import_get_acc_online_id(acct);
@@ -207,6 +218,8 @@
gnc_tree_view_account_set_selected_account(picker->account_tree, default_selection);
gtk_window_set_modal(GTK_WINDOW(picker->dialog), TRUE);
+ g_signal_connect(picker->account_tree, "row-activated",
+ G_CALLBACK(account_tree_row_activated_cb), picker);
do {
response = gtk_dialog_run(GTK_DIALOG(picker->dialog));
switch (response) {
Modified: gnucash/branches/remove-group2/src/import-export/import-backend.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/import-backend.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/import-backend.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -33,6 +33,8 @@
#include <stdlib.h>
#include <math.h>
+#include <errno.h>
+
#include "gnc-gconf-utils.h"
#include "import-backend.h"
#include "import-utilities.h"
@@ -655,22 +657,41 @@
/* Check number heuristics */
if(strlen(xaccTransGetNum(new_trans))!=0)
- {
- if((strcmp(xaccTransGetNum (new_trans),
- xaccTransGetNum(xaccSplitGetParent(split)))
- ==0))
- {
- /*An exact match of the Check number gives a +4 */
- prob = prob+4;
- /*DEBUG("heuristics: probability + 5 (Check number)");*/
- }
- else if(strlen(xaccTransGetNum(new_trans)) > 0 &&
- strlen(xaccTransGetNum(xaccSplitGetParent(split))) > 0)
- {
- /* If both number are not empty yet do not match, add a little extre penality */
- prob = prob-2;
- }
- }
+ {
+ long new_trans_number, split_number;
+ const gchar *new_trans_str, *split_str;
+ char *endptr;
+ gboolean conversion_ok = TRUE;
+
+ new_trans_str = xaccTransGetNum (new_trans);
+ /* To distinguish success/failure after strtol call */
+ errno = 0;
+ new_trans_number = strtol(new_trans_str, &endptr, 10);
+ /* Possible addressed problems: over/underflow, only non
+ numbers on string and string empty */
+ if (errno || endptr == new_trans_str)
+ conversion_ok = FALSE;
+
+ split_str = xaccTransGetNum (xaccSplitGetParent (split));
+ errno = 0;
+ split_number = strtol(split_str, &endptr, 10);
+ if (errno || endptr == split_str)
+ conversion_ok = FALSE;
+
+ if ( (conversion_ok && (split_number == new_trans_number)) ||
+ (safe_strcmp(new_trans_str, split_str) == 0) )
+ {
+ /*An exact match of the Check number gives a +4 */
+ prob += 4;
+ /*DEBUG("heuristics: probability + 4 (Check number)");*/
+ }
+ else if(strlen(new_trans_str) > 0 && strlen(split_str) > 0)
+ {
+ /* If both number are not empty yet do not match, add a
+ little extra penality */
+ prob -= 2;
+ }
+ }
/* Memo heuristics */
if(strlen(xaccSplitGetMemo(gnc_import_TransInfo_get_fsplit (trans_info)))!=0)
Modified: gnucash/branches/remove-group2/src/import-export/import-match-map.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/import-match-map.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/import-match-map.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -483,7 +483,7 @@
string, which doesn't work in the kvp loopkup later. So we
skip this case here. */
if (!current_token->data || (*((char*)current_token->data) == '\0'))
- continue;
+ continue;
/* start off with no tokens for this account */
token_count = 0;
Modified: gnucash/branches/remove-group2/src/import-export/import-match-picker.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/import-match-picker.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/import-match-picker.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -287,6 +287,17 @@
}
static void
+match_transaction_row_activated_cb (GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ GNCImportMatchPicker *matcher)
+{
+ g_return_if_fail (matcher && matcher->transaction_matcher);
+
+ gtk_dialog_response (GTK_DIALOG (matcher->transaction_matcher),
+ GTK_RESPONSE_OK);
+}
+
+static void
add_column(GtkTreeView *view, const gchar *title, int col_num)
{
GtkCellRenderer *renderer;
@@ -367,6 +378,8 @@
selection = gtk_tree_view_get_selection(view);
g_signal_connect(selection, "changed",
G_CALLBACK(match_transaction_changed_cb), matcher);
+ g_signal_connect(view, "row-activated",
+ G_CALLBACK(match_transaction_row_activated_cb), matcher);
}
/********************************************************************\
Modified: gnucash/branches/remove-group2/src/import-export/import-provider-format.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/import-provider-format.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/import-provider-format.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,6 +17,7 @@
<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="GnomeDruidPageStandard" id="Format Provider Page">
@@ -49,6 +50,10 @@
<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>
@@ -76,6 +81,10 @@
<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>
@@ -97,6 +106,10 @@
<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>
@@ -115,6 +128,7 @@
<child>
<widget class="GtkComboBox" id="import_format_combo">
<property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -137,6 +151,10 @@
<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>
Modified: gnucash/branches/remove-group2/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/log-replay/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/log-replay/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -11,12 +11,14 @@
gnc-log-replay.h \
gnc-plugin-log-replay.h
+libgncmod_log_replay_la_LDFLAGS = -avoid-version
+
libgncmod_log_replay_la_LIBADD = \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GTK_LIBS} \
${GLIB_LIBS} ${QOF_LIBS}
@@ -39,3 +41,5 @@
uidir = $(GNC_UI_DIR)
dist_ui_DATA = \
gnc-plugin-log-replay-ui.xml
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.log-replay\"
Modified: gnucash/branches/remove-group2/src/import-export/log-replay/gnc-log-replay.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/log-replay/gnc-log-replay.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/log-replay/gnc-log-replay.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <string.h>
#include <sys/time.h>
#include <libguile.h>
@@ -542,7 +542,7 @@
selected_filename);
} else {
DEBUG("Opening selected file");
- log_file = fopen(selected_filename, "r");
+ log_file = g_fopen(selected_filename, "r");
if(!log_file || ferror(log_file)!=0) {
int err = errno;
perror("File open failed");
@@ -581,6 +581,7 @@
}
g_free(selected_filename);
}
+ LEAVE("");
}
Modified: gnucash/branches/remove-group2/src/import-export/log-replay/gncmod-log-replay.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/log-replay/gncmod-log-replay.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/log-replay/gncmod-log-replay.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,7 +25,7 @@
*/
#include "config.h"
-#include <gtk/gtk.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-log-replay.h"
@@ -34,35 +34,31 @@
#include "gnc-plugin-log-replay.h"
/* version of the gnc module system interface we require */
-int libgncmod_log_replay_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_log_replay_LTX_gnc_module_current = 0;
-int libgncmod_log_replay_LTX_gnc_module_revision = 0;
-int libgncmod_log_replay_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
//static GNCModule bus_core;
//static GNCModule file;
-/* forward references */
-char *libgncmod_log_replay_LTX_gnc_module_path(void);
-char *libgncmod_log_replay_LTX_gnc_module_description(void);
-int libgncmod_log_replay_LTX_gnc_module_init(int refcount);
-int libgncmod_log_replay_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_log_replay_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/import-export/log-replay");
}
+
char *
-libgncmod_log_replay_LTX_gnc_module_description(void)
+gnc_module_description(void)
{
return g_strdup("C code for log file replay");
}
+
int
-libgncmod_log_replay_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
if(!gnc_module_load("gnucash/engine", 0))
{
@@ -88,7 +84,7 @@
}
int
-libgncmod_log_replay_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/ofx/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/ofx/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -11,13 +11,15 @@
gnc-ofx-import.h \
gnc-plugin-ofx.h
+libgncmod_ofx_la_LDFLAGS = -avoid-version
+
libgncmod_ofx_la_LIBADD = \
${top_builddir}/src/import-export/libgncmod-generic-import.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${QOF_LIBS} \
${GLIB_LIBS} \
${LIBOFX_LIBS}
@@ -44,3 +46,5 @@
gnc-plugin-ofx-ui.xml
EXTRA_DIST = $(ui_DATA)
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.ofx\"
Modified: gnucash/branches/remove-group2/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/ofx/gnc-ofx-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/ofx/gnc-ofx-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -644,7 +644,6 @@
ofx_INFO_msg = true;
ofx_STATUS_msg = false;
- qof_log_check(GNC_MOD_IMPORT, QOF_LOG_TRACE);
DEBUG("gnc_file_ofx_import(): Begin...\n");
default_dir = gnc_get_default_directory(GCONF_SECTION);
Modified: gnucash/branches/remove-group2/src/import-export/ofx/gncmod-ofx-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/ofx/gncmod-ofx-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/ofx/gncmod-ofx-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -25,7 +25,7 @@
*/
#include "config.h"
-#include <gtk/gtk.h>
+#include <gmodule.h>
#include "gnc-ofx-import.h"
#include "gnc-module.h"
@@ -33,35 +33,31 @@
#include "gnc-plugin-ofx.h"
/* version of the gnc module system interface we require */
-int libgncmod_ofx_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_ofx_LTX_gnc_module_current = 0;
-int libgncmod_ofx_LTX_gnc_module_revision = 0;
-int libgncmod_ofx_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
//static GNCModule bus_core;
//static GNCModule file;
-/* forward references */
-char *libgncmod_ofx_LTX_gnc_module_path(void);
-char *libgncmod_ofx_LTX_gnc_module_description(void);
-int libgncmod_ofx_LTX_gnc_module_init(int refcount);
-int libgncmod_ofx_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_ofx_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/import-export/ofx");
}
+
char *
-libgncmod_ofx_LTX_gnc_module_description(void)
+gnc_module_description(void)
{
return g_strdup("Gnome GUI and C code for OFX importer using libofx");
}
+
int
-libgncmod_ofx_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
if(!gnc_module_load("gnucash/engine", 0))
{
@@ -82,12 +78,12 @@
/* Add menu items with C callbacks */
gnc_plugin_ofx_create_plugin();
-
+
return TRUE;
}
int
-libgncmod_ofx_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/import-export/ofx/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/ofx/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/ofx/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,7 @@
TESTS=test-link
AM_CFLAGS=${LIBOFX_CFLAGS}
-noinst_PROGRAMS=test-link
+check_PROGRAMS=test-link
test_link_SOURCES=test-link.c
test_link_LDADD=../libgncmod-ofx.la
Modified: gnucash/branches/remove-group2/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -36,3 +36,5 @@
${GUILE_INCS} \
${QOF_CFLAGS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif\"
Modified: gnucash/branches/remove-group2/src/import-export/qif/qif-file.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif/qif-file.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif/qif-file.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -28,7 +28,7 @@
#endif
#include <glib.h>
-#include <stdio.h>
+#include <glib/gstdio.h>
#include <string.h>
#include "gnc-engine.h"
@@ -206,7 +206,7 @@
g_return_val_if_fail(*filename, QIF_E_BADARGS);
/* Open the file */
- fp = fopen(filename, "r");
+ fp = g_fopen(filename, "r");
if (fp == NULL)
return QIF_E_NOFILE;
Modified: gnucash/branches/remove-group2/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -11,7 +11,7 @@
${GLIB_CFLAGS}
LDADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libgncmod-test.la \
../../libgncmod-generic-import.la \
../libgncmod-qif.la \
@@ -46,7 +46,7 @@
GNC_TEST_FILES=${srcdir}/test-files \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-link \
test-qif
Modified: gnucash/branches/remove-group2/src/import-export/qif/test/test-qif.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif/test/test-qif.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif/test/test-qif.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -60,7 +60,7 @@
{
QifContext ctx, file;
char *filename;
- const char *location = getenv("GNC_TEST_FILES");
+ const char *location = g_getenv("GNC_TEST_FILES");
int i;
ctx = qif_context_new();
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -15,14 +15,16 @@
gnc-druid-test.h \
gnc-plugin-qif-import.h
+libgncmod_qif_import_la_LDFLAGS = -avoid-version
+
libgncmod_qif_import_la_LIBADD = \
${top_builddir}/src/import-export/libgncmod-generic-import.la \
- ${top_builddir}/src/gnome/libgncgnome.la \
+ ${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GUILE_LIBS} \
${GNOME_LIBS} \
${GLADE_LIBS} \
@@ -105,3 +107,5 @@
CLEANFILES += .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif.import\"
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/dialog-account-picker.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/dialog-account-picker.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/dialog-account-picker.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -211,7 +211,17 @@
}
}
+static void
+gnc_ui_qif_account_picker_row_activated_cb (GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
+{
+ QIFAccountPickerDialog *wind = user_data;
+ g_return_if_fail (wind);
+ gtk_dialog_response (GTK_DIALOG (wind->dialog), GTK_RESPONSE_OK);
+}
+
static int
gnc_ui_qif_account_picker_map_cb(GtkWidget * w, gpointer user_data)
{
@@ -291,6 +301,9 @@
selection = gtk_tree_view_get_selection(wind->treeview);
g_signal_connect(selection, "changed",
G_CALLBACK(gnc_ui_qif_account_picker_changed_cb), wind);
+ g_signal_connect(wind->treeview, "row-activated",
+ G_CALLBACK(gnc_ui_qif_account_picker_row_activated_cb),
+ wind);
}
g_signal_connect_after(wind->dialog, "map",
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/druid-qif-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/druid-qif-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -26,8 +26,11 @@
#include <gnome.h>
#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+#ifndef HAVE_GLIB_2_8
+#include <gstdio-2.8.h>
+#endif
#include <libguile.h>
-#include <stdio.h>
#include <sys/time.h>
#include <unistd.h>
@@ -449,6 +452,7 @@
const char * path_to_load;
const gchar * default_acctname = NULL;
+ int rv;
SCM make_qif_file = scm_c_eval_string("make-qif-file");
SCM qif_file_load = scm_c_eval_string("qif-file:read-file");
@@ -476,7 +480,7 @@
gnc_error_dialog(wind->window, _("Please select a file to load."));
return TRUE;
}
- else if ((strlen(path_to_load) > 0) && access(path_to_load, R_OK) < 0) {
+ else if (g_access(path_to_load, R_OK) < 0) {
/* stay here if bad file */
gnc_error_dialog(wind->window,
_("File not found or read permission denied. "
@@ -566,8 +570,15 @@
*/
if(SCM_LISTP(parse_return) &&
(SCM_CAR(parse_return) == SCM_BOOL_T)) {
+ gint n_items;
- gtk_combo_box_remove_text(GTK_COMBO_BOX(wind->date_format_combo), 0);
+ /* clear the combo box */
+ gtk_combo_box_set_active(GTK_COMBO_BOX(wind->date_format_combo), -1);
+ n_items = gtk_tree_model_iter_n_children(
+ gtk_combo_box_get_model(GTK_COMBO_BOX(wind->date_format_combo)), NULL);
+ while (n_items-- > 0)
+ gtk_combo_box_remove_text(GTK_COMBO_BOX(wind->date_format_combo), 0);
+
if ((date_formats = scm_call_2(qif_file_parse_results,
SCM_CDR(parse_return),
scm_str2symbol("date"))) != SCM_BOOL_F) {
@@ -1020,7 +1031,6 @@
GtkListStore *store;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
- GtkTreeSelection *selection;
store = gtk_list_store_new(NUM_ACCOUNT_COLS, G_TYPE_INT, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_BOOLEAN);
@@ -1049,8 +1059,7 @@
gtk_tree_view_append_column(view, column);
g_object_set_data(G_OBJECT(store), PREV_ROW, GINT_TO_POINTER(-1));
- selection = gtk_tree_view_get_selection(view);
- g_signal_connect(selection, "changed", callback, user_data);
+ g_signal_connect(view, "row-activated", G_CALLBACK(callback), user_data);
}
/********************************************************************
@@ -1070,14 +1079,11 @@
SCM selected_acct;
GtkTreeModel *model;
GtkTreeIter iter;
- gint row, prev_row;
+ gint row;
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
gtk_tree_model_get(model, &iter, ACCOUNT_COL_INDEX, &row, -1);
- prev_row = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(model), PREV_ROW));
- if (row == prev_row)
- return;
g_object_set_data(G_OBJECT(model), PREV_ROW, GINT_TO_POINTER(row));
if (row == -1)
return;
@@ -1101,10 +1107,16 @@
********************************************************************/
static void
-gnc_ui_qif_import_account_line_select_cb(GtkTreeSelection *selection,
- gpointer user_data)
+gnc_ui_qif_import_account_line_select_cb(GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
{
- QIFImportWindow * wind = user_data;
+ QIFImportWindow *wind = user_data;
+ GtkTreeSelection *selection;
+
+ g_return_if_fail (view && wind);
+ selection = gtk_tree_view_get_selection (view);
+
select_line (wind, selection, wind->acct_display_info, wind->acct_map_info,
update_accounts_page);
}
@@ -1116,10 +1128,16 @@
********************************************************************/
static void
-gnc_ui_qif_import_category_line_select_cb(GtkTreeSelection *selection,
- gpointer user_data)
+gnc_ui_qif_import_category_line_select_cb(GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
{
- QIFImportWindow * wind = user_data;
+ QIFImportWindow *wind = user_data;
+ GtkTreeSelection *selection;
+
+ g_return_if_fail (view && wind);
+ selection = gtk_tree_view_get_selection (view);
+
select_line (wind, selection, wind->acct_display_info, wind->acct_map_info,
update_categories_page);
}
@@ -1131,11 +1149,17 @@
********************************************************************/
static void
-gnc_ui_qif_import_memo_line_select_cb(GtkTreeSelection *selection,
- gpointer user_data)
+gnc_ui_qif_import_memo_line_select_cb(GtkTreeView *view, GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
{
- QIFImportWindow * wind = user_data;
- select_line (wind, selection, wind->acct_display_info, wind->acct_map_info,
+ QIFImportWindow *wind = user_data;
+ GtkTreeSelection *selection;
+
+ g_return_if_fail (view && wind);
+ selection = gtk_tree_view_get_selection (view);
+
+ select_line (wind, selection, wind->memo_display_info, wind->memo_map_info,
update_memo_page);
}
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/gncmod-qif-import.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/gncmod-qif-import.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/gncmod-qif-import.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,12 +1,12 @@
/*********************************************************************
* gncmod-qif-import.c
* module definition/initialization for old QIF importer (deprecated)
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -17,46 +17,40 @@
#include "gnc-plugin-qif-import.h"
/* version of the gnc module system interface we require */
-int libgncmod_qif_import_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_qif_import_LTX_gnc_module_current = 0;
-int libgncmod_qif_import_LTX_gnc_module_revision = 0;
-int libgncmod_qif_import_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_qif_import_LTX_gnc_module_path(void);
-char *libgncmod_qif_import_LTX_gnc_module_description(void);
-int libgncmod_qif_import_LTX_gnc_module_init(int refcount);
-int libgncmod_qif_import_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_qif_import_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/import-export/qif-import");
}
-char *
-libgncmod_qif_import_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("Gnome GUI and Scheme code for QIF importer");
}
int
-libgncmod_qif_import_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
- if(!gnc_module_load("gnucash/engine", 0))
+ if(!gnc_module_load("gnucash/engine", 0))
{
return FALSE;
}
- if(!gnc_module_load("gnucash/app-utils", 0))
+ if(!gnc_module_load("gnucash/app-utils", 0))
{
return FALSE;
}
- if(!gnc_module_load("gnucash/gnome-utils", 0))
+ if(!gnc_module_load("gnucash/gnome-utils", 0))
{
return FALSE;
}
@@ -78,7 +72,7 @@
}
int
-libgncmod_qif_import_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/qif-guess-map.scm
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/qif-guess-map.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/qif-guess-map.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,6 +5,8 @@
;;; Bill Gribble <grib at billgribble.com> 20 Feb 2000
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (srfi srfi-13))
+
(define GNC-BANK-TYPE 0)
(define GNC-CASH-TYPE 1)
(define GNC-ASSET-TYPE 2)
@@ -313,10 +315,9 @@
;; this happens if you have the same tree but a different
;; top-level structure. (i.e. expenses:tax vs. QIF tax)
(and (> (string-length qif-acct-name) 0)
- (string-match (string-downcase qif-acct-name)
- (string-downcase (cadr gnc-acct))))))
+ (string-contains (string-downcase (cadr gnc-acct))
+ (string-downcase qif-acct-name)))))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; qif-import:find-new-acct
;; Come up with a logical name for a new account based on
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/qif-import.scm
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/qif-import.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/qif-import.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -9,7 +9,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
;; We do this initialization here because src/gnome isn't a real module.
-(load-extension "libgncgnome" "scm_init_sw_gnome_module")
+(load-extension "libgnc-gnome" "scm_init_sw_gnome_module")
(use-modules (sw_gnome))
(use-modules (gnucash gnc-module))
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/qif-parse.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/qif-parse.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -270,7 +270,7 @@
; ((vest)
; 'vest)
(else
- (gnc:warning-dialog '()
+ (gnc-warning-dialog '()
(string-append
(sprintf #f (_ "The file contains an unknown Action '%s'.")
read-value)
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/qif.glade
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/qif.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/qif.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -19,6 +19,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -110,6 +111,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -128,6 +131,10 @@
<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="type">label_item</property>
@@ -164,6 +171,7 @@
<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="qif_import_druid">
@@ -217,6 +225,10 @@
<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">5</property>
@@ -311,6 +323,10 @@
<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>
@@ -323,6 +339,7 @@
<widget class="GtkComboBox" id="date_format_combobox">
<property name="visible">True</property>
<property name="items">Dummy Date Entry</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -345,6 +362,10 @@
<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>
@@ -389,6 +410,10 @@
<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">4</property>
@@ -416,6 +441,10 @@
<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">4</property>
@@ -463,6 +492,10 @@
<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>
@@ -510,6 +543,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -535,6 +570,10 @@
<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">3</property>
@@ -602,7 +641,7 @@
<child>
<widget class="GtkLabel" id="label830">
<property name="visible">True</property>
- <property name="label" translatable="yes">On the next page, the accounts in your QIF files and any stocks or mutual funds you own will be matched with GnuCash accounts. If a GnuCash account already exists with the same name, or a similar name and compatible type, that account will be used as a match; otherwise, GnuCash will create a new account with the same name and type as the QIF account. If you do not like the suggested GnuCash account, click to change it.
+ <property name="label" translatable="yes">On the next page, the accounts in your QIF files and any stocks or mutual funds you own will be matched with GnuCash accounts. If a GnuCash account already exists with the same name, or a similar name and compatible type, that account will be used as a match; otherwise, GnuCash will create a new account with the same name and type as the QIF account. If you do not like the suggested GnuCash account, double-click to change it.
Note that GnuCash will be creating many accounts that did not exist on your other personal finance program, including a separate account for each stock you own, separate accounts for the brokerage commissions, special "Equity" accounts (subaccounts of Retained Earnings, by default) which are the source of your opening balances, etc. All of these accounts will appear on the next page so you can change them if you want to, but it is safe to leave them alone.
</property>
@@ -615,6 +654,10 @@
<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>
@@ -661,6 +704,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -684,6 +729,10 @@
<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">3</property>
@@ -716,7 +765,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">GnuCash uses separate Income and Expense accounts rather than categories to classify your transactions. Each of the categories in your QIF file will be converted to a GnuCash account.
-On the next page, you will have an opportunity to look at the suggested matches between QIF categories and GnuCash accounts. You may change matches that you do not like by clicking on the line containing the category name.
+On the next page, you will have an opportunity to look at the suggested matches between QIF categories and GnuCash accounts. You may change matches that you do not like by double-clicking on the line containing the category name.
If you change your mind later, you can reorganize the account structure safely within GnuCash.</property>
<property name="use_underline">False</property>
@@ -728,6 +777,10 @@
<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>
@@ -773,6 +826,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -796,6 +851,10 @@
<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">3</property>
@@ -838,6 +897,10 @@
<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>
@@ -883,6 +946,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -928,6 +993,10 @@
<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>
@@ -940,6 +1009,7 @@
<widget class="GtkComboBoxEntry" id="currency_comboboxentry">
<property name="visible">True</property>
<property name="items">Dummy currency entry</property>
+ <property name="add_tearoffs">False</property>
<property name="has_frame">True</property>
<property name="focus_on_click">True</property>
</widget>
@@ -963,6 +1033,10 @@
<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>
@@ -1009,6 +1083,10 @@
<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>
@@ -1041,7 +1119,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">If you are importing a QIF file downloaded from a bank or other financial institution, some of the information in the QIF file may duplicate information already in your GnuCash accounts. GnuCash will try to detect duplicates of existing transactions.
-On the next page, you will be asked to confirm that an existing transaction matches an imported transaction. Imported transactions are shown on the left side of the page, and possible matches for the selected left-hand transaction are shown to the right. There may be several old transactions that could match an imported transaction; you will be able to select the correct one by clicking in the "Dup?" column of the correct transaction.
+On the next page, you will be asked to confirm that an existing transaction matches an imported transaction. Imported transactions are shown on the left side of the page, and possible matches for the selected left-hand transaction are shown to the right. There may be several old transactions that could match an imported transaction; you will be able to select the correct one by double-clicking in the "Dup?" column of the correct transaction.
You can control the rules used by GnuCash to find duplicate transactions in the "QIF Import" section of the GnuCash Preferences dialog.
@@ -1055,6 +1133,10 @@
<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>
@@ -1112,6 +1194,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1130,6 +1214,10 @@
<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="type">label_item</property>
@@ -1167,6 +1255,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1185,6 +1275,10 @@
<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="type">label_item</property>
@@ -1240,6 +1334,7 @@
<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="GtkTable" id="prefs_table">
@@ -1263,6 +1358,10 @@
<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="left_attach">0</property>
Modified: gnucash/branches/remove-group2/src/import-export/qif-import/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-import/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-import/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,13 +1,13 @@
TESTS=test-link
-noinst_PROGRAMS=test-link
+check_PROGRAMS=test-link
test_link_SOURCES = \
test-link.c
test_link_LDADD=../libgncmod-qif-import.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnome/libgncgnome.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
Modified: gnucash/branches/remove-group2/src/import-export/qif-io-core/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-io-core/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-io-core/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -44,3 +44,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif.core\"
Modified: gnucash/branches/remove-group2/src/import-export/qif-io-core/gncmod-qifiocore.c
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-io-core/gncmod-qifiocore.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-io-core/gncmod-qifiocore.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,44 +1,37 @@
/*********************************************************************
* gnc-mod-qifiocore.c
* module definition/initialization for the QIF i/o module
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <glib.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_qifiocore_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_qifiocore_LTX_gnc_module_current = 0;
-int libgncmod_qifiocore_LTX_gnc_module_revision = 0;
-int libgncmod_qifiocore_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_qifiocore_LTX_gnc_module_path(void);
-char *libgncmod_qifiocore_LTX_gnc_module_description(void);
-int libgncmod_qifiocore_LTX_gnc_module_init(int refcount);
-int libgncmod_qifiocore_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_qifiocore_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/qif-io/core");
}
-char *
-libgncmod_qifiocore_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Core components of QIF import/export (non-GUI)");
}
int
-libgncmod_qifiocore_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
return FALSE;
@@ -59,6 +52,6 @@
}
int
-libgncmod_qifiocore_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/import-export/qif-io-core/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/qif-io-core/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/qif-io-core/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,4 +1,4 @@
-LDADD=${top_builddir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS} -lltdl
+LDADD=${top_builddir}/src/gnc-module/libgnc-module.la ${GLIB_LIBS}
AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
Modified: gnucash/branches/remove-group2/src/import-export/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/import-export/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/import-export/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -7,10 +7,10 @@
-I${top_srcdir}/src/import-export \
${GUILE_INCS} \
${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
LDADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/test-core/libgncmod-test.la \
../libgncmod-generic-import.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
@@ -22,28 +22,23 @@
test-import-parse
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/import-export \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --gnc-module-dir ${top_srcdir}/src/app-utils \
- --gnc-module-dir ${top_srcdir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
+ --guile-load-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/lib/libqof/qof \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/import-export
+ --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/file \
+ --library-dir ${top_builddir}/src/network-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/import-export
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-link \
test-import-parse
Modified: gnucash/branches/remove-group2/src/network-utils/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/network-utils/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/network-utils/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -22,7 +22,11 @@
gncinclude_HEADERS = \
gnc-http.h
+libgncmod_network_utils_la_LDFLAGS = -avoid-version
+
libgncmod_network_utils_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GNOME_LIBS} ${QOF_LIBS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.net\"
Modified: gnucash/branches/remove-group2/src/network-utils/gncmod-network-utils.c
===================================================================
--- gnucash/branches/remove-group2/src/network-utils/gncmod-network-utils.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/network-utils/gncmod-network-utils.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,48 +1,41 @@
/*********************************************************************
* gncmod-netword-utils.c
* module definition/initialization for network communication utilities
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <glib.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_network_utils_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_network_utils_LTX_gnc_module_current = 0;
-int libgncmod_network_utils_LTX_gnc_module_revision = 0;
-int libgncmod_network_utils_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_network_utils_LTX_gnc_module_path(void);
-char *libgncmod_network_utils_LTX_gnc_module_description(void);
-int libgncmod_network_utils_LTX_gnc_module_init(int refcount);
-int libgncmod_network_utils_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_network_utils_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/network-utils");
}
-char *
-libgncmod_network_utils_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Utilities for performing network communication");
}
int
-libgncmod_network_utils_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
return TRUE;
}
int
-libgncmod_network_utils_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/network-utils/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/network-utils/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/network-utils/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -7,14 +7,16 @@
test-load-module
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
+ --gnc-module-dir ${top_builddir}/src/network-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/lib/libqof/qof \
- --gnc-module-dir ${top_builddir}/src/network-utils
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-noinst_PROGRAMS = \
+check_PROGRAMS = \
test-link-module
test_link_module_SOURCES=test-link-module.c
Modified: gnucash/branches/remove-group2/src/quotes/gnc-fq-check.in
===================================================================
--- gnucash/branches/remove-group2/src/quotes/gnc-fq-check.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/quotes/gnc-fq-check.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,7 +41,7 @@
# non-zero - failure
sub check_modules {
- my @modules = qw(Finance::Quote LWP HTML::Parser HTML::TableExtract Crypt::SSLeay);
+ my @modules = qw(Finance::Quote LWP HTML::Parser HTML::TableExtract Crypt::SSLeay Date::Manip);
my @missing;
foreach my $mod (@modules) {
Modified: gnucash/branches/remove-group2/src/quotes/gnc-fq-dump
===================================================================
--- gnucash/branches/remove-group2/src/quotes/gnc-fq-dump 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/quotes/gnc-fq-dump 2007-02-11 19:54:51 UTC (rev 15565)
@@ -21,7 +21,7 @@
use strict;
sub check_modules {
- my @modules = qw(Finance::Quote LWP HTML::TableExtract Crypt::SSLeay);
+ my @modules = qw(Finance::Quote LWP HTML::Parser HTML::TableExtract Crypt::SSLeay Date::Manip);
my @missing;
foreach my $mod (@modules) {
Modified: gnucash/branches/remove-group2/src/quotes/gnc-fq-helper.in
===================================================================
--- gnucash/branches/remove-group2/src/quotes/gnc-fq-helper.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/quotes/gnc-fq-helper.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -361,12 +361,12 @@
%quote_data = $quoter->fetch($quote_method_name, @$symbols);
}
- if(!%quote_data) {
+ if (%quote_data) {
+ print schemify_quotes($symbols, \%quote_data);
+ } else {
print "#f\n";
- exit 1;
}
- print schemify_quotes($symbols, \%quote_data);
STDOUT->flush();
}
Modified: gnucash/branches/remove-group2/src/quotes/gnc-fq-update.in
===================================================================
--- gnucash/branches/remove-group2/src/quotes/gnc-fq-update.in 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/quotes/gnc-fq-update.in 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,6 +39,7 @@
}
CPAN::Shell->install('LWP');
+CPAN::Shell->install('Date::Manip');
CPAN::Shell->install('HTML::Parser');
CPAN::Shell->install('HTML::TableExtract');
CPAN::Shell->install('Crypt::SSLeay');
Modified: gnucash/branches/remove-group2/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/register/ledger-core/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/ledger-core/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -23,14 +23,16 @@
split-register-model-save.h \
split-register-p.h
+libgncmod_ledger_core_la_LDFLAGS = -avoid-version
+
libgncmod_ledger_core_la_LIBADD = \
${top_builddir}/src/register/register-gnome/libgncmod-register-gnome.la \
${top_builddir}/src/register/register-core/libgncmod-register-core.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GLADE_LIBS} \
${GCONF_LIBS} \
${GUILE_LIBS} \
@@ -52,3 +54,6 @@
${GNOME_CFLAGS} \
${QOF_CFLAGS} \
${GLIB_CFLAGS}
+
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.ledger\"
Modified: gnucash/branches/remove-group2/src/register/ledger-core/gncmod-ledger-core.c
===================================================================
--- gnucash/branches/remove-group2/src/register/ledger-core/gncmod-ledger-core.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/ledger-core/gncmod-ledger-core.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,52 +1,47 @@
/*********************************************************************
* gncmod-ledgercore.c
* module definition/initialization for core (gui-independent) ledger
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_ledger_core_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_ledger_core_LTX_gnc_module_current = 0;
-int libgncmod_ledger_core_LTX_gnc_module_revision = 0;
-int libgncmod_ledger_core_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_ledger_core_LTX_gnc_module_path(void);
-char *libgncmod_ledger_core_LTX_gnc_module_description(void);
-int libgncmod_ledger_core_LTX_gnc_module_init(int refcount);
-
char *
-libgncmod_ledger_core_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/register/ledger-core");
}
-char *
-libgncmod_ledger_core_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Toolkit-independent GUI for financial ledgers");
}
int
-libgncmod_ledger_core_LTX_gnc_module_init(int refcount) {
- if(!gnc_module_load("gnucash/engine", 0))
+gnc_module_init(int refcount) {
+ if(!gnc_module_load("gnucash/engine", 0))
{
return FALSE;
}
- if(!gnc_module_load("gnucash/register/register-core", 0))
+ if(!gnc_module_load("gnucash/register/register-core", 0))
{
return FALSE;
}
- if(!gnc_module_load("gnucash/app-utils", 0))
+ if(!gnc_module_load("gnucash/app-utils", 0))
{
return FALSE;
}
Modified: gnucash/branches/remove-group2/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/branches/remove-group2/src/register/ledger-core/split-register.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/ledger-core/split-register.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1375,7 +1375,7 @@
// FIXME: For that matter, how could an open pending
// transaction ever not be the current trans?
if (xaccTransIsOpen (pending_trans)) {
- g_message("Impossible? commiting pending %p", pending_trans);
+ g_warning("Impossible? commiting pending %p", pending_trans);
xaccTransCommitEdit (pending_trans);
} else if (pending_trans)
g_assert_not_reached();
Modified: gnucash/branches/remove-group2/src/register/ledger-core/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/register/ledger-core/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/ledger-core/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,6 +1,6 @@
TESTS = test-link-module
-noinst_PROGRAMS = test-link-module
+check_PROGRAMS = test-link-module
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD=../libgncmod-ledger-core.la
Modified: gnucash/branches/remove-group2/src/register/register-core/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/register/register-core/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-core/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,10 +1,11 @@
SUBDIRS = . test
-PWD := $(shell pwd)
pkglib_LTLIBRARIES = libgncmod-register-core.la
+libgncmod_register_core_la_LDFLAGS = -avoid-version
+
libgncmod_register_core_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
@@ -63,3 +64,5 @@
${GLIB_CFLAGS}
CLEANFILES = $(BUILT_SOURCES)
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.core\"
Modified: gnucash/branches/remove-group2/src/register/register-core/gncmod-register-core.c
===================================================================
--- gnucash/branches/remove-group2/src/register/register-core/gncmod-register-core.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-core/gncmod-register-core.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,52 +1,47 @@
/*********************************************************************
* gncmod-registercore.c
* module definition/initialization for core (gui-independent) register
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_register_core_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_register_core_LTX_gnc_module_current = 0;
-int libgncmod_register_core_LTX_gnc_module_revision = 0;
-int libgncmod_register_core_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_register_core_LTX_gnc_module_path(void);
-char *libgncmod_register_core_LTX_gnc_module_description(void);
-int libgncmod_register_core_LTX_gnc_module_init(int refcount);
-
char *
-libgncmod_register_core_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/register/register-core");
}
-char *
-libgncmod_register_core_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Toolkit-independent GUI for ledger-like table displays");
}
int
-libgncmod_register_core_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
- if(!gnc_module_load("gnucash/engine", 0))
+ if(!gnc_module_load("gnucash/engine", 0))
{
return FALSE;
}
/* FIXME. We need this for the wide-character functions.
* When fixing, get rid of gnome-utils includes, too. */
- if(!gnc_module_load("gnucash/gnome-utils", 0))
+ if(!gnc_module_load("gnucash/gnome-utils", 0))
{
return FALSE;
}
Modified: gnucash/branches/remove-group2/src/register/register-core/table-allgui.c
===================================================================
--- gnucash/branches/remove-group2/src/register/register-core/table-allgui.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-core/table-allgui.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -821,7 +821,6 @@
}
LEAVE("out of bounds\n");
-
return;
}
@@ -1091,11 +1090,17 @@
/* OK, if there is a callback for this cell, call it */
cell = gnc_cellblock_get_cell (cb, cell_row, cell_col);
if (!cell)
- return FALSE;
-
+ {
+ LEAVE("no cell");
+ return FALSE;
+ }
+
io_flags = gnc_table_get_io_flags (table, virt_loc);
if (io_flags == XACC_CELL_ALLOW_READ_ONLY)
- return FALSE;
+ {
+ LEAVE("read only cell");
+ return FALSE;
+ }
enter = cell->enter_cell;
@@ -1127,7 +1132,6 @@
table->gui_handlers.redraw_help (table);
LEAVE("return %d\n", can_edit);
-
return can_edit;
}
@@ -1156,7 +1160,10 @@
/* OK, if there is a callback for this cell, call it */
cell = gnc_cellblock_get_cell (cb, cell_row, cell_col);
if (!cell)
- return;
+ {
+ LEAVE("no cell");
+ return;
+ }
leave = cell->leave_cell;
@@ -1180,6 +1187,7 @@
g_free (old_value);
}
+ LEAVE("");
}
gboolean
@@ -1244,6 +1252,7 @@
if (cancelled)
*cancelled = TRUE;
+ LEAVE("change cancelled");
return NULL;
}
@@ -1253,15 +1262,20 @@
/* OK, if there is a callback for this cell, call it */
cell = gnc_cellblock_get_cell (cb, cell_row, cell_col);
if (!cell)
- return NULL;
+ {
+ LEAVE("no cell");
+ return NULL;
+ }
mv = cell->modify_verify;
old_value = g_strdup (cell->value);
if (mv)
+ {
mv (cell, change, change_len, newval, newval_len,
cursor_position, start_selection, end_selection);
+ }
else
{
gnc_basic_cell_set_value (cell, newval);
@@ -1327,7 +1341,10 @@
ENTER ("\n");
if (cell->direct_update == NULL)
+ {
+ LEAVE("no direct update");
return FALSE;
+ }
old_value = g_strdup (cell->value);
@@ -1356,6 +1373,7 @@
if (table->gui_handlers.redraw_help)
table->gui_handlers.redraw_help (table);
+ LEAVE("");
return result;
}
@@ -1704,6 +1722,7 @@
PERR("destination (%d, %d) out of bounds (%d, %d)\n",
dest_loc->vcell_loc.virt_row, dest_loc->vcell_loc.virt_col,
table->num_virt_rows, table->num_virt_cols);
+ LEAVE("");
return TRUE;
}
@@ -1761,13 +1780,19 @@
}
if (!gnc_table_virtual_loc_valid(table, *dest_loc, FALSE))
- return TRUE;
+ {
+ LEAVE("");
+ return TRUE;
+ }
break;
case GNC_TABLE_TRAVERSE_POINTER:
if (!gnc_table_find_valid_cell_horiz(table, dest_loc, TRUE))
- return TRUE;
+ {
+ LEAVE("");
+ return TRUE;
+ }
break;
Modified: gnucash/branches/remove-group2/src/register/register-core/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/register/register-core/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-core/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,13 +2,13 @@
test-link-module
# test-load-module
-TESTS_ENVIRONMENT= \
- GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
- GUILE_LOAD_PATH=../../engine:..:../../gnc-module:${top_srcdir}/lib \
- LTDL_LIBRARY_PATH=.. \
- LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
+#GNC_TEST_DEPS := \
+#
-noinst_PROGRAMS = \
+#TESTS_ENVIRONMENT := \
+# $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
test-link-module
test_link_module_SOURCES=test-link-module.c
Modified: gnucash/branches/remove-group2/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,10 +2,12 @@
pkglib_LTLIBRARIES = libgncmod-register-gnome.la
+libgncmod_register_gnome_la_LDFLAGS = -avoid-version
+
libgncmod_register_gnome_la_LIBADD = \
${top_builddir}/src/register/register-core/libgncmod-register-core.la \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
@@ -63,3 +65,5 @@
${GTK_XIM_FLAGS} \
${QOF_CFLAGS} \
${GNOME_CFLAGS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.gnome\"
Modified: gnucash/branches/remove-group2/src/register/register-gnome/datecell-gnome.c
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/datecell-gnome.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/datecell-gnome.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -46,7 +46,7 @@
#include "gnucash-sheet.h"
-#define DATE_BUF 30
+#define DATE_BUF (MAX_DATE_LENGTH+1)
typedef struct _PopBox
{
Modified: gnucash/branches/remove-group2/src/register/register-gnome/gncmod-register-gnome.c
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/gncmod-register-gnome.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/gncmod-register-gnome.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,13 +1,13 @@
/*********************************************************************
* gncmod-register-gnome.c
* module definition/initialization for Gnome parts of register
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <glib.h>
+#include <gmodule.h>
#include "combocell.h"
#include "datecell.h"
@@ -20,31 +20,26 @@
#include "table-gnome.h"
/* version of the gnc module system interface we require */
-int libgncmod_register_gnome_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_register_gnome_LTX_gnc_module_current = 0;
-int libgncmod_register_gnome_LTX_gnc_module_revision = 0;
-int libgncmod_register_gnome_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_register_gnome_LTX_gnc_module_path(void);
-char *libgncmod_register_gnome_LTX_gnc_module_description(void);
-int libgncmod_register_gnome_LTX_gnc_module_init(int refcount);
-
char *
-libgncmod_register_gnome_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/register/register-gnome");
}
-char *
-libgncmod_register_gnome_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Gnome GUI for ledger-like table displays");
}
int
-libgncmod_register_gnome_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
if(!gnc_module_load("gnucash/register/register-core", 0)) {
return FALSE;
}
@@ -53,7 +48,7 @@
return FALSE;
}
- if (refcount == 0)
+ if (refcount == 0)
{
gnc_register_add_cell_type (COMBO_CELL_TYPE_NAME, gnc_combo_cell_new);
Modified: gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.c
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -160,10 +160,10 @@
date_picker_class->key_press_event = NULL;
}
-GtkType
+GType
gnc_date_picker_get_type (void)
{
- static GtkType gnc_date_picker_type = 0;
+ static GType gnc_date_picker_type = 0;
if (gnc_date_picker_type == 0)
{
Modified: gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.h
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/gnucash-date-picker.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -38,7 +38,7 @@
} GNCDatePicker;
-GtkType gnc_date_picker_get_type (void);
+GType gnc_date_picker_get_type (void);
GnomeCanvasItem *gnc_date_picker_new (GnomeCanvasGroup *parent);
Modified: gnucash/branches/remove-group2/src/register/register-gnome/gnucash-item-list.c
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/gnucash-item-list.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/gnucash-item-list.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -35,7 +35,6 @@
#include "gnc-engine.h"
#include "gnucash-item-list.h"
#include "gnucash-scrolled-window.h"
-#include "gtk-compat.h"
/* Item list signals */
enum {
Modified: gnucash/branches/remove-group2/src/register/register-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/register/register-gnome/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/register/register-gnome/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -2,22 +2,21 @@
test-link-module
# test-load-module
-TESTS_ENVIRONMENT= \
- GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
- GUILE_LOAD_PATH=../../engine:..:../../gnc-module:${top_srcdir}/lib \
- LTDL_LIBRARY_PATH=.. \
- LD_LIBRARY_PATH=${top_builddir}/src/gnc-module:${top_builddir}/src/gnc-module/.libs:${top_builddir}/src/engine:${top_builddir}/src/engine/.libs:${top_builddir}/src/calculation:${top_builddir}/src/calculation/.libs:${top_builddir}/src/network-utils:${top_builddir}/src/network-utils/.libs
+#GNC_TEST_DEPS := \
+#
-noinst_PROGRAMS = \
+#TESTS_ENVIRONMENT := \
+# $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
+check_PROGRAMS = \
test-link-module
test_link_module_SOURCES = test-link-module.c
test_link_module_LDADD = \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
- ../libgncmod-register-gnome.la
+ ../libgncmod-register-gnome.la
#EXTRA_DIST = test-load-module
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
-
+AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
Modified: gnucash/branches/remove-group2/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/locale-specific/us/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/locale-specific/us/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,8 +5,10 @@
libgncmod_locale_reports_us_la_SOURCES = \
gncmod-locale-reports-us.c
+libgncmod_locale_reports_us_la_LDFLAGS = -avoid-version
+
libgncmod_locale_reports_us_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GUILE_LIBS} \
${GLIB_LIBS}
@@ -55,3 +57,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.locale.us\"
Modified: gnucash/branches/remove-group2/src/report/locale-specific/us/gncmod-locale-reports-us.c
===================================================================
--- gnucash/branches/remove-group2/src/report/locale-specific/us/gncmod-locale-reports-us.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/locale-specific/us/gncmod-locale-reports-us.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,37 +1,28 @@
/*********************************************************************
* gncmod-locale-reports-us.c
* module definition/initialization for the US reports
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <glib.h>
-#include <locale.h>
-#include <string.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_locale_reports_us_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_locale_reports_us_LTX_gnc_module_current = 0;
-int libgncmod_locale_reports_us_LTX_gnc_module_revision = 0;
-int libgncmod_locale_reports_us_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_locale_reports_us_LTX_gnc_module_path(void);
-char *libgncmod_locale_reports_us_LTX_gnc_module_description(void);
-int libgncmod_locale_reports_us_LTX_gnc_module_init(int refcount);
-int libgncmod_locale_reports_us_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_locale_reports_us_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
/* const char *thislocale = setlocale(LC_ALL, NULL);
if (strncmp(thislocale, "de_DE", 5) == 0)
return g_strdup("gnucash/report/locale-specific/de_DE");
@@ -39,13 +30,13 @@
return g_strdup("gnucash/report/locale-specific/us");
}
-char *
-libgncmod_locale_reports_us_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("US income tax reports and related material");
}
int
-libgncmod_locale_reports_us_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the tax info */
#ifdef LOCALE_SPECIFIC_TAX
const char *thislocale = setlocale(LC_ALL, NULL);
@@ -56,10 +47,10 @@
#else
gboolean is_de_DE = FALSE;
#endif /* LOCALE_SPECIFIC_TAX */
- const char *tax_module = is_de_DE ?
- "gnucash/tax/de_DE" :
+ const char *tax_module = is_de_DE ?
+ "gnucash/tax/de_DE" :
"gnucash/tax/us";
- const char *report_taxtxf = is_de_DE ?
+ const char *report_taxtxf = is_de_DE ?
"(use-modules (gnucash report taxtxf-de_DE))" :
"(use-modules (gnucash report taxtxf))";
const char *report_locale = is_de_DE ?
@@ -78,14 +69,14 @@
}
/* load the report generation scheme code */
- if(scm_c_eval_string(report_taxtxf)
+ if(scm_c_eval_string(report_taxtxf)
== SCM_BOOL_F) {
- printf("failed to load %s\n", report_taxtxf);
+ g_warning("failed to load %s\n", report_taxtxf);
return FALSE;
}
/* Load the module scheme code */
- if(scm_c_eval_string(report_locale)
+ if(scm_c_eval_string(report_locale)
== SCM_BOOL_F) {
return FALSE;
}
@@ -94,6 +85,6 @@
}
int
-libgncmod_locale_reports_us_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/locale-specific/us/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/locale-specific/us/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,36 +1,26 @@
-TESTS = test-load-module test-link-module
+TESTS = test-load-module test-link-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/tax/us \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/tax/us \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --library-dir ${top_srcdir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/tax/us \
--library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_srcdir}/src/gnome
+ --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/calculation \
+ --library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
-noinst_PROGRAMS = test-link-module
+check_PROGRAMS = test-link-module
testit:
${TESTS_ENVIRONMENT} gdb guile
Modified: gnucash/branches/remove-group2/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,7 +1,4 @@
-SUBDIRS = .
-# test -- removed 'test' from SUBDIRS by jsled 2004.05.02 .. I don't know how
-# to get the test-link-mumble to link correctly; plz assist.
-PWD := $(shell pwd)
+SUBDIRS = . test
pkglib_LTLIBRARIES = libgncmod-report-gnome.la
@@ -38,9 +35,11 @@
gnc-plugin-page-report.h \
window-report.h
+libgncmod_report_gnome_la_LDFLAGS = -avoid-version
+
libgncmod_report_gnome_la_LIBADD = \
- ${top_builddir}/src/core-utils/libcore-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
@@ -96,3 +95,5 @@
CLEANFILES = gnucash report .scm-links ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-report-gnome.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.gui\"
Modified: gnucash/branches/remove-group2/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/gnc-plugin-page-report.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/gnc-plugin-page-report.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -41,10 +41,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "gtk-compat.h"
-#ifndef HAVE_GLIB26
-#include "gkeyfile.h"
-#endif
+#include <glib/gstdio.h>
#include <libguile.h>
#include <sys/stat.h>
#include <errno.h>
@@ -460,6 +457,7 @@
if (inst_report != SCM_BOOL_F) {
gnc_plugin_page_report_add_edited_report(priv, inst_report);
}
+ LEAVE("");
return;
} else {
LEAVE( " unknown URL type [%s] location [%s]", type, location );
@@ -1316,7 +1314,7 @@
if (!filepath)
return NULL;
- rc = stat (filepath, &statbuf);
+ rc = g_stat (filepath, &statbuf);
/* Check for an error that isn't a non-existant file. */
if (rc != 0 && errno != ENOENT)
Modified: gnucash/branches/remove-group2/src/report/report-gnome/gncmod-report-gnome.c
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/gncmod-report-gnome.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/gncmod-report-gnome.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,16 +1,16 @@
/*********************************************************************
* gncmod-report-gnome.c
- * module definition/initialization for the gnome report infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the gnome report infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <gmodule.h>
#include <gtk/gtk.h>
-#include <stdio.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -19,28 +19,22 @@
#include "window-report.h"
/* version of the gnc module system interface we require */
-int libgncmod_report_gnome_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_report_gnome_LTX_gnc_module_current = 0;
-int libgncmod_report_gnome_LTX_gnc_module_revision = 0;
-int libgncmod_report_gnome_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_report_gnome_LTX_gnc_module_path(void);
-char *libgncmod_report_gnome_LTX_gnc_module_description(void);
-int libgncmod_report_gnome_LTX_gnc_module_init(int refcount);
-int libgncmod_report_gnome_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_report_gnome_LTX_gnc_module_path(void)
+gnc_module_path(void)
{
return g_strdup("gnucash/report/report-gnome");
}
-char *
-libgncmod_report_gnome_LTX_gnc_module_description(void)
+char *
+gnc_module_description(void)
{
return g_strdup("Gnome component of GnuCash report generation system");
}
@@ -55,7 +49,7 @@
extern SCM scm_init_sw_report_gnome_module(void);
int
-libgncmod_report_gnome_LTX_gnc_module_init(int refcount)
+gnc_module_init(int refcount)
{
if(!gnc_module_load("gnucash/app-utils", 0)) {
return FALSE;
@@ -80,7 +74,7 @@
}
int
-libgncmod_report_gnome_LTX_gnc_module_end(int refcount)
+gnc_module_end(int refcount)
{
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/report/report-gnome/report.glade
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/report.glade 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/report.glade 2007-02-11 19:54:51 UTC (rev 15565)
@@ -16,6 +16,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -76,6 +77,10 @@
<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>
@@ -107,6 +112,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">name_entry</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="left_attach">0</property>
@@ -132,6 +141,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">template_combobox</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="left_attach">0</property>
@@ -169,6 +182,7 @@
<widget class="GtkComboBox" id="template_combobox">
<property name="visible">True</property>
<property name="items">Dummy Entry</property>
+ <property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -205,6 +219,7 @@
<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="GtkTable" id="view_contents_table">
@@ -232,6 +247,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -257,6 +274,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">available_view</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="left_attach">0</property>
@@ -282,6 +303,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">contents_view</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="left_attach">2</property>
@@ -312,6 +337,10 @@
<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>
@@ -367,6 +396,10 @@
<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>
@@ -422,6 +455,10 @@
<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>
@@ -460,6 +497,10 @@
<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>
@@ -495,6 +536,8 @@
<property name="reorderable">False</property>
<property name="enable_search">True</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -524,6 +567,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -595,6 +639,10 @@
<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="left_attach">0</property>
@@ -664,6 +712,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">row_spin</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="left_attach">0</property>
@@ -689,6 +741,10 @@
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">col_spin</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="left_attach">0</property>
@@ -723,6 +779,7 @@
<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">True</property>
<signal name="response" handler="gnc_options_dialog_response_cb" last_modification_time="Sun, 17 Aug 2003 21:50:36 GMT"/>
@@ -782,6 +839,10 @@
<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>
@@ -820,6 +881,10 @@
<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>
</child>
</widget>
@@ -892,6 +957,10 @@
<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>
@@ -948,6 +1017,7 @@
<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">True</property>
<child internal-child="vbox">
@@ -1018,6 +1088,10 @@
<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>
@@ -1097,6 +1171,8 @@
<property name="reorderable">False</property>
<property name="enable_search">False</property>
<property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
Modified: gnucash/branches/remove-group2/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,33 +1,29 @@
TESTS = \
test-link-module \
- test-load-module
+ test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_builddir}/src/scm \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/report-gnome \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --library-dir ${top_srcdir}/src/gnome-utils \
- --library-dir ${top_srcdir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/lib/libqof/qof \
+ --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/file \
+ --library-dir ${top_builddir}/src/network-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/report/report-system
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-LDADD = ../libgncmod-report-gnome.la
+LDADD = ../libgncmod-report-gnome.la
-noinst_PROGRAMS = test-link-module
+check_PROGRAMS = test-link-module
EXTRA_DIST = test-load-module
Modified: gnucash/branches/remove-group2/src/report/report-gnome/test/test-load-module
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/test/test-load-module 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/test/test-load-module 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,7 +5,7 @@
(debug-enable 'debug)
(debug-enable 'backtrace)
-(debug-set! stack 5000000)
+(debug-set! stack 500000)
(debug-set! maxdepth 10000)
(display " testing report module load ... ")
Modified: gnucash/branches/remove-group2/src/report/report-gnome/window-report.c
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/window-report.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/window-report.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -61,26 +61,6 @@
gnc_unset_busy_cursor (NULL);
}
-void
-gnc_print_report (int report_id)
-{
- gnc_html *html;
- char * location;
-
- html = gnc_html_new( GTK_WINDOW(gnc_ui_get_toplevel()) );
-
- gnc_set_busy_cursor (NULL, TRUE);
- location = g_strdup_printf("id=%d", report_id);
- gnc_html_show_url(html, URL_TYPE_REPORT, location, NULL, FALSE);
- g_free(location);
- gnc_unset_busy_cursor (NULL);
-
- gnc_html_print (html);
-
- gnc_html_destroy (html);
-}
-
-
/********************************************************************
* default parameters editor handling
********************************************************************/
@@ -332,54 +312,3 @@
gnc_html_register_url_handler (URL_TYPE_REPORT, gnc_html_report_url_cb);
gnc_html_register_url_handler (URL_TYPE_HELP, gnc_html_help_url_cb);
}
-
-
-void
-gnc_reports_show_all(QofSession *session)
-{
- GKeyFile *keyfile;
- const gchar *home, *url;
- gchar *encoded_url, *mdi_file, *mdi_group, *value;
- gchar **keys, **key;
- gint report_id;
-
- url = qof_session_get_url(session);
- if (!url)
- return;
- encoded_url = gnc_html_encode_string(url);
- if (!encoded_url)
- return;
-
- home = g_get_home_dir();
- if (!home) {
- g_free(encoded_url);
- return;
- }
-
- mdi_file = g_build_filename(home, ".gnome", "GnuCash", (gchar *)NULL);
- mdi_group = g_strdup_printf("MDI : %s", encoded_url);
-
- keyfile = gnc_key_file_load_from_file (mdi_file, FALSE, FALSE);
- if (keyfile) {
- keys = g_key_file_get_keys(keyfile, mdi_group, NULL, NULL);
- if (keys) {
- for (key = keys; *key; key++) {
- if (!strncmp(*key, MDI_CHILD_CONFIG, sizeof(MDI_CHILD_CONFIG)))
- continue;
- value = g_key_file_get_string(keyfile, mdi_group, *key, NULL);
- if (!value)
- continue;
- if (sscanf(value, "gnc-report:id=%d", &report_id) == 1) {
- gnc_main_window_open_report(report_id, NULL);
- }
- g_free(value);
- }
- g_strfreev(keys);
- }
- g_key_file_free(keyfile);
- }
-
- g_free(mdi_file);
- g_free(mdi_group);
- g_free(encoded_url);
-}
Modified: gnucash/branches/remove-group2/src/report/report-gnome/window-report.h
===================================================================
--- gnucash/branches/remove-group2/src/report/report-gnome/window-report.h 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-gnome/window-report.h 2007-02-11 19:54:51 UTC (rev 15565)
@@ -39,12 +39,9 @@
// [business-gnome/dialog-invoice.c;gnome/window-register.c]; and
// scm-exposed; 3-liner which calls gnc_main_window_open_report after handling busy-cursor.
void reportWindow(int id);
-// window-register; scm-exposed
-void gnc_print_report (int report_id);
// scm-exposed; ~priv
void gnc_report_raise_editor(SCM report);
// module[/plugin]-init
void gnc_report_init (void);
-void gnc_reports_show_all (QofSession *session);
#endif
Modified: gnucash/branches/remove-group2/src/report/report-system/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/report-system/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-system/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -11,8 +11,10 @@
gncinclude_HEADERS = \
gnc-report.h
+libgncmod_report_system_la_LDFLAGS = -avoid-version
+
libgncmod_report_system_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${GUILE_LIBS} \
${GLIB_LIBS}
@@ -77,3 +79,5 @@
CLEANFILES = gnucash report .scm-links ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-report-system.c
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.core\"
Modified: gnucash/branches/remove-group2/src/report/report-system/gncmod-report-system.c
===================================================================
--- gnucash/branches/remove-group2/src/report/report-system/gncmod-report-system.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-system/gncmod-report-system.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,47 +1,40 @@
/*********************************************************************
* gncmod-report-system.c
- * module definition/initialization for the report infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the report infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_report_system_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_report_system_LTX_gnc_module_current = 0;
-int libgncmod_report_system_LTX_gnc_module_revision = 0;
-int libgncmod_report_system_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_report_system_LTX_gnc_module_path(void);
-char *libgncmod_report_system_LTX_gnc_module_description(void);
-int libgncmod_report_system_LTX_gnc_module_init(int refcount);
-int libgncmod_report_system_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_report_system_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/report/report-system");
}
-char *
-libgncmod_report_system_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Core components of GnuCash report generation system");
}
extern SCM scm_init_sw_report_system_module(void);
int
-libgncmod_report_system_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the engine (we depend on it) */
if(!gnc_module_load("gnucash/engine", 0)) {
return FALSE;
@@ -51,7 +44,7 @@
return FALSE;
}
scm_init_sw_report_system_module();
-
+
scm_c_eval_string("(use-modules (gnucash report report-system))");
/* if this is the first time the module's being loaded, initialize
@@ -64,6 +57,6 @@
}
int
-libgncmod_report_system_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/report-system/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-system/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,34 +1,23 @@
TESTS = \
test-link-module \
- test-load-module
+ test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --library-dir ${top_srcdir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_srcdir}/src/gnome
+ --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/calculation \
+ --library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
-LDADD = ../libgncmod-report-system.la
-noinst_PROGRAMS = test-link-module
+check_PROGRAMS = test-link-module
EXTRA_DIST = test-load-module
Modified: gnucash/branches/remove-group2/src/report/report-system/test/test-load-module
===================================================================
--- gnucash/branches/remove-group2/src/report/report-system/test/test-load-module 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/report-system/test/test-load-module 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,7 +5,7 @@
(debug-enable 'debug)
(debug-enable 'backtrace)
-(debug-set! stack 5000000)
+(debug-set! stack 500000)
(debug-set! maxdepth 10000)
(display " testing report module load ... ")
Modified: gnucash/branches/remove-group2/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -3,9 +3,12 @@
pkglib_LTLIBRARIES = libgncmod-standard-reports.la
libgncmod_standard_reports_la_SOURCES = \
- gncmod-standard-reports.c
+ gncmod-standard-reports.c
+
+libgncmod_standard_reports_la_LDFLAGS = -avoid-version
+
libgncmod_standard_reports_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GUILE_LIBS} \
${GLIB_LIBS}
@@ -63,3 +66,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.standard\"
Modified: gnucash/branches/remove-group2/src/report/standard-reports/budget.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/budget.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/budget.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -31,7 +31,6 @@
(use-modules (gnucash gnc-module))
(require 'printf)
-(require 'sort)
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
Modified: gnucash/branches/remove-group2/src/report/standard-reports/cash-flow.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/cash-flow.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/cash-flow.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -33,7 +33,6 @@
(use-modules (gnucash gnc-module))
(require 'printf)
-(require 'sort)
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url
Modified: gnucash/branches/remove-group2/src/report/standard-reports/gncmod-standard-reports.c
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/gncmod-standard-reports.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/gncmod-standard-reports.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,45 +1,38 @@
/*********************************************************************
* gncmod-standard-reports.c
- * module definition/initialization for the standard reports
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the standard reports
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_standard_reports_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_standard_reports_LTX_gnc_module_current = 0;
-int libgncmod_standard_reports_LTX_gnc_module_revision = 0;
-int libgncmod_standard_reports_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_standard_reports_LTX_gnc_module_path(void);
-char *libgncmod_standard_reports_LTX_gnc_module_description(void);
-int libgncmod_standard_reports_LTX_gnc_module_init(int refcount);
-int libgncmod_standard_reports_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_standard_reports_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/report/standard-reports");
}
-char *
-libgncmod_standard_reports_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Standard income, asset, balance sheet, etc. reports");
}
int
-libgncmod_standard_reports_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the report system */
if(!gnc_module_load("gnucash/report/report-system", 0)) {
return FALSE;
@@ -49,12 +42,11 @@
if(scm_c_eval_string("(use-modules (gnucash report standard-reports))") ==
SCM_BOOL_F) {
return FALSE;
- }
+ }
return TRUE;
}
int
-libgncmod_standard_reports_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
-
Modified: gnucash/branches/remove-group2/src/report/standard-reports/register.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/register.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/register.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -8,8 +8,6 @@
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
-(require 'record)
-
(gnc:module-load "gnucash/report/report-system" 0)
(define-macro (addto! alist element)
Modified: gnucash/branches/remove-group2/src/report/standard-reports/standard-reports.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/standard-reports.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/standard-reports.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -13,7 +13,6 @@
(export gnc:register-report-hook)
(require 'hash-table)
-(require 'record)
(define gnc:*register-report-hash* (make-hash-table 23))
Modified: gnucash/branches/remove-group2/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,28 +1,17 @@
-TESTS=test-load-module
+TESTS=test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/report/standard-reports \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --library-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/gnome
+ --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/calculation \
+ --library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/standard-reports/transaction.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -37,7 +37,6 @@
(use-modules (gnucash gnc-module))
(require 'printf)
-(require 'record)
(gnc:module-load "gnucash/report/report-system" 0)
Modified: gnucash/branches/remove-group2/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/stylesheets/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/stylesheets/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -9,13 +9,13 @@
noinst_HEADERS = \
gnc-plugin-stylesheets.h
-libgncmod_stylesheets_la_LDFLAGS=-module
+libgncmod_stylesheets_la_LDFLAGS = -module -avoid-version
libgncmod_stylesheets_la_LIBADD = \
${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${QOF_LIBS} \
${GUILE_LIBS} \
${GLIB_LIBS}
@@ -69,3 +69,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.core\"
Modified: gnucash/branches/remove-group2/src/report/stylesheets/gncmod-stylesheets.c
===================================================================
--- gnucash/branches/remove-group2/src/report/stylesheets/gncmod-stylesheets.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/stylesheets/gncmod-stylesheets.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,14 +1,13 @@
/*********************************************************************
* gncmod-stylesheets.c
- * module definition/initialization for the standard reports
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the standard reports
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <gtk/gtk.h>
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
#include "gnc-module.h"
@@ -16,32 +15,26 @@
#include "gnc-plugin-stylesheets.h"
/* version of the gnc module system interface we require */
-int libgncmod_stylesheets_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_stylesheets_LTX_gnc_module_current = 0;
-int libgncmod_stylesheets_LTX_gnc_module_revision = 0;
-int libgncmod_stylesheets_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_stylesheets_LTX_gnc_module_path(void);
-char *libgncmod_stylesheets_LTX_gnc_module_description(void);
-int libgncmod_stylesheets_LTX_gnc_module_init(int refcount);
-int libgncmod_stylesheets_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_stylesheets_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/report/stylesheets");
}
-char *
-libgncmod_stylesheets_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Standard report stylesheet definitions");
}
int
-libgncmod_stylesheets_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the report system */
if(!gnc_module_load("gnucash/report/report-system", 0)) {
return FALSE;
@@ -52,14 +45,14 @@
SCM_BOOL_F) {
return FALSE;
}
-
+
/* Add menu items with C callbacks */
gnc_plugin_stylesheets_create_plugin();
-
+
return TRUE;
}
int
-libgncmod_stylesheets_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/stylesheets/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/stylesheets/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,29 +1,22 @@
-TESTS=test-load-module
+TESTS=test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/scm \
--gnc-module-dir ${top_builddir}/src/engine \
--gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/report/utility-reports \
--gnc-module-dir ${top_builddir}/src/report/stylesheets \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnome-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/report/stylesheets \
- --guile-load-dir ${top_builddir}/src/gnome-utils \
- --guile-load-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/lib/libqof/qof \
- --library-dir ${top_builddir}/src/gnome
+ --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/file \
+ --library-dir ${top_builddir}/src/network-utils \
+ --library-dir ${top_builddir}/src/calculation \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/report/report-system \
+ --library-dir ${top_builddir}/src/report/report-gnome
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/remove-group2/src/report/stylesheets/test/test-load-module
===================================================================
--- gnucash/branches/remove-group2/src/report/stylesheets/test/test-load-module 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/stylesheets/test/test-load-module 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
exec guile -s "$0"
!#
Modified: gnucash/branches/remove-group2/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/utility-reports/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/utility-reports/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,11 +5,11 @@
libgncmod_utility_reports_la_SOURCES = \
gncmod-utility-reports.c
libgncmod_utility_reports_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GUILE_LIBS} \
${GLIB_LIBS}
-libgncmod_utility_reports_la_LDFLAGS = -module
+libgncmod_utility_reports_la_LDFLAGS = -module -avoid-version
AM_CFLAGS = \
-I${top_srcdir}/src \
@@ -52,3 +52,5 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
+
+INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.util\"
Modified: gnucash/branches/remove-group2/src/report/utility-reports/gncmod-utility-reports.c
===================================================================
--- gnucash/branches/remove-group2/src/report/utility-reports/gncmod-utility-reports.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/utility-reports/gncmod-utility-reports.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,45 +1,38 @@
/*********************************************************************
* gncmod-utility-reports.c
- * module definition/initialization for the utility reports
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the utility reports
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <glib.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_utility_reports_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_utility_reports_LTX_gnc_module_current = 0;
-int libgncmod_utility_reports_LTX_gnc_module_revision = 0;
-int libgncmod_utility_reports_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_utility_reports_LTX_gnc_module_path(void);
-char *libgncmod_utility_reports_LTX_gnc_module_description(void);
-int libgncmod_utility_reports_LTX_gnc_module_init(int refcount);
-int libgncmod_utility_reports_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_utility_reports_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/report/utility-reports");
}
-char *
-libgncmod_utility_reports_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Non-financial (utility) reports");
}
int
-libgncmod_utility_reports_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* load the report system */
if(!gnc_module_load("gnucash/report/report-system", 0)) {
return FALSE;
@@ -50,11 +43,11 @@
SCM_BOOL_F) {
return FALSE;
}
-
+
return TRUE;
}
int
-libgncmod_utility_reports_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/report/utility-reports/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/report/utility-reports/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,28 +1,17 @@
-TESTS = test-load-module
+TESTS = test-load-module
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
- --gnc-module-dir ${top_builddir}/src/core-utils \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/scm \
- --gnc-module-dir ${top_builddir}/src/gnome \
- --gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--gnc-module-dir ${top_builddir}/src/report/utility-reports \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
- --gnc-module-dir ${top_builddir}/src/network-utils \
- --gnc-module-dir ${top_srcdir}/src/gnc-module \
- --gnc-module-dir ${top_srcdir}/src/engine \
- --guile-load-dir ${top_srcdir}/src/scm \
- --guile-load-dir ${top_srcdir}/src/app-utils \
- --guile-load-dir ${top_srcdir}/src/gnome-utils \
- --guile-load-dir ${top_srcdir}/src/gnome \
- --guile-load-dir ${top_srcdir}/src/report/report-system \
- --guile-load-dir ${top_srcdir}/src/report/utility-reports \
- --library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/lib/libqof/qof
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/lib/libqof/qof \
+ --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/calculation \
+ --library-dir ${top_builddir}/src/app-utils
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
Modified: gnucash/branches/remove-group2/src/scm/fin.scm
===================================================================
--- gnucash/branches/remove-group2/src/scm/fin.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/scm/fin.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -17,9 +17,13 @@
;; Copyright 2002 Joshua Sled <jsled at asynchronous.org>
;;
+
+;; Simple function for testing:
+(define (gnc:foobar val) val)
+
;; pretty literal copies of similar code from gnumeric-1.0.8, except we want
-;; positive values to be returned [as gnucash will handle the credit/debit
-;; appropriately]
+;; positive values to be returned (as gnucash will handle the credit/debit
+;; appropriately)
(define (gnc:ipmt rate per nper pv fv type)
(* -1 (* rate
@@ -41,8 +45,6 @@
(define (gnc:pmt rate nper pv fv type)
(* -1 (calc-pmt rate nper pv fv type)))
-(define (gnc:foobar val) val)
-
;;;;;
;; below: not-exposed/"private" functions, used by the "public" functions
;; above.
@@ -72,3 +74,84 @@
rate)))
)
+
+;; This section added in 2005. Ludovic Nicolle
+;; Formula to get the rate for a given period if there are yper in the year
+;; And the official rate is compounded ycomp in the year.
+;; For example, a mortgage being monthly has yper = 12
+;; and if the posted rate is a plain annual rate, then ycomp = 1.
+;; but if the posted rate is compounded semi-annually, as is the case in Canada,
+;; then ycomp = 2.
+;; this function can be used to enter the nominal rate in the formulas, without
+;; pre-calculating the power function below.
+
+(define (gnc:periodic_rate rate yper ycomp)
+ (- (expt (+ 1.0 (/ rate ycomp)) (/ ycomp yper) ) 1.0)
+)
+
+;; the three following functions with prefix gnc:cpd_ are more generic equivalents of
+;; gnc:pmt, gnc:ipmt and gnc:ppmt above, with some differences.
+;; First difference is that they take the annual nominal rate and two yearly frequencies:
+;; rate is annual, not per period (the functions calculate it themselves)
+;; yfreq determines the compounding frequency of the payed/charged interest
+;; ycomp determines the compounding frequency of the annual nominal rate
+
+;; Second difference is for rounding. My experience shows that all banks do not use
+;; the exact same rounding parameters. Moreover, on top of that situation, numerical calculations
+;; in gnucash using the original gnc:pmt, gnc:ipmt and gnc:ppmt functions above can also
+;; create another set of rounding issues. Both problems create the "odd-penny imbalance" problem.
+
+;; So the gnc:cpd_Zpmt functions do automatic rounding, the goal being to have PPMT = PMT - I
+;; holding true for all calculated numbers. However, this won't fix the first problem if your bank
+;; can't do proper maths and manual fixing of transactions will still be required.
+
+;; One problem with the rounding procedure in these three functions is that it is always
+;; rounding at the second decimal. This works great with dollars and euros and a lot of major
+;; currencies but might well cause issues with other currencies not typically divided in 100.
+;; I have not tested anything else than dollars.
+
+;; If the automatic rounding causes issues for a particular case, one can always use the
+;; equivalence of the cpd_ and non-cpd_ functions, by using periodic_rate() like this:
+;; gnc:cpd_pmt( rate:yfreq:ycomp :nper:pv:fv:type)
+;; is equivalent to gnc:pmt(periodic_rate(rate:yfreq:ycomp):nper:pv:fv:type)
+
+;; On the opposite side, if you want the automatic rounding but don't understand how to use
+;; the cpd_ functions, here is a quick example on how to convert original gnc:Zpmt
+;; function calls. The typical setup is to use 'rate/yfreq' as the first parameter, so the
+;; slution is to simply use yfreq for both yfreq and ycomp in the gnc:cpd_Zpmt calls, like this:
+;; gnc:pmt( rate / yfreq :nper:pv:fv:type)
+;; is equivalent to gnc:cpd_pmt( rate:yfreq:yfreq :nper:pv:fv:type)
+
+(define (gnc:cpd_ipmt rate yfreq ycomp per nper pv fv type)
+ (* 0.01
+ (round
+ (* -100 (* (gnc:periodic_rate rate yfreq ycomp)
+ (- 0 (calc-principal pv
+ (calc-pmt (gnc:periodic_rate rate yfreq ycomp) nper pv fv type)
+ (gnc:periodic_rate rate yfreq ycomp) (- per 1))))
+ )
+ )
+ )
+)
+
+(define (gnc:cpd_ppmt rate yfreq ycomp per nper pv fv type)
+ (let* (
+ (per_rate (gnc:periodic_rate rate yfreq ycomp))
+ (pmt (* -1 (gnc:cpd_pmt rate yfreq ycomp nper pv fv type)))
+ (ipmt (* per_rate (calc-principal pv pmt per_rate (- per 1))))
+ )
+ (
+ * -1 (+ pmt ipmt)
+ )
+ )
+)
+
+(define (gnc:cpd_pmt rate yfreq ycomp nper pv fv type)
+ (* 0.01
+ (round
+ (* -100
+ (calc-pmt (gnc:periodic_rate rate yfreq ycomp) nper pv fv type)
+ )
+ )
+ )
+)
Modified: gnucash/branches/remove-group2/src/scm/price-quotes.scm
===================================================================
--- gnucash/branches/remove-group2/src/scm/price-quotes.scm 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/scm/price-quotes.scm 2007-02-11 19:54:51 UTC (rev 15565)
@@ -30,8 +30,8 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))
-(use-modules (sw_gnome_utils)) ;; for gnucash-ui-is-running
+(gnc:module-load "gnucash/gnome-utils" 0) ;; for gnucash-ui-is-running
(gnc:module-load "gnucash/app-utils" 0)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Modified: gnucash/branches/remove-group2/src/tax/us/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/tax/us/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/tax/us/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -5,6 +5,8 @@
libgncmod_tax_us_la_SOURCES = \
gncmod-tax-us.c
+libgncmod_tax_us_la_LDFLAGS = -avoid-version
+
libgncmod_tax_us_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS}
Modified: gnucash/branches/remove-group2/src/tax/us/gncmod-tax-us.c
===================================================================
--- gnucash/branches/remove-group2/src/tax/us/gncmod-tax-us.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/tax/us/gncmod-tax-us.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,37 +1,28 @@
/*********************************************************************
* gncmod-tax-us.c
- * module definition/initialization for us tax info
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for us tax info
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include <libguile.h>
-#include <locale.h>
-#include <string.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_tax_us_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_tax_us_LTX_gnc_module_current = 0;
-int libgncmod_tax_us_LTX_gnc_module_revision = 0;
-int libgncmod_tax_us_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_tax_us_LTX_gnc_module_path(void);
-char *libgncmod_tax_us_LTX_gnc_module_description(void);
-int libgncmod_tax_us_LTX_gnc_module_init(int refcount);
-int libgncmod_tax_us_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_tax_us_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
#ifdef LOCALE_SPECIFIC_TAX
const char *thislocale = setlocale(LC_ALL, NULL);
if (strncmp(thislocale, "de_DE", 5) == 0)
@@ -41,13 +32,13 @@
return g_strdup("gnucash/tax/us");
}
-char *
-libgncmod_tax_us_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("US income tax information");
}
static void
-lmod(char * mn)
+lmod(char * mn)
{
char * form = g_strdup_printf("(use-modules %s)\n", mn);
scm_c_eval_string(form);
@@ -55,7 +46,7 @@
}
int
-libgncmod_tax_us_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
/* This is a very simple hack that loads the (new, special) German
tax definition file in a German locale, or (default) loads the
previous US tax file. */
@@ -70,6 +61,6 @@
}
int
-libgncmod_tax_us_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/tax/us/test/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/tax/us/test/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/tax/us/test/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,28 +1,18 @@
-TESTS = test-link-module test-load-module
+TESTS = test-link-module test-load-module
# Some of these dirs may not be needed anymore.
GNC_TEST_DEPS := \
- --gnc-module-dir ${top_builddir}/src/gnc-module \
- --gnc-module-dir ${top_builddir}/src/engine \
- --gnc-module-dir ${top_builddir}/src/report/report-system \
- --gnc-module-dir ${top_builddir}/src/report/utility-reports \
- --gnc-module-dir ${top_builddir}/src/report/stylesheets \
- --gnc-module-dir ${top_builddir}/src/app-utils \
- --gnc-module-dir ${top_builddir}/src/calculation \
--gnc-module-dir ${top_builddir}/src/tax/us \
- --gnc-module-dir ${top_srcdir}/src/tax/us \
- --guile-load-dir ${top_builddir}/src/scm \
- --guile-load-dir ${top_builddir}/lib \
- --guile-load-dir ${top_builddir}/src/gnome-utils \
- --guile-load-dir ${top_builddir}/src/gnome \
- --library-dir ${top_builddir}/src/gnome-utils \
- --library-dir ${top_builddir}/src/gnome
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/tax/us \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
TESTS_ENVIRONMENT := \
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
-noinst_PROGRAMS=test-link-module
+check_PROGRAMS=test-link-module
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD=../libgncmod-tax-us.la ${GUILE_LIBS} ${GLIB_LIBS}
Modified: gnucash/branches/remove-group2/src/test-core/Makefile.am
===================================================================
--- gnucash/branches/remove-group2/src/test-core/Makefile.am 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/test-core/Makefile.am 2007-02-11 19:54:51 UTC (rev 15565)
@@ -3,7 +3,7 @@
libgncmod_test_la_SOURCES = gncmod-test.c test-stuff.c
libgncmod_test_la_LDFLAGS = -module
libgncmod_test_la_LIBADD = \
- ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/gnc-module/libgnc-module.la \
${GLIB_LIBS}
noinst_HEADERS=test-stuff.h
Modified: gnucash/branches/remove-group2/src/test-core/gncmod-test.c
===================================================================
--- gnucash/branches/remove-group2/src/test-core/gncmod-test.c 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/test-core/gncmod-test.c 2007-02-11 19:54:51 UTC (rev 15565)
@@ -1,47 +1,41 @@
/*********************************************************************
* gncmod-test.c
- * module definition/initialization for the test infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
+ * module definition/initialization for the test infrastructure
+ *
+ * Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
#include <stdio.h>
-#include <glib.h>
+#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
/* version of the gnc module system interface we require */
-int libgncmod_test_LTX_gnc_module_system_interface = 0;
+int gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
-int libgncmod_test_LTX_gnc_module_current = 0;
-int libgncmod_test_LTX_gnc_module_revision = 0;
-int libgncmod_test_LTX_gnc_module_age = 0;
+int gnc_module_current = 0;
+int gnc_module_revision = 0;
+int gnc_module_age = 0;
-/* forward references */
-char *libgncmod_test_LTX_gnc_module_path(void);
-char *libgncmod_test_LTX_gnc_module_description(void);
-int libgncmod_test_LTX_gnc_module_init(int refcount);
-int libgncmod_test_LTX_gnc_module_end(int refcount);
-
char *
-libgncmod_test_LTX_gnc_module_path(void) {
+gnc_module_path(void) {
return g_strdup("gnucash/test");
}
-char *
-libgncmod_test_LTX_gnc_module_description(void) {
+char *
+gnc_module_description(void) {
return g_strdup("Basic GnuCash test infrastructure.");
}
int
-libgncmod_test_LTX_gnc_module_init(int refcount) {
+gnc_module_init(int refcount) {
return TRUE;
}
int
-libgncmod_test_LTX_gnc_module_end(int refcount) {
+gnc_module_end(int refcount) {
return TRUE;
}
Modified: gnucash/branches/remove-group2/src/valgrind-gnucash.supp
===================================================================
--- gnucash/branches/remove-group2/src/valgrind-gnucash.supp 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/src/valgrind-gnucash.supp 2007-02-11 19:54:51 UTC (rev 15565)
@@ -49,12 +49,6 @@
}
{
- libltdl.so.3(Value1)
- Memcheck:Value1
- obj:/usr/lib/libltdl.so.3
-}
-
-{
libglib-1.2.so.0(Value4)
Memcheck:Value4
fun:g_hash_table_lookup
Modified: gnucash/branches/remove-group2/util/glade-fixup
===================================================================
--- gnucash/branches/remove-group2/util/glade-fixup 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/util/glade-fixup 2007-02-11 19:54:51 UTC (rev 15565)
@@ -15,12 +15,25 @@
fi
find ${SEARCHDIRS} -name \*.glade | xargs \
- sed -i -e '/name="focus_on_map"/d' \
- -e '/name="ellipsize"/d' \
- -e '/name="width_chars"/d' \
- -e '/name="single_line_mode"/d' \
- -e '/name="urgency_hint"/d' \
- -e '/name="hover_expand"/d' \
- -e '/name="hover_selection"/d' \
- -e '/name="add_tearoffs"/d' \
- -e '/name="angle"/d'
+ sed -i -e '/name="urgency_hint"/d' \
+ -e '/name="pack_direction"/d' \
+ -e '/name="child_pack_direction"/d'
+
+# GTK 2.6 (now allowed)
+# add_tearoffs
+# angle
+# ellipsize
+# focus_on_map
+# hover_expand
+# hover_selection
+# single_line_mode
+# width_chars
+#
+# GTK 2.8
+# child_pack_direction
+# pack_direction
+# urgency_hint
+#
+# GTK 2.10
+# (none)
+#
Modified: gnucash/branches/remove-group2/util/gnc-svnversion
===================================================================
--- gnucash/branches/remove-group2/util/gnc-svnversion 2007-02-11 17:30:54 UTC (rev 15564)
+++ gnucash/branches/remove-group2/util/gnc-svnversion 2007-02-11 19:54:51 UTC (rev 15565)
@@ -4,7 +4,7 @@
# gnc-svnversion <srcdir>
#
# Prints the revision number to stdout and exits 0 on success
-# exits with errorcode 1 if we're not in an svn or svk checkout
+# exits with errorcode 1 if we're not in an svn, svk or git checkout
#
# Written By: Derek Atkins <derek at ihtfp.com>
#
@@ -40,8 +40,21 @@
exit $?
fi
-# If we get here then this is NOT an svn checkout. Maybe it's
-# SVK? First, check if we've got 'svk' in the path. If not,
+# If we get here then this is NOT an svn checkout.
+
+# Maybe it's git?
+if test -d "${real_srcdir}"/.git
+then
+ githead=`git --git-dir "${real_srcdir}"/.git rev-parse HEAD 2>/dev/null`
+ if test $? = 0 ; then
+ echo $githead
+ exit 0
+ else
+ exit 1
+ fi
+fi
+
+# Maybe it's SVK? First, check if we've got 'svk' in the path. If not,
# then exit with an error code of 1..
which svk >/dev/null 2>&1
if test $? != 0 ; then exit 1 ; fi
More information about the gnucash-changes
mailing list