[PATCH] Register rewrite Update, remove update for next release.

This update removes the register2 changes for the next release
as it is not complete yet.

Author: Robert Fewell

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23314 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2013-10-22 18:26:55 +00:00
parent a0f4d98543
commit 22eff28f0b
45 changed files with 178 additions and 29951 deletions

View File

@ -1,13 +1,14 @@
# This is a list of files which contain translatable strings.
# This file was generated by ../make-gnucash-potfiles.
src/app-utils/QuickFill.c
src/app-utils/business-helpers.c
src/app-utils/business-options.c
src/app-utils/calculation/expression_parser.c
src/app-utils/calculation/fin.c
src/app-utils/file-utils.c
src/app-utils/gfec.c
src/app-utils/gnc-accounting-period.c
src/app-utils/gnc-account-merge.c
src/app-utils/gnc-accounting-period.c
src/app-utils/gnc-addr-quickfill.c
src/app-utils/gnc-component-manager.c
src/app-utils/gnc-entry-quickfill.c
@ -15,16 +16,15 @@ src/app-utils/gnc-euro.c
src/app-utils/gnc-exp-parser.c
src/app-utils/gnc-gettext-util.c
src/app-utils/gnc-gsettings.c
src/app-utils/gnc-helpers.c
src/app-utils/gnc-help-utils.c
src/app-utils/gncmod-app-utils.c
src/app-utils/gnc-helpers.c
src/app-utils/gnc-prefs-utils.c
src/app-utils/gnc-sx-instance-model.c
src/app-utils/gnc-ui-balances.c
src/app-utils/gnc-ui-util.c
src/app-utils/gncmod-app-utils.c
src/app-utils/guile-util.c
src/app-utils/option-util.c
src/app-utils/QuickFill.c
src/backend/dbi/gnc-backend-dbi.c
src/backend/sql/escape.c
src/backend/sql/gnc-account-sql.c
@ -76,12 +76,12 @@ src/backend/xml/io-gncxml-gen.c
src/backend/xml/io-gncxml-v1.c
src/backend/xml/io-gncxml-v2.c
src/backend/xml/io-utils.c
src/backend/xml/sixtp.c
src/backend/xml/sixtp-dom-generators.c
src/backend/xml/sixtp-dom-parsers.c
src/backend/xml/sixtp-stack.c
src/backend/xml/sixtp-to-dom-parser.c
src/backend/xml/sixtp-utils.c
src/backend/xml/sixtp.c
src/bin/gnucash-bin.c
src/business/business-gnome/business-gnome-utils.c
src/business/business-gnome/business-options-gnome.c
@ -96,10 +96,10 @@ src/business/business-gnome/dialog-job.c
src/business/business-gnome/dialog-order.c
src/business/business-gnome/dialog-payment.c
src/business/business-gnome/dialog-vendor.c
src/business/business-gnome/gncmod-business-gnome.c
src/business/business-gnome/gnc-plugin-business.c
src/business/business-gnome/gnc-plugin-page-invoice.c
src/business/business-gnome/gnc-plugin-page-owner-tree.c
src/business/business-gnome/gncmod-business-gnome.c
src/business/business-gnome/gtkbuilder/business-options-gnome.glade
src/business/business-gnome/gtkbuilder/business-prefs.glade
src/business/business-gnome/gtkbuilder/dialog-billterms.glade
@ -133,99 +133,47 @@ src/core-utils/gnc-prefs.c
src/core-utils/gnc-uri-utils.c
src/doc/doxygen_main_page.c
src/engine/Account.c
src/engine/Query.c
src/engine/Recurrence.c
src/engine/SX-book.c
src/engine/SX-ttinfo.c
src/engine/SchedXaction.c
src/engine/Scrub.c
src/engine/Scrub2.c
src/engine/Scrub3.c
src/engine/Split.c
src/engine/TransLog.c
src/engine/Transaction.c
src/engine/cap-gains.c
src/engine/cashobjects.c
src/engine/engine-helpers.c
src/engine/glib-helpers.c
src/engine/gncAddress.c
src/engine/gncBillTerm.c
src/engine/gnc-budget.c
src/engine/gncBusGuile.c
src/engine/gncBusiness.c
src/engine/gnc-commodity.c
src/engine/gncCustomer.c
src/engine/gncEmployee.c
src/engine/gnc-engine.c
src/engine/gncEntry.c
src/engine/gnc-event.c
src/engine/gnc-hooks.c
src/engine/gnc-lot.c
src/engine/gnc-pricedb.c
src/engine/gnc-session.c
src/engine/gncAddress.c
src/engine/gncBillTerm.c
src/engine/gncBusGuile.c
src/engine/gncBusiness.c
src/engine/gncCustomer.c
src/engine/gncEmployee.c
src/engine/gncEntry.c
src/engine/gncIDSearch.c
src/engine/gncInvoice.c
src/engine/gncJob.c
src/engine/gnc-lot.c
src/engine/gncmod-engine.c
src/engine/gncOrder.c
src/engine/gncOwner.c
src/engine/gnc-pricedb.c
src/engine/gnc-session.c
src/engine/gncTaxTable.c
src/engine/gncVendor.c
src/engine/gncmod-engine.c
src/engine/kvp-scm.c
src/engine/policy.c
src/engine/Query.c
src/engine/Recurrence.c
src/engine/SchedXaction.c
src/engine/Scrub2.c
src/engine/Scrub3.c
src/engine/Scrub.c
src/engine/Split.c
src/engine/SX-book.c
src/engine/SX-ttinfo.c
src/engine/Transaction.c
src/engine/TransLog.c
src/gnc-module/gnc-module.c
src/gnome/assistant-acct-period.c
src/gnome/assistant-hierarchy.c
src/gnome/assistant-loan.c
src/gnome/assistant-stock-split.c
src/gnome/dialog-commodities.c
src/gnome/dialog-fincalc.c
src/gnome/dialog-find-transactions2.c
src/gnome/dialog-find-transactions.c
src/gnome/dialog-lot-viewer.c
src/gnome/dialog-new-user.c
src/gnome/dialog-price-edit-db.c
src/gnome/dialog-price-editor.c
src/gnome/dialog-print-check2.c
src/gnome/dialog-print-check.c
src/gnome/dialog-progress.c
src/gnome/dialog-sx-editor2.c
src/gnome/dialog-sx-editor.c
src/gnome/dialog-sx-from-trans.c
src/gnome/dialog-sx-since-last-run.c
src/gnome/dialog-tax-info.c
src/gnome/gnc-budget-view.c
src/gnome/gnc-plugin-account-tree.c
src/gnome/gnc-plugin-basic-commands.c
src/gnome/gnc-plugin-budget.c
src/gnome/gnc-plugin-page-account-tree.c
src/gnome/gnc-plugin-page-budget.c
src/gnome/gnc-plugin-page-register2.c
src/gnome/gnc-plugin-page-register.c
src/gnome/gnc-plugin-page-sx-list.c
src/gnome/gnc-plugin-register2.c
src/gnome/gnc-plugin-register.c
src/gnome/gnc-split-reg2.c
src/gnome/gnc-split-reg.c
src/gnome/gtkbuilder/assistant-acct-period.glade
src/gnome/gtkbuilder/assistant-hierarchy.glade
src/gnome/gtkbuilder/assistant-loan.glade
src/gnome/gtkbuilder/assistant-stock-split.glade
src/gnome/gtkbuilder/dialog-commodities.glade
src/gnome/gtkbuilder/dialog-fincalc.glade
src/gnome/gtkbuilder/dialog-lot-viewer.glade
src/gnome/gtkbuilder/dialog-new-user.glade
src/gnome/gtkbuilder/dialog-price.glade
src/gnome/gtkbuilder/dialog-print-check.glade
src/gnome/gtkbuilder/dialog-progress.glade
src/gnome/gtkbuilder/dialog-sx.glade
src/gnome/gtkbuilder/dialog-tax-info.glade
src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
src/gnome/gtkbuilder/gnc-plugin-page-register2.glade
src/gnome/gtkbuilder/gnc-plugin-page-register.glade
src/gnome/gtkbuilder/window-autoclear.glade
src/gnome/gtkbuilder/window-reconcile.glade
src/gnome/reconcile-view.c
src/gnome-search/dialog-search.c
src/gnome-search/dialog-search.glade
src/gnome-search/gnc-general-search.c
@ -240,7 +188,6 @@ src/gnome-search/search-int64.c
src/gnome-search/search-numeric.c
src/gnome-search/search-reconciled.c
src/gnome-search/search-string.c
src/gnome/top-level.c
src/gnome-utils/account-quickfill.c
src/gnome-utils/assistant-utils.c
src/gnome-utils/assistant-xml-encoding.c
@ -264,17 +211,17 @@ src/gnome-utils/gnc-account-sel.c
src/gnome-utils/gnc-amount-edit.c
src/gnome-utils/gnc-autosave.c
src/gnome-utils/gnc-cell-renderer-date.c
src/gnome-utils/gnc-cell-renderer-popup.c
src/gnome-utils/gnc-cell-renderer-popup-entry.c
src/gnome-utils/gnc-cell-renderer-popup.c
src/gnome-utils/gnc-combott.c
src/gnome-utils/gnc-commodity-edit.c
src/gnome-utils/gnc-currency-edit.c
src/gnome-utils/gnc-date-delta.c
src/gnome-utils/gnc-date-edit.c
src/gnome-utils/gnc-date-format.c
src/gnome-utils/gnc-dense-cal.c
src/gnome-utils/gnc-dense-cal-model.c
src/gnome-utils/gnc-dense-cal-store.c
src/gnome-utils/gnc-dense-cal.c
src/gnome-utils/gnc-embedded-window.c
src/gnome-utils/gnc-file.c
src/gnome-utils/gnc-frequency.c
@ -287,36 +234,32 @@ src/gnome-utils/gnc-icons.c
src/gnome-utils/gnc-keyring.c
src/gnome-utils/gnc-main-window.c
src/gnome-utils/gnc-menu-extensions.c
src/gnome-utils/gncmod-gnome-utils.c
src/gnome-utils/gnc-period-select.c
src/gnome-utils/gnc-plugin.c
src/gnome-utils/gnc-plugin-file-history.c
src/gnome-utils/gnc-plugin-manager.c
src/gnome-utils/gnc-plugin-menu-additions.c
src/gnome-utils/gnc-plugin-page.c
src/gnome-utils/gnc-plugin.c
src/gnome-utils/gnc-query-view.c
src/gnome-utils/gnc-recurrence.c
src/gnome-utils/gnc-splash.c
src/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
src/gnome-utils/gnc-sx-list-tree-model-adapter.c
src/gnome-utils/gnc-tree-control-split-reg.c
src/gnome-utils/gnc-tree-model-account.c
src/gnome-utils/gnc-tree-model-account-types.c
src/gnome-utils/gnc-tree-model-account.c
src/gnome-utils/gnc-tree-model-budget.c
src/gnome-utils/gnc-tree-model.c
src/gnome-utils/gnc-tree-model-commodity.c
src/gnome-utils/gnc-tree-model-owner.c
src/gnome-utils/gnc-tree-model-price.c
src/gnome-utils/gnc-tree-model-split-reg.c
src/gnome-utils/gnc-tree-util-split-reg.c
src/gnome-utils/gnc-tree-model.c
src/gnome-utils/gnc-tree-view-account.c
src/gnome-utils/gnc-tree-view.c
src/gnome-utils/gnc-tree-view-commodity.c
src/gnome-utils/gnc-tree-view-owner.c
src/gnome-utils/gnc-tree-view-price.c
src/gnome-utils/gnc-tree-view-split-reg.c
src/gnome-utils/gnc-tree-view-sx-list.c
src/gnome-utils/gnc-tree-view.c
src/gnome-utils/gnc-window.c
src/gnome-utils/gncmod-gnome-utils.c
src/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
src/gnome-utils/gtkbuilder/dialog-account.glade
src/gnome-utils/gtkbuilder/dialog-book-close.glade
@ -339,35 +282,80 @@ src/gnome-utils/misc-gnome-utils.c
src/gnome-utils/print-session.c
src/gnome-utils/search-param.c
src/gnome-utils/window-main-summarybar.c
src/gnome/assistant-acct-period.c
src/gnome/assistant-hierarchy.c
src/gnome/assistant-loan.c
src/gnome/assistant-stock-split.c
src/gnome/dialog-commodities.c
src/gnome/dialog-fincalc.c
src/gnome/dialog-find-transactions.c
src/gnome/dialog-lot-viewer.c
src/gnome/dialog-new-user.c
src/gnome/dialog-price-edit-db.c
src/gnome/dialog-price-editor.c
src/gnome/dialog-print-check.c
src/gnome/dialog-progress.c
src/gnome/dialog-sx-editor.c
src/gnome/dialog-sx-from-trans.c
src/gnome/dialog-sx-since-last-run.c
src/gnome/dialog-tax-info.c
src/gnome/gnc-budget-view.c
src/gnome/gnc-plugin-account-tree.c
src/gnome/gnc-plugin-basic-commands.c
src/gnome/gnc-plugin-budget.c
src/gnome/gnc-plugin-page-account-tree.c
src/gnome/gnc-plugin-page-budget.c
src/gnome/gnc-plugin-page-register.c
src/gnome/gnc-plugin-page-sx-list.c
src/gnome/gnc-plugin-register.c
src/gnome/gnc-split-reg.c
src/gnome/gtkbuilder/assistant-acct-period.glade
src/gnome/gtkbuilder/assistant-hierarchy.glade
src/gnome/gtkbuilder/assistant-loan.glade
src/gnome/gtkbuilder/assistant-stock-split.glade
src/gnome/gtkbuilder/dialog-commodities.glade
src/gnome/gtkbuilder/dialog-fincalc.glade
src/gnome/gtkbuilder/dialog-lot-viewer.glade
src/gnome/gtkbuilder/dialog-new-user.glade
src/gnome/gtkbuilder/dialog-price.glade
src/gnome/gtkbuilder/dialog-print-check.glade
src/gnome/gtkbuilder/dialog-progress.glade
src/gnome/gtkbuilder/dialog-sx.glade
src/gnome/gtkbuilder/dialog-tax-info.glade
src/gnome/gtkbuilder/gnc-plugin-page-budget.glade
src/gnome/gtkbuilder/gnc-plugin-page-register.glade
src/gnome/gtkbuilder/window-autoclear.glade
src/gnome/gtkbuilder/window-reconcile.glade
src/gnome/reconcile-view.c
src/gnome/top-level.c
src/gnome/window-autoclear.c
src/gnome/window-reconcile2.c
src/gnome/window-reconcile.c
src/html/gnc-html.c
src/html/gnc-html-factory.c
src/html/gnc-html-history.c
src/html/gnc-html-webkit.c
src/html/gnc-html.c
src/html/gncmod-html.c
src/import-export/aqbanking/assistant-ab-initial.c
src/import-export/aqbanking/assistant-ab-initial.glade
src/import-export/aqbanking/dialog-ab-daterange.c
src/import-export/aqbanking/dialog-ab.glade
src/import-export/aqbanking/dialog-ab-trans.c
src/import-export/aqbanking/dialog-ab.glade
src/import-export/aqbanking/gnc-ab-getbalance.c
src/import-export/aqbanking/gnc-ab-gettrans.c
src/import-export/aqbanking/gnc-ab-kvp.c
src/import-export/aqbanking/gnc-ab-transfer.c
src/import-export/aqbanking/gnc-ab-trans-templ.c
src/import-export/aqbanking/gnc-ab-transfer.c
src/import-export/aqbanking/gnc-ab-utils.c
src/import-export/aqbanking/gnc-file-aqb-import.c
src/import-export/aqbanking/gnc-gwen-gui.c
src/import-export/aqbanking/gncmod-aqbanking.c
src/import-export/aqbanking/gnc-plugin-aqbanking.c
src/import-export/aqbanking/gncmod-aqbanking.c
src/import-export/csv-export/assistant-csv-export.c
src/import-export/csv-export/assistant-csv-export.glade
src/import-export/csv-export/csv-transactions-export.c
src/import-export/csv-export/csv-tree-export.c
src/import-export/csv-export/gncmod-csv-export.c
src/import-export/csv-export/gnc-plugin-csv-export.c
src/import-export/csv-export/gncmod-csv-export.c
src/import-export/csv-import/assistant-csv-account-import.c
src/import-export/csv-import/assistant-csv-account-import.glade
src/import-export/csv-import/assistant-csv-trans-import.c
@ -375,8 +363,8 @@ src/import-export/csv-import/assistant-csv-trans-import.glade
src/import-export/csv-import/csv-account-import.c
src/import-export/csv-import/gnc-csv-gnumeric-popup.c
src/import-export/csv-import/gnc-csv-model.c
src/import-export/csv-import/gncmod-csv-import.c
src/import-export/csv-import/gnc-plugin-csv-import.c
src/import-export/csv-import/gncmod-csv-import.c
src/import-export/dialog-import.glade
src/import-export/gncmod-generic-import.c
src/import-export/import-account-matcher.c
@ -390,27 +378,29 @@ src/import-export/import-parse.c
src/import-export/import-settings.c
src/import-export/import-utilities.c
src/import-export/log-replay/gnc-log-replay.c
src/import-export/log-replay/gncmod-log-replay.c
src/import-export/log-replay/gnc-plugin-log-replay.c
src/import-export/ofx/gncmod-ofx-import.c
src/import-export/log-replay/gncmod-log-replay.c
src/import-export/ofx/gnc-ofx-import.c
src/import-export/ofx/gnc-ofx-kvp.c
src/import-export/ofx/gnc-plugin-ofx.c
src/import-export/ofx/gncmod-ofx-import.c
src/import-export/qif-import/assistant-qif-import.c
src/import-export/qif-import/assistant-qif-import.glade
src/import-export/qif-import/dialog-account-picker.c
src/import-export/qif-import/dialog-account-picker.glade
src/import-export/qif-import/gncmod-qif-import.c
src/import-export/qif-import/gnc-plugin-qif-import.c
src/import-export/qif-import/gncmod-qif-import.c
src/import-export/qif/qif-context.c
src/import-export/qif/qif-file.c
src/import-export/qif/qif-objects.c
src/libqof/qof/gnc-date.c
src/libqof/qof/gnc-numeric.c
src/libqof/qof/guid.c
src/libqof/qof/kvp_frame.c
src/libqof/qof/kvp-util.c
src/libqof/qof/kvp_frame.c
src/libqof/qof/md5.c
src/libqof/qof/qof-string-cache.c
src/libqof/qof/qof-win32.c
src/libqof/qof/qofbackend.c
src/libqof/qof/qofbook.c
src/libqof/qof/qofchoice.c
@ -425,34 +415,31 @@ src/libqof/qof/qofquery.c
src/libqof/qof/qofquerycore.c
src/libqof/qof/qofreference.c
src/libqof/qof/qofsession.c
src/libqof/qof/qof-string-cache.c
src/libqof/qof/qofutil.c
src/libqof/qof/qof-win32.c
src/plugins/bi_import/dialog-bi-import.c
src/plugins/bi_import/dialog-bi-import-gui.c
src/plugins/bi_import/dialog-bi-import-helper.c
src/plugins/bi_import/gncmod-bi-import.c
src/plugins/bi_import/dialog-bi-import.c
src/plugins/bi_import/gnc-plugin-bi-import.c
src/plugins/bi_import/gncmod-bi-import.c
src/plugins/bi_import/gtkbuilder/dialog-bi-import-gui.glade
src/plugins/customer_import/dialog-customer-import.c
src/plugins/customer_import/dialog-customer-import-gui.c
src/plugins/customer_import/dialog-customer-import.c
src/plugins/customer_import/gnc-plugin-customer_import.c
src/plugins/customer_import/gtkbuilder/dialog-customer-import-gui.glade
src/plugins/customer_import/libgncmod-customer_import.c
src/python/gncmod-python.c
src/register/ledger-core/gnc-ledger-display2.c
src/register/ledger-core/gnc-ledger-display.c
src/register/ledger-core/gncmod-ledger-core.c
src/register/ledger-core/split-register.c
src/register/ledger-core/split-register-control.c
src/register/ledger-core/split-register-layout.c
src/register/ledger-core/split-register-load.c
src/register/ledger-core/split-register-model.c
src/register/ledger-core/split-register-model-save.c
src/register/ledger-core/split-register-model.c
src/register/ledger-core/split-register-util.c
src/register/ledger-core/split-register.c
src/register/register-core/basiccell.c
src/register/register-core/cellblock.c
src/register/register-core/cell-factory.c
src/register/register-core/cellblock.c
src/register/register-core/checkboxcell.c
src/register/register-core/formulacell.c
src/register/register-core/gncmod-register-core.c
@ -487,16 +474,16 @@ src/report/locale-specific/us/gncmod-locale-reports-us.c
src/report/report-gnome/dialog-custom-report.c
src/report/report-gnome/dialog-custom-report.glade
src/report/report-gnome/dialog-report-column-view.c
src/report/report-gnome/dialog-report.glade
src/report/report-gnome/dialog-report-style-sheet.c
src/report/report-gnome/gncmod-report-gnome.c
src/report/report-gnome/dialog-report.glade
src/report/report-gnome/gnc-plugin-page-report.c
src/report/report-gnome/gncmod-report-gnome.c
src/report/report-gnome/window-report.c
src/report/report-system/gncmod-report-system.c
src/report/report-system/gnc-report.c
src/report/report-system/gncmod-report-system.c
src/report/standard-reports/gncmod-standard-reports.c
src/report/stylesheets/gncmod-stylesheets.c
src/report/stylesheets/gnc-plugin-stylesheets.c
src/report/stylesheets/gncmod-stylesheets.c
src/report/utility-reports/gncmod-utility-reports.c
src/tax/us/gncmod-tax-us.c
src/gnome/gnucash.desktop.in.in

View File

@ -81,7 +81,6 @@ libgncmod_gnome_utils_la_SOURCES = \
gnc-splash.c \
gnc-sx-instance-dense-cal-adapter.c \
gnc-sx-list-tree-model-adapter.c \
gnc-tree-control-split-reg.c \
gnc-tree-model.c \
gnc-tree-model-account-types.c \
gnc-tree-model-account.c \
@ -89,13 +88,10 @@ libgncmod_gnome_utils_la_SOURCES = \
gnc-tree-model-owner.c \
gnc-tree-model-commodity.c \
gnc-tree-model-price.c \
gnc-tree-model-split-reg.c \
gnc-tree-util-split-reg.c \
gnc-tree-view-account.c \
gnc-tree-view-commodity.c \
gnc-tree-view-owner.c \
gnc-tree-view-price.c \
gnc-tree-view-split-reg.c \
gnc-tree-view-sx-list.c \
gnc-tree-view.c \
gnc-warnings.c \
@ -160,7 +156,6 @@ gncinclude_HEADERS = \
gnc-splash.h \
gnc-sx-instance-dense-cal-adapter.h \
gnc-sx-list-tree-model-adapter.h \
gnc-tree-control-split-reg.h \
gnc-tree-model.h \
gnc-tree-model-account-types.h \
gnc-tree-model-account.h \
@ -168,13 +163,10 @@ gncinclude_HEADERS = \
gnc-tree-model-owner.h \
gnc-tree-model-commodity.h \
gnc-tree-model-price.h \
gnc-tree-model-split-reg.h \
gnc-tree-util-split-reg.h \
gnc-tree-view-account.h \
gnc-tree-view-commodity.h \
gnc-tree-view-owner.h \
gnc-tree-view-price.h \
gnc-tree-view-split-reg.h \
gnc-tree-view-sx-list.h \
gnc-tree-view.h \
gnc-ui.h \

File diff suppressed because it is too large Load Diff

View File

@ -1,126 +0,0 @@
/********************************************************************\
* gnc-tree-control-split-reg.h -- GtkTreeView implementation *
* to display registers in a GtkTreeView. *
* *
* Copyright (C) 2006-2007 Chris Shoemaker <c.shoemaker@cox.net> *
* Copyright (C) 2012 Robert Fewell *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* 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@gnu.org *
* *
\********************************************************************/
#ifndef __GNC_TREE_CONTROL_SPLIT_REG_H
#define __GNC_TREE_CONTROL_SPLIT_REG_H
#include "gnc-tree-model-split-reg.h"
#include "gnc-tree-view-split-reg.h"
G_BEGIN_DECLS
/*****************************************************************************/
gboolean gnc_tree_control_split_reg_trans_open_and_warn (GncTreeViewSplitReg *view, Transaction *trans);
gboolean gnc_tree_control_split_reg_trans_test_for_edit (GncTreeViewSplitReg *view, Transaction *trans);
/*****************************************************************************/
void gnc_tree_control_split_reg_exchange_rate (GncTreeViewSplitReg *view);
void gnc_tree_control_split_reg_schedule_current_trans (GncTreeViewSplitReg *view);
void gnc_tree_control_split_reg_void_current_trans (GncTreeViewSplitReg *view, const char *reason);
void gnc_tree_control_split_reg_unvoid_current_trans (GncTreeViewSplitReg *view);
gboolean gnc_tree_control_split_reg_jump_to_blank (GncTreeViewSplitReg *view);
void gnc_tree_control_split_reg_jump_to (GncTreeViewSplitReg *view, Transaction *trans, Split *split, gboolean amount);
void gnc_tree_control_split_reg_cancel_edit (GncTreeViewSplitReg *view, gboolean reg_closing);
void gnc_tree_control_split_reg_goto_rel_trans_row (GncTreeViewSplitReg *view, gint relative);
void gnc_tree_control_split_reg_enter (GncTreeViewSplitReg *view);
void gnc_tree_control_split_reg_reinit (GncTreeViewSplitReg *view, gpointer data);
void gnc_tree_control_split_reg_reverse_current (GncTreeViewSplitReg *view);
void gnc_tree_control_split_reg_delete (GncTreeViewSplitReg *view, gpointer data);
Transaction * gnc_tree_control_split_reg_get_blank_trans (GncTreeViewSplitReg *view);
Split * gnc_tree_control_split_reg_get_current_trans_split (GncTreeViewSplitReg *view);
Split * gnc_tree_control_split_reg_get_blank_split (GncTreeViewSplitReg *view);
gboolean gnc_tree_control_split_reg_duplicate_current (GncTreeViewSplitReg *view);
/** This implements the command of moving the current entry (where the
* cursor is currently located) one row upwards or downwards (depending on the move_up parameter),
* effectively swapping this row and the other row. If the other row
* is empty (or it is the blank entry), nothing will happen.
*
* \param move_up If TRUE, the current entry is moved upwards,
* otherwise downwards.
* \return Whether the current entry has been moved into the queried direction
*/
gboolean gnc_tree_control_split_reg_move_current_entry_updown (GncTreeViewSplitReg *reg,
gboolean move_up);
/** Query whether the current entry (where the cursor is currently located)
* can be moved one row upwards or downwards (depending on the move_up parameter).
*
* \param move_up If TRUE, it is asked whether the current entry can be moved upwards,
* otherwise downwards.
* \return Whether the current entry can be moved into the queried direction
*/
gboolean gnc_tree_control_split_reg_is_current_movable_updown (GncTreeViewSplitReg *view,
gboolean move_up);
gboolean gnc_tree_control_split_reg_save (GncTreeViewSplitReg *view, gboolean reg_closing);
gboolean gnc_tree_control_split_reg_recn_change (GncTreeViewSplitReg *view, GtkTreePath *spath);
gboolean gnc_tree_control_split_reg_recn_test (GncTreeViewSplitReg *view, GtkTreePath *spath);
gboolean gnc_tree_control_split_reg_balance_trans (GncTreeViewSplitReg *view, Transaction *trans);
Account * gnc_tree_control_split_reg_get_account_by_name (GncTreeViewSplitReg *view, const char *name);
/*****************************************************************************/
/* Cut transaction and copy to clipboard */
void gnc_tree_control_split_reg_cut_trans (GncTreeViewSplitReg *view);
/* Copy transaction to clipboard */
void gnc_tree_control_split_reg_copy_trans (GncTreeViewSplitReg *view);
/* Paste transaction from clipboard */
void gnc_tree_control_split_reg_paste_trans (GncTreeViewSplitReg *view);
/* Copy the last transaction with given description to the blank transaction */
void gnc_tree_control_auto_complete (GncTreeViewSplitReg *view, Transaction *trans, const gchar *new_text);
/*****************************************************************************/
G_END_DECLS
#endif /* __GNC_TREE_CONTROL_SPLIT_REG_H */

File diff suppressed because it is too large Load Diff

View File

@ -1,334 +0,0 @@
/********************************************************************\
* gnc-tree-model-split-reg.h -- GtkTreeView implementation to *
* display registers in a GtkTreeView. *
* *
* Copyright (C) 2006-2007 Chris Shoemaker <c.shoemaker@cox.net> *
* Copyright (C) 2012 Robert Fewell *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* 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@gnu.org *
* *
\********************************************************************/
#ifndef __GNC_TREE_MODEL_SPLIT_REG_H
#define __GNC_TREE_MODEL_SPLIT_REG_H
#include <gtk/gtk.h>
#include "gnc-tree-model.h"
#include "Query.h"
G_BEGIN_DECLS
/* type macros */
#define GNC_TYPE_TREE_MODEL_SPLIT_REG (gnc_tree_model_split_reg_get_type ())
#define GNC_TREE_MODEL_SPLIT_REG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_TREE_MODEL_SPLIT_REG, GncTreeModelSplitReg))
#define GNC_TREE_MODEL_SPLIT_REG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_TREE_MODEL_SPLIT_REG, GncTreeModelSplitRegClass))
#define GNC_IS_TREE_MODEL_SPLIT_REG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_TREE_MODEL_SPLIT_REG))
#define GNC_IS_TREE_MODEL_SPLIT_REG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_TREE_MODEL_SPLIT_REG))
#define GNC_TREE_MODEL_SPLIT_REG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_TREE_MODEL_SPLIT_REG, GncTreeModelSplitRegClass))
#define GNC_TREE_MODEL_SPLIT_REG_NAME "GncTreeModelSplitReg"
/* Define the number of transaction to load */
#define NUM_OF_TRANS 30
/** @brief Register types
*
* "registers" are single-account display windows.
* "ledgers" are multiple-account display windows */
typedef enum
{
BANK_REGISTER2, //0
CASH_REGISTER2, //1
ASSET_REGISTER2, //2
CREDIT_REGISTER2, //3
LIABILITY_REGISTER2, //4
INCOME_REGISTER2, //5
EXPENSE_REGISTER2, //6
EQUITY_REGISTER2, //7
STOCK_REGISTER2, //8
CURRENCY_REGISTER2, //9
RECEIVABLE_REGISTER2, //10
PAYABLE_REGISTER2, //11
TRADING_REGISTER2, //12
NUM_SINGLE_REGISTER_TYPES2, //13
GENERAL_LEDGER2 = NUM_SINGLE_REGISTER_TYPES2, //13
INCOME_LEDGER2, //14
PORTFOLIO_LEDGER2, //15
SEARCH_LEDGER2, //16
NUM_REGISTER_TYPES2 //17
} SplitRegisterType2;
/** Register styles */
typedef enum
{
REG2_STYLE_LEDGER, //0
REG2_STYLE_AUTO_LEDGER, //1
REG2_STYLE_JOURNAL //2
} SplitRegisterStyle2;
typedef enum
{
GNC_TREE_MODEL_SPLIT_REG_COL_GUID, //0
GNC_TREE_MODEL_SPLIT_REG_COL_DATE, //1
GNC_TREE_MODEL_SPLIT_REG_COL_DUEDATE, //2
GNC_TREE_MODEL_SPLIT_REG_COL_NUMACT, //3
GNC_TREE_MODEL_SPLIT_REG_COL_DESCNOTES, //4
GNC_TREE_MODEL_SPLIT_REG_COL_TRANSFERVOID, //5
GNC_TREE_MODEL_SPLIT_REG_COL_RECN, //6
GNC_TREE_MODEL_SPLIT_REG_COL_DEBIT, //7
GNC_TREE_MODEL_SPLIT_REG_COL_CREDIT, //8
GNC_TREE_MODEL_SPLIT_REG_COL_LAST_VISIBLE = GNC_TREE_MODEL_SPLIT_REG_COL_CREDIT, //8
/* internal hidden columns */
GNC_TREE_MODEL_SPLIT_REG_COL_RO, //9
GNC_TREE_MODEL_SPLIT_REG_COL_NUM_VIS, //10
GNC_TREE_MODEL_SPLIT_REG_COL_ACT_VIS, //11
GNC_TREE_MODEL_SPLIT_REG_NUM_COLUMNS //12
} GncTreeModelSplitRegColumn;
typedef enum
{
VIEW_HOME, //0
VIEW_UP, //1
VIEW_PGUP, //2
VIEW_GOTO, //3
VIEW_PGDOWN, //4
VIEW_DOWN, //5
VIEW_END, //6
} GncTreeModelSplitRegUpdate;
/* typedefs & structures */
typedef struct GncTreeModelSplitRegPrivate GncTreeModelSplitRegPrivate;
/** The instance data structure for an account tree model. */
typedef struct
{
GncTreeModel gnc_tree_model; /**< The parent object data. */
GncTreeModelSplitRegPrivate *priv;
gint stamp; /**< The state of the model. Any state change increments this number. */
SplitRegisterType2 type; /**<FIXME ? This may be the wrong place for these, may be the view ? */
SplitRegisterStyle2 style; /**<FIXME ? This may be the wrong place for these, may be the view ? */
gboolean use_double_line; /**<FIXME ? As above, whether to use two lines per transaction */
gboolean is_template; /**< Are we using a template */
gint sort_depth; /**< This is the row the sort direction is based on. */
gint sort_col; /**< This is the column the sort direction is based on. */
gint sort_direction; /**< This is the direction of sort, 1 for ascending or -1 rest */
gboolean use_accounting_labels; /**< whether to use accounting Labels */
gboolean separator_changed; /**< whether the separator has changed */
gboolean alt_colors_by_txn; /**< whether to use alternative colors by transaction */
gboolean use_theme_colors; /**< whether to use theme colors */
gboolean read_only; /**< register is read only */
Transaction *current_trans; /**< Current transaction */
gint current_row; /**< Current row in treeview */
gint number_of_trans_in_full_tlist; /**< The total number of transactions in full_tlist */
gint position_of_trans_in_full_tlist; /**< The position of current transaction in full_tlist */
}GncTreeModelSplitReg;
/** The class data structure for an account tree model. */
typedef struct
{
GncTreeModelClass gnc_tree_model; /**< The parent object data. */
/* This signal is emitted to refresh the transaction view, the pointer has
the transaction */
void (*refresh_trans) (GncTreeModelSplitReg *model, gpointer item);
/* This signal is emitted to refresh the model */
void (*refresh_view) (GncTreeModelSplitReg *model, gpointer user_data);
/* This signal is emitted to keep scrollbar in sync */
void (*scroll_sync) (GncTreeModelSplitReg *model, gpointer user_data);
/* This signal is emitted to refresh the status bar */
void (*refresh_status_bar) (GncTreeModelSplitReg *model, gpointer user_data);
/* This signal is emitted before a transaction delete, the pointer has
the transaction */
void (*selection_move_delete) (GncTreeModelSplitReg *model, gpointer item);
} GncTreeModelSplitRegClass;
/** Callback function type - Used to get parent window */
typedef GtkWidget *(*SRGetParentCallback2) (gpointer user_data);
/** Get the type of split register tree plugin.
*
* @return A GType.
*/
GType gnc_tree_model_split_reg_get_type (void);
/** Create new model and set options for register. */
GncTreeModelSplitReg *
gnc_tree_model_split_reg_new (SplitRegisterType2 reg_type, SplitRegisterStyle2 style,
gboolean use_double_line, gboolean is_template);
/** Load the model from a slist and set default account for register. */
void gnc_tree_model_split_reg_load (GncTreeModelSplitReg *model, GList * slist, Account *default_account);
/** Sets the template account. */
void gnc_tree_model_split_reg_set_template_account (GncTreeModelSplitReg *model, Account *template_account);
/** Returns the template account. */
Account * gnc_tree_model_split_reg_get_template_account (GncTreeModelSplitReg *model);
/** Return TRUE if this is a template register. */
gboolean gnc_tree_model_split_reg_get_template (GncTreeModelSplitReg *model);
/** Destroy the model. */
void gnc_tree_model_split_reg_destroy (GncTreeModelSplitReg *model);
/** Sets the user data and callback hooks for the register. */
void gnc_tree_model_split_reg_set_data (GncTreeModelSplitReg *model, gpointer user_data,
SRGetParentCallback2 get_parent);
/** Sets the default query for the register. */
void gnc_tree_model_split_reg_default_query (GncTreeModelSplitReg *model, Account *default_account, Query *query);
/** Update the query for the register. */
void gnc_tree_model_split_reg_update_query (GncTreeModelSplitReg *model, Query *query);
/** Returns the parent Window of the register. */
GtkWidget * gnc_tree_model_split_reg_get_parent (GncTreeModelSplitReg *model);
/** Set style and type for register. */
void gnc_tree_model_split_reg_config (GncTreeModelSplitReg *model, SplitRegisterType2 newtype,
SplitRegisterStyle2 newstyle, gboolean use_double_line);
/** Return the default account for this register model. */
Account * gnc_tree_model_split_reg_get_anchor (GncTreeModelSplitReg *model);
/** Commit the blank split. */
void gnc_tree_model_split_reg_commit_blank_split (GncTreeModelSplitReg *model);
/** Set display general ledger and show sub accounts. */
void gnc_tree_model_split_reg_set_display (GncTreeModelSplitReg *model, gboolean subacc, gboolean gl);
/** Change transactions in the tlist based on view movement. */
void gnc_tree_model_split_reg_move (GncTreeModelSplitReg *model, GncTreeModelSplitRegUpdate model_update);
/* Sync the vertical scrollbar to position in full_tlist. */
void gnc_tree_model_split_reg_sync_scrollbar (GncTreeModelSplitReg *model);
/** Return the first transaction, opposite to blank transaction in the full list. */
Transaction * gnc_tree_model_split_reg_get_first_trans (GncTreeModelSplitReg *model);
/** Return TRUE if transaction is in the view list. */
gboolean gnc_tree_model_split_reg_trans_is_in_view (GncTreeModelSplitReg *model, Transaction *trans);
/* These are to do with autocompletion */
GtkListStore * gnc_tree_model_split_reg_get_description_list (GncTreeModelSplitReg *model);
GtkListStore * gnc_tree_model_split_reg_get_notes_list (GncTreeModelSplitReg *model);
GtkListStore * gnc_tree_model_split_reg_get_memo_list (GncTreeModelSplitReg *model);
GtkListStore * gnc_tree_model_split_reg_get_action_list (GncTreeModelSplitReg *model);
GtkListStore * gnc_tree_model_split_reg_get_acct_list (GncTreeModelSplitReg *model);
void gnc_tree_model_split_reg_update_num_list (GncTreeModelSplitReg *model);
void gnc_tree_model_split_reg_update_action_list (GncTreeModelSplitReg *model);
void gnc_tree_model_split_reg_update_account_list (GncTreeModelSplitReg *model);
void gnc_tree_model_split_reg_update_completion (GncTreeModelSplitReg *model);
/* Get the split and transaction */
gboolean gnc_tree_model_split_reg_get_split_and_trans (
GncTreeModelSplitReg *model, GtkTreeIter *iter,
gboolean *is_trow1, gboolean *is_trow2, gboolean *is_split,
gboolean *is_blank, Split **split, Transaction **trans);
/* Return FALSE if failure */
gboolean gnc_tree_model_split_reg_set_blank_split_parent (
GncTreeModelSplitReg *model, Transaction *trans, gboolean remove_only);
/* Return the blank split */
Split * gnc_tree_model_split_get_blank_split (GncTreeModelSplitReg *model);
/* Return TRUE if blank_split is on trans */
gboolean gnc_tree_model_split_reg_is_blank_split_parent (GncTreeModelSplitReg *model, Transaction *trans);
/* Return the blank trans */
Transaction * gnc_tree_model_split_get_blank_trans (GncTreeModelSplitReg *model);
/* If 'trans' is NULL, use split's parent. If 'split' is NULL, just
get the transaction iter. */
gboolean gnc_tree_model_split_reg_get_iter_from_trans_and_split (
GncTreeModelSplitReg *model, Transaction *trans, Split *split,
GtkTreeIter *iter1, GtkTreeIter *iter2);
/* Return the row color for the view */
gchar * gnc_tree_model_split_reg_get_row_color (GncTreeModelSplitReg *model, gboolean is_trow1,
gboolean is_trow2, gboolean is_split, gint num);
/* Return the tooltip for transaction at position in full_tlist. */
gchar * gnc_tree_model_split_reg_get_tooltip (GncTreeModelSplitReg *model, gint position);
/* Set the current transaction to that at position in full_tlist */
void gnc_tree_model_split_reg_set_current_trans_by_position (GncTreeModelSplitReg *model, gint position);
/* Return TRUE if this transaction is read only for the view */
gboolean
gnc_tree_model_split_reg_get_read_only (GncTreeModelSplitReg *model, Transaction *trans);
/* Return TRUE if this is a sub account view */
gboolean
gnc_tree_model_split_reg_get_sub_account (GncTreeModelSplitReg *model);
/* Return the tree path, if split and trans are null, last in list returned */
GtkTreePath * gnc_tree_model_split_reg_get_path_to_split_and_trans (
GncTreeModelSplitReg *model, Split *split, Transaction *trans);
/* Returns TRUE if iter is a blank transaction */
gboolean gnc_tree_model_split_reg_is_blank_trans (GncTreeModelSplitReg *model, GtkTreeIter *iter);
/* Return the split for which ancestor is it's parent */
Split * gnc_tree_model_split_reg_trans_get_split_equal_to_ancestor (const Transaction *trans, const Account *ancestor);
/* Dummy Sort function */
gint gnc_tree_model_split_reg_sort_iter_compare_func (GtkTreeModel *tm, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data);
/*****************************************************************************/
G_END_DECLS
#endif /* __GNC_TREE_MODEL_SPLIT_REG_H */

File diff suppressed because it is too large Load Diff

View File

@ -1,89 +0,0 @@
/********************************************************************\
* gnc-tree-util-split-reg.h -- GtkTreeView implementation *
* to display registers in a GtkTreeView. *
* *
* Copyright (C) 2006-2007 Chris Shoemaker <c.shoemaker@cox.net> *
* Copyright (C) 2012 Robert Fewell *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* 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@gnu.org *
* *
\********************************************************************/
#ifndef __GNC_TREE_UTIL_SPLIT_REG_H
#define __GNC_TREE_UTIL_SPLIT_REG_H
#include "gnc-tree-model-split-reg.h"
#include "gnc-tree-view-split-reg.h"
G_BEGIN_DECLS
/*****************************************************************************/
gboolean gnc_tree_util_split_reg_has_rate (GncTreeViewSplitReg *view);
gboolean gnc_tree_util_split_reg_needs_conv_rate (GncTreeViewSplitReg *view,
Transaction *trans, Account *acc);
const char * gnc_tree_util_split_reg_get_transfer_entry (Split *split, gboolean *is_multi);
const char * gnc_tree_util_split_reg_template_get_transfer_entry (Split *split);
const char * gnc_tree_util_split_reg_template_get_fdebt_entry (Split *split);
const char * gnc_tree_util_split_reg_template_get_fcred_entry (Split *split);
gchar * gnc_tree_util_split_reg_get_date_help (GDate *date);
void gnc_tree_util_split_reg_parse_date (GDate *parsed, const char *datestr);
gboolean gnc_tree_util_split_reg_rotate (GncTreeViewSplitReg *view, GtkTreeViewColumn *col,
Transaction *trans, Split *split);
gboolean gnc_tree_util_split_reg_is_multi (Split *split);
gboolean gnc_tree_util_split_reg_needs_amount (GncTreeViewSplitReg *view, Split *split);
void gnc_tree_util_split_reg_set_value_for (GncTreeViewSplitReg *view, Transaction *trans,
Split *split, gnc_numeric input, gboolean force);
void gnc_tree_util_split_reg_save_amount_values (GncTreeViewSplitReg *view, Transaction *trans,
Split *split, gnc_numeric input);
gnc_numeric gnc_tree_util_split_reg_get_value_for (GncTreeViewSplitReg *view, Transaction *trans,
Split *split, gboolean is_blank);
gboolean gnc_tree_util_split_reg_get_debcred_entry (GncTreeViewSplitReg *view,
Transaction *trans, Split *split,
gboolean is_blank,gnc_numeric *ret_num,
GNCPrintAmountInfo *ret_print_info);
void gnc_tree_util_set_number_for_input (GncTreeViewSplitReg *view, Transaction *trans,
Split *split, gnc_numeric input, gint viewcol);
void gnc_tree_util_set_value_for_amount (GncTreeViewSplitReg *view, Transaction *trans,
Split *split, gnc_numeric input);
gnc_numeric gnc_tree_util_get_rate_for (GncTreeViewSplitReg *view, Transaction *trans,
Split *split, gboolean is_blank);
/*****************************************************************************/
G_END_DECLS
#endif /* __GNC_TREE_UTIL_SPLIT_REG_H */

File diff suppressed because it is too large Load Diff

View File

@ -1,190 +0,0 @@
/********************************************************************\
* gnc-tree-view-split-reg.h -- GtkTreeView implementation to *
* display registers in a GtkTreeView. *
* *
* Copyright (C) 2006-2007 Chris Shoemaker <c.shoemaker@cox.net> *
* Copyright (C) 2012 Robert Fewell *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* 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@gnu.org *
* *
\********************************************************************/
#ifndef __GNC_TREE_VIEW_SPLIT_REG_H
#define __GNC_TREE_VIEW_SPLIT_REG_H
#include <gtk/gtk.h>
#include "gnc-tree-view.h"
#include "gnc-tree-model-split-reg.h"
#include "gnc-ui-util.h"
G_BEGIN_DECLS
#define GNC_TYPE_TREE_VIEW_SPLIT_REG (gnc_tree_view_split_reg_get_type ())
#define GNC_TREE_VIEW_SPLIT_REG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_TREE_VIEW_SPLIT_REG, GncTreeViewSplitReg))
#define GNC_TREE_VIEW_SPLIT_REG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_TREE_VIEW_SPLIT_REG, GncTreeViewSplitRegClass))
#define GNC_IS_TREE_VIEW_SPLIT_REG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_TREE_VIEW_SPLIT_REG))
#define GNC_IS_TREE_VIEW_SPLIT_REG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_TREE_VIEW_SPLIT_REG))
#define GNC_TREE_VIEW_SPLIT_REG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_TREE_VIEW_SPLIT_REG, GncTreeViewSplitRegClass))
/* typedefs & structures */
typedef struct GncTreeViewSplitRegPrivate GncTreeViewSplitRegPrivate;
typedef struct
{
GncTreeView gnc_tree_view;
GncTreeViewSplitRegPrivate *priv;
int stamp;
GtkWidget *window; // Parent Window.
GFunc uiupdate_cb; // Used for page gui update
gpointer uiupdate_cb_data; // Used for page gui update
gchar *help_text; // This is the help text to be displayed.
gint sort_depth; // This is the row the sort direction is based on.
gint sort_col; // This is the column the sort direction is based on.
gint sort_direction; // This is the direction of sort, 1 for ascending or -1 rest
gboolean reg_closing; // This is set when closing the register.
gboolean change_allowed; // This is set when we allow the reconciled split to change.
gboolean editing_now; // This is set while editing of a cell.
gboolean show_extra_dates; // Show the entered date below the posted date and reconciled date on split row
} GncTreeViewSplitReg;
typedef struct
{
GncTreeViewClass gnc_tree_view;
/* This signal is emitted when we update the view */
void (*update_signal) (GncTreeViewSplitReg *view, gpointer user_data);
/* This signal is emitted when we update the help text */
void (*help_signal) (GncTreeViewSplitReg *view, gpointer user_data);
} GncTreeViewSplitRegClass;
typedef enum {
TOP, //0
TRANS1, //1
TRANS2, //2
SPLIT3, //3
}RowDepth;
typedef enum {
COL_END_OF_LIST = -1,
COL_CONTROL, //0 TreeView Control columns
COL_DATE, //1
COL_DUEDATE, //2
COL_NUMACT, //3
COL_DESCNOTES, //4
COL_TRANSFERVOID, //5
COL_RECN, //6
COL_TYPE, //7
COL_VALUE, //8
COL_AMOUNT, //9
COL_AMTVAL, //10
COL_RATE, //11
COL_PRICE, //12
COL_DEBIT, //13
COL_CREDIT, //14
COL_BALANCE, //15
COL_STATUS, //16
COL_COMM, //17
} ViewCol;
/* Standard g_object type */
GType gnc_tree_view_split_reg_get_type (void);
GncTreeViewSplitReg *gnc_tree_view_split_reg_new_with_model (GncTreeModelSplitReg *model);
void gnc_tree_view_split_reg_block_selection (GncTreeViewSplitReg *view, gboolean block);
void gnc_tree_view_split_reg_default_selection (GncTreeViewSplitReg *view);
gboolean gnc_tree_view_split_reg_set_format (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_set_read_only (GncTreeViewSplitReg *view, gboolean read_only);
void gnc_tree_view_split_reg_set_dirty_trans (GncTreeViewSplitReg *view, Transaction *trans);
Transaction * gnc_tree_view_split_reg_get_current_trans (GncTreeViewSplitReg *view);
Split * gnc_tree_view_split_reg_get_current_split (GncTreeViewSplitReg *view);
Transaction * gnc_tree_view_split_reg_get_dirty_trans (GncTreeViewSplitReg *view);
GtkTreePath * gnc_tree_view_split_reg_get_current_path (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_set_current_path (GncTreeViewSplitReg *view, GtkTreePath *mpath);
RowDepth gnc_tree_view_reg_get_selected_row_depth (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_set_uiupdate_cb (GncTreeViewSplitReg *view, GFunc cb, gpointer cb_data);
gboolean gnc_tree_view_split_reg_call_uiupdate_cb(GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_refresh_from_prefs (GncTreeViewSplitReg *view);
GtkWidget * gnc_tree_view_split_reg_get_parent (GncTreeViewSplitReg *view);
gboolean gnc_tree_view_split_reg_trans_expanded (GncTreeViewSplitReg *view, Transaction *trans);
void gnc_tree_view_split_reg_expand_trans (GncTreeViewSplitReg *view, Transaction *trans);
void gnc_tree_view_split_reg_collapse_trans (GncTreeViewSplitReg *view, Transaction *trans);
const char * gnc_tree_view_split_reg_get_credit_debit_string (GncTreeViewSplitReg *view, gboolean credit);
gnc_commodity * gnc_tree_view_split_reg_get_reg_commodity (GncTreeViewSplitReg *view);
/*************************************************************************************/
/* Get sort model path from the model path */
GtkTreePath * gnc_tree_view_split_reg_get_sort_path_from_model_path (GncTreeViewSplitReg *view, GtkTreePath *mpath);
/* Get model path from the sort model path */
GtkTreePath * gnc_tree_view_split_reg_get_model_path_from_sort_path (GncTreeViewSplitReg *view, GtkTreePath *spath);
/* Get model from the view */
GncTreeModelSplitReg * gnc_tree_view_split_reg_get_model_from_view (GncTreeViewSplitReg *view);
/* Scroll the view to the current transaction */
gboolean gnc_tree_view_split_reg_scroll_to_cell (GncTreeViewSplitReg *view);
/* Scroll the view to the blank split */
gboolean gnc_tree_view_split_reg_scroll_to_bsplit (GncTreeViewSplitReg *view);
/*************************************************************************************/
void gnc_tree_view_split_reg_delete_current_split (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_delete_current_trans (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_reinit_trans (GncTreeViewSplitReg *view);
gboolean gnc_tree_view_split_reg_enter (GncTreeViewSplitReg *view);
void gnc_tree_view_split_reg_cancel_edit (GncTreeViewSplitReg *view, gboolean reg_closing);
void gnc_tree_view_split_reg_finish_edit (GncTreeViewSplitReg *view);
G_END_DECLS
#endif /* __GNC_TREE_VIEW_SPLIT_REG_H */

View File

@ -1311,6 +1311,57 @@ many months before the current month:</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
@ -1782,15 +1833,6 @@ many months before the current month:</property>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label84">
<property name="visible">True</property>
@ -1858,48 +1900,6 @@ many months before the current month:</property>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="pref/general/save-on-close-expires">
<property name="label" translatable="yes">Enable timeout on "Save changes on closing" question</property>
@ -1919,6 +1919,12 @@ many months before the current month:</property>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
@ -1987,12 +1993,6 @@ many months before the current month:</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
@ -2563,7 +2563,7 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">15</property>
<property name="n_rows">10</property>
<property name="n_columns">4</property>
<child>
<placeholder/>
@ -2589,12 +2589,6 @@ many months before the current month:</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label63">
<property name="visible">True</property>
@ -2810,131 +2804,6 @@ many months before the current month:</property>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Number of _characters for auto complete:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general.register/key-length</property>
</object>
<packing>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="pref/general.register/key-length">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">This sets the number of characters before auto complete starts for description, notes and memo fields.</property>
<property name="tooltip_text" translatable="yes">This sets the number of characters before auto complete starts for description, notes and memo fields.</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">key_length_adj</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="pref/general.register/show-extra-dates">
<property name="label" translatable="yes">Show the _entered and reconcile dates</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_markup">Show the date when the transaction was entered below the posted date and reconciled date on split row.</property>
<property name="tooltip_text" translatable="yes">Show the date when the transaction was entered below the posted date and reconciled date on split row.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">4</property>
<property name="top_attach">11</property>
<property name="bottom_attach">12</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="pref/general.register/show-calendar-buttons">
<property name="label" translatable="yes">Show the calendar b_uttons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_markup">Show the calendar buttons Cancel, Today and Select.</property>
<property name="tooltip_text" translatable="yes">Show the calendar buttons Cancel, Today and Select.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">4</property>
<property name="top_attach">13</property>
<property name="bottom_attach">14</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="pref/general.register/selection-to-blank-on-expand">
<property name="label" translatable="yes">_Move the selection to the blank split on expand</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_markup">This will move the selection to the blank split when the transaction is expanded.</property>
<property name="tooltip_text" translatable="yes">This will move the selection to the blank split when the transaction is expanded.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">4</property>
<property name="top_attach">14</property>
<property name="bottom_attach">15</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="pref/general.register/show-extra-dates-on-selection">
<property name="label" translatable="yes">_Show entered and reconciled dates on selection</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_markup">Show the entered date and reconciled date on transaction selection.</property>
<property name="tooltip_text" translatable="yes">Show the entered date and reconciled date on transaction selection.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">4</property>
<property name="top_attach">12</property>
<property name="bottom_attach">13</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<placeholder/>
</child>

View File

@ -31,16 +31,13 @@ libgnc_gnome_la_SOURCES = \
dialog-commodities.c \
dialog-fincalc.c \
dialog-find-transactions.c \
dialog-find-transactions2.c \
dialog-lot-viewer.c \
dialog-new-user.c \
dialog-price-editor.c \
dialog-price-edit-db.c \
dialog-print-check.c \
dialog-print-check2.c \
dialog-progress.c \
dialog-sx-editor.c \
dialog-sx-editor2.c \
dialog-sx-from-trans.c \
dialog-sx-since-last-run.c \
dialog-tax-info.c \
@ -49,18 +46,14 @@ libgnc_gnome_la_SOURCES = \
gnc-plugin-basic-commands.c \
gnc-plugin-budget.c \
gnc-plugin-register.c \
gnc-plugin-register2.c \
gnc-plugin-page-account-tree.c \
gnc-plugin-page-budget.c \
gnc-plugin-page-sx-list.c \
gnc-plugin-page-register.c \
gnc-plugin-page-register2.c \
gnc-split-reg.c \
gnc-split-reg2.c \
reconcile-view.c \
top-level.c \
window-reconcile.c \
window-reconcile2.c \
window-autoclear.c
gnomeappdir = ${datadir}/applications
@ -82,14 +75,11 @@ noinst_HEADERS = \
assistant-stock-split.h \
dialog-fincalc.h \
dialog-find-transactions.h \
dialog-find-transactions2.h \
dialog-lot-viewer.h \
dialog-new-user.h \
dialog-print-check.h \
dialog-print-check2.h \
dialog-progress.h \
dialog-sx-editor.h \
dialog-sx-editor2.h \
dialog-sx-from-trans.h \
dialog-sx-since-last-run.h \
gnc-budget-view.h \
@ -97,18 +87,14 @@ noinst_HEADERS = \
gnc-plugin-basic-commands.h \
gnc-plugin-budget.h \
gnc-plugin-register.h \
gnc-plugin-register2.h \
gnc-plugin-page-account-tree.h \
gnc-plugin-page-budget.h \
gnc-plugin-page-sx-list.h \
gnc-plugin-page-register.h \
gnc-plugin-page-register2.h \
gnc-split-reg.h \
gnc-split-reg2.h \
reconcile-view.h \
top-level.h \
window-reconcile.h \
window-reconcile2.h \
window-autoclear.h
if BUILDING_FROM_SCM

View File

@ -1,216 +0,0 @@
/********************************************************************\
* dialog-find-transactions2.c : locate transactions and show them *
* Copyright (C) 2000 Bill Gribble <grib@billgribble.com> *
* *
* 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@gnu.org *
\********************************************************************/
#include "config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdio.h>
#include "gnc-ui-util.h"
#include "Query.h"
#include "qof.h"
#include "SX-book.h"
#include "Transaction.h"
#include "dialog-find-transactions2.h"
#include "gnc-main-window.h"
#include "gnc-plugin-page-register2.h"
#include "search-param.h"
#define GNC_PREFS_GROUP_SEARCH "dialogs.find"
struct _ftd_data
{
QofQuery * q;
QofQuery * ledger_q;
GNCSearchWindow * sw;
};
static void
do_find_cb (QofQuery *query, gpointer user_data, gpointer *result)
{
struct _ftd_data *ftd = user_data;
GNCLedgerDisplay2 *ledger;
gboolean new_ledger = FALSE;
GncPluginPage *page;
ledger = gnc_ledger_display2_find_by_query (ftd->ledger_q);
if (!ledger)
{
new_ledger = TRUE;
ledger = gnc_ledger_display2_query (query, SEARCH_LEDGER2,
REG2_STYLE_JOURNAL);
}
else
gnc_ledger_display2_set_query (ledger, query);
gnc_ledger_display2_refresh (ledger);
if (new_ledger)
{
page = gnc_plugin_page_register2_new_ledger (ledger);
gnc_main_window_open_page (NULL, page);
}
qof_query_destroy (ftd->q);
gnc_search_dialog_destroy (ftd->sw);
}
static void
free_ftd_cb (gpointer user_data)
{
struct _ftd_data *ftd = user_data;
if (!ftd)
return;
g_free (ftd);
}
GNCSearchWindow *
gnc_ui_find_transactions_dialog_create2 (GNCLedgerDisplay2 * orig_ledg)
{
QofIdType type = GNC_ID_SPLIT;
struct _ftd_data *ftd;
static GList *params = NULL;
QofQuery *start_q, *show_q = NULL;
gboolean num_action =
qof_book_use_split_action_for_num_field(gnc_get_current_book());
/* Build parameter list in reverse order */
if (params == NULL)
{
params = gnc_search_param_prepend (params, N_("All Accounts"),
ACCOUNT_MATCH_ALL_TYPE,
type, SPLIT_TRANS, TRANS_SPLITLIST,
SPLIT_ACCOUNT_GUID, NULL);
params = gnc_search_param_prepend (params, N_("Account"), GNC_ID_ACCOUNT,
type, SPLIT_ACCOUNT, QOF_PARAM_GUID,
NULL);
params = gnc_search_param_prepend (params, N_("Balanced"), NULL,
type, SPLIT_TRANS, TRANS_IS_BALANCED,
NULL);
params = gnc_search_param_prepend (params, N_("Reconcile"), RECONCILED_MATCH_TYPE,
type, SPLIT_RECONCILE, NULL);
params = gnc_search_param_prepend (params, N_("Share Price"), NULL,
type, SPLIT_SHARE_PRICE, NULL);
params = gnc_search_param_prepend (params, N_("Shares"), NULL,
type, SPLIT_AMOUNT, NULL);
params = gnc_search_param_prepend (params, N_("Value"), NULL,
type, SPLIT_VALUE, NULL);
params = gnc_search_param_prepend (params, N_("Date Posted"), NULL,
type, SPLIT_TRANS, TRANS_DATE_POSTED,
NULL);
params = gnc_search_param_prepend (params, N_("Notes"), NULL,
type, SPLIT_TRANS, TRANS_NOTES, NULL);
params = gnc_search_param_prepend (params, (num_action
? N_("Number/Action")
: N_("Action")), NULL,
type, SPLIT_ACTION, NULL);
params = gnc_search_param_prepend (params, (num_action
? N_("Transaction Number")
: N_("Number")), NULL,
type, SPLIT_TRANS, TRANS_NUM, NULL);
params = gnc_search_param_prepend (params, N_("Memo"), NULL,
type, SPLIT_MEMO, NULL);
params = gnc_search_param_prepend (params, N_("Description"), NULL,
type, SPLIT_TRANS, TRANS_DESCRIPTION,
NULL);
}
else
{
GList *l;
for (l = params; l; l = l->next)
{
GNCSearchParam *param = l->data;
if (num_action)
{
if (strcmp (param->title, N_("Action")) == 0)
gnc_search_param_set_title (param, N_("Number/Action"));
if (strcmp (param->title, N_("Number")) == 0)
gnc_search_param_set_title (param, N_("Transaction Number"));
}
else
{
if (strcmp (param->title, N_("Number/Action")) == 0)
gnc_search_param_set_title (param, N_("Action"));
if (strcmp (param->title, N_("Transaction Number")) == 0)
gnc_search_param_set_title (param, N_("Number"));
}
}
}
ftd = g_new0 (struct _ftd_data, 1);
if (orig_ledg)
{
ftd->ledger_q = gnc_ledger_display2_get_query (orig_ledg);
start_q = show_q = qof_query_copy (ftd->ledger_q);
}
else
{
start_q = qof_query_create ();
qof_query_set_book (start_q, gnc_get_current_book ());
/* In lieu of not "mis-using" some portion of the infrastructure by writing
* a bunch of new code, we just filter out the accounts of the template
* transactions. While these are in a seperate Account trees just for this
* reason, the query engine makes no distinction between Account trees.
* See Gnome Bug 86302.
* -- jsled
*
* copied from gnc-ledger-display2.c:gnc_ledger_display2_gl() -- warlord
*
* <jsled> Alternatively, you could look for a GNC_SX_ACCOUNT [SchedAction.h]
* key in the KVP frame of the split.
*/
{
Account *tRoot;
GList *al;
tRoot = gnc_book_get_template_root( gnc_get_current_book() );
al = gnc_account_get_descendants( tRoot );
xaccQueryAddAccountMatch( start_q, al, QOF_GUID_MATCH_NONE, QOF_QUERY_AND );
g_list_free (al);
al = NULL;
tRoot = NULL;
}
ftd->q = start_q; /* save this to destroy it later */
}
ftd->sw = gnc_search_dialog_create (type, _("Find Transaction"),
params, NULL, start_q, show_q,
NULL, do_find_cb, NULL,
ftd, free_ftd_cb, GNC_PREFS_GROUP_SEARCH, NULL);
if (!ftd->sw)
{
free_ftd_cb (ftd);
return NULL;
}
return ftd->sw;
}

View File

@ -1,33 +0,0 @@
/********************************************************************\
* dialog-find-transactions2.h : locate transactions/splits matching *
* criteria. *
* Copyright (C) 2000 Bill Gribble <grib@billgribble.com> *
* *
* 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@gnu.org *
\********************************************************************/
#ifndef DIALOG_FIND_TRANSACTIONS2_H
#define DIALOG_FIND_TRANSACTIONS2_H
#include "gnc-ledger-display2.h"
#include "dialog-search.h"
GNCSearchWindow *
gnc_ui_find_transactions_dialog_create2 (GNCLedgerDisplay2 * ledger);
#endif

File diff suppressed because it is too large Load Diff

View File

@ -1,34 +0,0 @@
/********************************************************************\
* dialog-print-check2.h : dialog to control check printing *
* Copyright (C) 2000 Bill Gribble <grib@billgribble.com> *
* Copyright (C) 2006 David Hampton <hampton@employees.org> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#ifndef DIALOG_PRINT_CHECK2_H
#define DIALOG_PRINT_CHECK2_H
#include "print-session.h"
typedef struct _print_check_dialog PrintCheckDialog;
void gnc_ui_print_check_dialog_create2 (GncPluginPageRegister2 *plugin_page,
GList *splits);
#endif

File diff suppressed because it is too large Load Diff

View File

@ -1,50 +0,0 @@
/********************************************************************\
* dialog-sx-editor2.h : dialog for scheduled transaction editing *
* Copyright (C) 2001,2006 Joshua Sled <jsled@asynchronous.org> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of version 2 and/or version 3 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@gnu.org *
\********************************************************************/
#ifndef DIALOG_SX_EDITOR2_H
#define DIALOG_SX_EDITOR2_H
#include "SchedXaction.h"
#define DIALOG_SCHEDXACTION2_CM_CLASS "dialog-scheduledtransactions"
#define DIALOG_SCHEDXACTION2_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor"
#define GNC_PREFS_GROUP_SXED "dialogs.sxs.transaction-editor"
#define GNC_PREF_CREATE_DAYS "create-days"
#define GNC_PREF_REMIND_DAYS "remind-days"
#define GNC_PREF_CREATE_AUTO "create-auto"
#define GNC_PREF_NOTIFY "notify"
typedef struct _GncSxEditorDialog2 GncSxEditorDialog2;
GncSxEditorDialog2* gnc_ui_scheduled_xaction_editor_dialog_create2 (SchedXaction *sx,
gboolean newSX);
void gnc_ui_scheduled_xaction_editor_dialog_destroy2 (GncSxEditorDialog2 *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_initialize2 (void);
#endif

View File

@ -45,10 +45,8 @@
#include "gnc-ui-util.h"
#include "Query.h"
#include "qof.h"
/*################## Added for Reg2 #################*/
#include "gnc-ledger-display2.h"
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
#include "gnc-ledger-display.h"
#include "gnc-plugin-page-register.h"
#include "gnc-main-window.h"
#include "gnc-component-manager.h"
#include "gnc-gui-query.h"
@ -1008,7 +1006,7 @@ gnc_ui_sx_since_last_run_dialog(GncSxInstanceModel *sx_instances, GList *auto_cr
static void
_show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids)
{
GNCLedgerDisplay2 *ledger;
GNCLedgerDisplay *ledger;
GncPluginPage *page;
Query *book_query, *guid_query, *query;
GList *guid_iter;
@ -1021,12 +1019,12 @@ _show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_t
xaccQueryAddGUIDMatch(guid_query, (GncGUID*)guid_iter->data, GNC_ID_TRANS, QOF_QUERY_OR);
}
query = qof_query_merge(book_query, guid_query, QOF_QUERY_AND);
/*################## Added for Reg2 #################*/
// inspired by dialog-find-transactions:do_find_cb:
ledger = gnc_ledger_display2_query(query, SEARCH_LEDGER2, REG2_STYLE_JOURNAL);
gnc_ledger_display2_refresh(ledger);
page = gnc_plugin_page_register2_new_ledger(ledger);
/*################## Added for Reg2 #################*/
ledger = gnc_ledger_display_query(query, SEARCH_LEDGER, REG_STYLE_JOURNAL);
gnc_ledger_display_refresh(ledger);
page = gnc_plugin_page_register_new_ledger(ledger);
g_object_set(G_OBJECT(page), "page-name", _("Created Transactions"), NULL);
gnc_main_window_open_page(NULL, page);

View File

@ -43,7 +43,6 @@
#include "dialog-file-access.h"
#include "dialog-fincalc.h"
#include "dialog-find-transactions.h"
#include "dialog-find-transactions2.h"
#include "dialog-sx-since-last-run.h"
#include "dialog-totd.h"
#include "assistant-acct-period.h"
@ -624,10 +623,7 @@ gnc_main_window_cmd_tools_close_book (GtkAction *action, GncMainWindowActionData
static void
gnc_main_window_cmd_tools_find_transactions (GtkAction *action, GncMainWindowActionData *data)
{
// gnc_ui_find_transactions_dialog_create (NULL);
/*################## Added for Reg2 #################*/
gnc_ui_find_transactions_dialog_create2 (NULL);
/*################## Added for Reg2 #################*/
gnc_ui_find_transactions_dialog_create (NULL);
}
static void

View File

@ -38,7 +38,6 @@
#include <glib/gi18n.h>
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h"
#include "gnc-plugin-page-register2.h"
#include "Scrub.h"
#include "Scrub3.h"
@ -146,10 +145,6 @@ static void gnc_plugin_page_account_tree_cmd_scrub (GtkAction *action, GncPlugin
static void gnc_plugin_page_account_tree_cmd_scrub_sub (GtkAction *action, GncPluginPageAccountTree *page);
static void gnc_plugin_page_account_tree_cmd_scrub_all (GtkAction *action, GncPluginPageAccountTree *page);
/* Command callback for new Register Test */
static void gnc_plugin_page_account_tree_cmd_open2_account (GtkAction *action, GncPluginPageAccountTree *page);
static void gnc_plugin_page_account_tree_cmd_open2_subaccounts (GtkAction *action, GncPluginPageAccountTree *page);
static guint plugin_page_signals[LAST_SIGNAL] = { 0 };
@ -170,23 +165,13 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] =
G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy)
},
{
"FileOpenAccount2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL,
N_("Open the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account)
},
{
"FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Old Style Register Account"), NULL,
N_("Open the old style register selected account"),
"FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL,
N_("Open selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account)
},
{
"FileOpenSubaccounts2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL,
N_("Open the selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_subaccounts)
},
{
"FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open Old St_yle Subaccounts"), NULL,
N_("Open the old style register selected account and all its subaccounts"),
"FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Subaccounts"), NULL,
N_("Open selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts)
},
@ -276,7 +261,6 @@ static const gchar *actions_requiring_account_rw[] =
static const gchar *actions_requiring_account_always[] =
{
"FileOpenAccountAction",
"FileOpenAccount2Action",
"FileOpenSubaccountsAction",
"ActionsLotsAction",
NULL
@ -304,7 +288,6 @@ static const gchar* readonly_inactive_actions[] =
static action_toolbar_labels toolbar_labels[] =
{
{ "FileOpenAccountAction", N_("Open") },
{ "FileOpenAccount2Action", N_("Open2") },
{ "EditEditAccountAction", N_("Edit") },
{ "FileNewAccountAction", N_("New") },
{ "EditDeleteAccountAction", N_("Delete") },
@ -399,7 +382,7 @@ gnc_plugin_page_account_tree_init (GncPluginPageAccountTree *plugin_page)
g_object_set(G_OBJECT(plugin_page),
"page-name", _("Accounts"),
"page-uri", "default:",
"ui-description", "gnc-plugin-page-account-tree2-ui.xml",
"ui-description", "gnc-plugin-page-account-tree-ui.xml",
NULL);
g_signal_connect (G_OBJECT (plugin_page), "selected",
G_CALLBACK (gnc_plugin_page_account_tree_selected), plugin_page);
@ -792,25 +775,6 @@ gppat_open_account_common (GncPluginPageAccountTree *page,
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
}
/*################## Added for Reg2 #################*/
/* New Register Common */
static void
gppat_open2_account_common (GncPluginPageAccountTree *page,
Account *account,
gboolean include_subs)
{
GtkWidget *window;
GncPluginPage *new_page;
if (account == NULL)
return;
window = GNC_PLUGIN_PAGE (page)->window;
new_page = gnc_plugin_page_register2_new (account, include_subs);
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
}
/*################## Added for Reg2 #################*/
static void
gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
GtkTreePath *path,
@ -839,7 +803,7 @@ gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
{
/* It's an account without any children, so open its register */
Account *account = gnc_tree_view_account_get_account_from_path (GNC_TREE_VIEW_ACCOUNT(treeview), path);
gppat_open2_account_common (page, account, FALSE);
gppat_open_account_common (page, account, FALSE);
}
}
}
@ -929,33 +893,6 @@ gnc_plugin_page_account_tree_cmd_open_subaccounts (GtkAction *action,
gppat_open_account_common (page, account, TRUE);
}
/*################## Added for Reg2 #################*/
/* Register Firing - Single Account to start with */
static void
gnc_plugin_page_account_tree_cmd_open2_account (GtkAction *action,
GncPluginPageAccountTree *page)
{
Account *account;
g_return_if_fail (GNC_IS_PLUGIN_PAGE_ACCOUNT_TREE (page));
account = gnc_plugin_page_account_tree_get_current_account (page);
gppat_open2_account_common (page, account, FALSE);
}
static void
gnc_plugin_page_account_tree_cmd_open2_subaccounts (GtkAction *action,
GncPluginPageAccountTree *page)
{
Account *account;
g_return_if_fail (GNC_IS_PLUGIN_PAGE_ACCOUNT_TREE (page));
account = gnc_plugin_page_account_tree_get_current_account (page);
gppat_open2_account_common (page, account, TRUE);
}
/*################## Added for Reg2 #################*/
static void
gnc_plugin_page_account_tree_cmd_edit_account (GtkAction *action, GncPluginPageAccountTree *page)
{

View File

@ -42,9 +42,6 @@
#include "swig-runtime.h"
#include "gnc-plugin-page-register.h"
/*################## Added for Reg2 #################*/
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
#include "gnc-plugin-register.h"
#include "gnc-plugin-menu-additions.h"
#include "gnc-plugin-page-report.h"
@ -634,32 +631,9 @@ gnc_plugin_page_register_new (Account *account, gboolean subaccounts)
GncPluginPage *page;
GncPluginPageRegisterPrivate *priv;
/*################## Added for Reg2 #################*/
const GList *item;
GncPluginPageRegister2 *new_register_page;
/*################## Added for Reg2 #################*/
ENTER("account=%p, subaccounts=%s", account,
subaccounts ? "TRUE" : "FALSE");
/*################## Added for Reg2 #################*/
// We test for the new register being open here, ie matching account guids
item = gnc_gobject_tracking_get_list (GNC_PLUGIN_PAGE_REGISTER2_NAME);
for ( ; item; item = g_list_next (item))
{
Account *new_account;
new_register_page = (GncPluginPageRegister2 *)item->data;
new_account = gnc_plugin_page_register2_get_account (new_register_page);
if (guid_equal (xaccAccountGetGUID (account), xaccAccountGetGUID (new_account)))
{
gnc_error_dialog (NULL, "%s",
_("You have tried to open an account in the old register while it is open in the new register."));
return NULL;
}
}
/*################## Added for Reg2 #################*/
if (subaccounts)
ledger = gnc_ledger_display_subaccounts (account);
else

File diff suppressed because it is too large Load Diff

View File

@ -1,159 +0,0 @@
/**********************************************************************
* gnc-plugin-page-register2.h -- register page functions *
* *
* Copyright (C) 2003 Jan Arne Petersen <jpetersen@uni-bonn.de> *
* Copyright (C) 2003,2005,2006 David Hampton <hampton@employees.org> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
**********************************************************************/
/** @addtogroup ContentPlugins
@{ */
/** @addtogroup Register2Plugin Register2 Page
@{ */
/** @file gnc-plugin-page-register.h
@brief Functions providing a register page for the GnuCash UI
@author Copyright (C) 2003 Jan Arne Petersen <jpetersen@uni-bonn.de>
@author Copyright (C) 2003 David Hampton <hampton@employees.org>
*/
#ifndef __GNC_PLUGIN_PAGE_REGISTER2_H
#define __GNC_PLUGIN_PAGE_REGISTER2_H
#include <gtk/gtk.h>
#include "Account.h"
#include "gnc-ledger-display2.h"
#include "gnc-plugin-page.h"
#include "gnc-split-reg2.h"
G_BEGIN_DECLS
/* type macros */
#define GNC_TYPE_PLUGIN_PAGE_REGISTER2 (gnc_plugin_page_register2_get_type ())
#define GNC_PLUGIN_PAGE_REGISTER2(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_PLUGIN_PAGE_REGISTER2, GncPluginPageRegister2))
#define GNC_PLUGIN_PAGE_REGISTER2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_PLUGIN_PAGE_REGISTER2, GncPluginPageRegister2Class))
#define GNC_IS_PLUGIN_PAGE_REGISTER2(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_PLUGIN_PAGE_REGISTER2))
#define GNC_IS_PLUGIN_PAGE_REGISTER2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_PLUGIN_PAGE_REGISTER2))
#define GNC_PLUGIN_PAGE_REGISTER2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_PLUGIN_PAGE_REGISTER2, GncPluginPageRegister2Class))
#define GNC_PLUGIN_PAGE_REGISTER2_NAME "GncPluginPageRegister2"
/* typedefs & structures */
typedef struct
{
GncPluginPage gnc_plugin_page;
} GncPluginPageRegister2;
typedef struct
{
GncPluginPageClass gnc_plugin_page;
} GncPluginPageRegister2Class;
/* function prototypes */
/** Retrieve the type number for the plugin page.
*
* @return The type number.
*/
GType gnc_plugin_page_register2_get_type (void);
/** Create a new "register" plugin page, given a pointer to an
* account.
*
* @param account The pointer to the account to embed in the
* register.
*
* @param subaccounts TRUE if all the sub-accounts of the specified
* account should be included in the register.
*
* @return The newly created plugin page.
*/
GncPluginPage *
gnc_plugin_page_register2_new (Account *account, gboolean subaccounts);
/** Create a new "register" plugin page, given a pointer to an already
* created ledger. This function should be used when the ledger
* already exists. (E.G. From the "find transaction" code, or from
* the scheduled transaction code.)
*
* @param ledger The pointer to the ledger to embed into the
* register.
*
* @return The newly created plugin page.
*/
GncPluginPage *
gnc_plugin_page_register2_new_ledger (GNCLedgerDisplay2 *ledger);
/** Create a new "register" plugin page containing a general ledger.
*
* @return The newly created plugin page.
*/
GncPluginPage *
gnc_plugin_page_register2_new_gl (void);
/** Set various register options on a newly created "register" plugin page.
*
* @param plugin_page The "register" page to modify.
*
* @param lines_default Used to calculate the minimum preferred height of
* the plugin page.
*
* @param read_only True if the register should be read-only.
*/
void
gnc_plugin_page_register2_set_options (GncPluginPage *plugin_page,
gint lines_default,
gboolean read_only);
/** Get the GNCSplitReg data structure associated with this register page.
*
* @param plugin_page A "register" page.
*/
GNCSplitReg2 *
gnc_plugin_page_register2_get_gsr (GncPluginPage *plugin_page);
/** Get the GNCLedgerDisplay data structure associated with this register page.
*
* @param plugin_page A "register" page.
*/
GNCLedgerDisplay2 *
gnc_plugin_page_register2_get_ledger (GncPluginPage *plugin_page);
/** Get the Account associated with this register page.
*
* @param page A "register" page.
*
* @return The account if the register contains only a single
* account, or an account and its sub-accounts. NULL otherwise.
*/
Account *
gnc_plugin_page_register2_get_account (GncPluginPageRegister2 *page);
G_END_DECLS
/** @} */
/** @} */
#endif /* __GNC_PLUGIN_PAGE_REGISTER2_H */

View File

@ -52,9 +52,6 @@
#include "Split.h"
#include "Transaction.h"
#include "dialog-sx-editor.h"
/*################## Added for Reg2 #################*/
#include "dialog-sx-editor2.h"
/*################## Added for Reg2 #################*/
#include "dialog-utils.h"
#include "gnc-commodity.h"
#include "gnc-component-manager.h"
@ -119,10 +116,6 @@ static void gppsl_row_activated_cb(GtkTreeView *tree_view, GtkTreePath *path, Gt
static void gnc_plugin_page_sx_list_cmd_new(GtkAction *action, GncPluginPageSxList *page);
static void gnc_plugin_page_sx_list_cmd_edit(GtkAction *action, GncPluginPageSxList *page);
/*################## Added for Reg2 #################*/
static void gnc_plugin_page_sx_list_cmd_new2(GtkAction *action, GncPluginPageSxList *page);
static void gnc_plugin_page_sx_list_cmd_edit2(GtkAction *action, GncPluginPageSxList *page);
/*################## Added for Reg2 #################*/
static void gnc_plugin_page_sx_list_cmd_delete(GtkAction *action, GncPluginPageSxList *page);
/* Command callbacks */
@ -133,22 +126,10 @@ static GtkActionEntry gnc_plugin_page_sx_list_actions [] =
"SxListNewAction", GNC_STOCK_NEW_ACCOUNT, N_("_New"), NULL,
N_("Create a new scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_new)
},
/*################## Added for Reg2 #################*/
{
"SxListNewAction2", GNC_STOCK_NEW_ACCOUNT, N_("_New 2"), NULL,
N_("Create a new scheduled transaction 2"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_new2)
},
/*################## Added for Reg2 #################*/
{
"SxListEditAction", GNC_STOCK_EDIT_ACCOUNT, N_("_Edit"), NULL,
N_("Edit the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_edit)
},
/*################## Added for Reg2 #################*/
{
"SxListEditAction2", GNC_STOCK_EDIT_ACCOUNT, N_("_Edit 2"), NULL,
N_("Edit the selected scheduled transaction 2"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_edit2)
},
/*################## Added for Reg2 #################*/
{
"SxListDeleteAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete"), NULL,
N_("Delete the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_delete)
@ -581,29 +562,6 @@ gnc_plugin_page_sx_list_cmd_new(GtkAction *action, GncPluginPageSxList *page)
gnc_ui_scheduled_xaction_editor_dialog_create(new_sx, new_sx_flag);
}
/*################## Added for Reg2 #################*/
static void
gnc_plugin_page_sx_list_cmd_new2 (GtkAction *action, GncPluginPageSxList *page)
{
SchedXaction *new_sx;
gboolean new_sx_flag = TRUE;
new_sx = xaccSchedXactionMalloc (gnc_get_current_book());
{
GDate now;
Recurrence *r = g_new0 (Recurrence, 1);
GList *schedule;
g_date_clear (&now, 1);
gnc_gdate_set_today (&now);
recurrenceSet(r, 1, PERIOD_MONTH, &now, WEEKEND_ADJ_NONE);
schedule = gnc_sx_get_schedule (new_sx);
schedule = g_list_append (schedule, r);
gnc_sx_set_schedule (new_sx, schedule);
}
gnc_ui_scheduled_xaction_editor_dialog_create2 (new_sx, new_sx_flag);
}
/*################## Added for Reg2 #################*/
static void
_edit_sx(gpointer data, gpointer user_data)
@ -611,13 +569,6 @@ _edit_sx(gpointer data, gpointer user_data)
gnc_ui_scheduled_xaction_editor_dialog_create((SchedXaction*)data, FALSE);
}
/*################## Added for Reg2 #################*/
static void
_edit_sx2 (gpointer data, gpointer user_data)
{
gnc_ui_scheduled_xaction_editor_dialog_create2 ((SchedXaction*)data, FALSE);
}
/*################## Added for Reg2 #################*/
static SchedXaction*
_argument_reorder_fn(GtkTreePath* list_path_data, GncTreeViewSxList* user_tree_view)
@ -651,33 +602,6 @@ gnc_plugin_page_sx_list_cmd_edit(GtkAction *action, GncPluginPageSxList *page)
g_list_free(selected_paths);
}
/*################## Added for Reg2 #################*/
static void
gnc_plugin_page_sx_list_cmd_edit2 (GtkAction *action, GncPluginPageSxList *page)
{
GncPluginPageSxListPrivate *priv = GNC_PLUGIN_PAGE_SX_LIST_GET_PRIVATE (page);
GtkTreeSelection *selection;
GList *selected_paths, *to_edit;
GtkTreeModel *model;
selection = gtk_tree_view_get_selection (priv->tree_view);
selected_paths = gtk_tree_selection_get_selected_rows (selection, &model);
if (g_list_length (selected_paths) == 0)
{
g_warning ("no selection edit.");
return;
}
to_edit = gnc_g_list_map (selected_paths,
(GncGMapFunc)_argument_reorder_fn,
priv->tree_view);
g_list_foreach(to_edit, (GFunc)_edit_sx2, NULL);
g_list_free (to_edit);
g_list_foreach (selected_paths, (GFunc)gtk_tree_path_free, NULL);
g_list_free (selected_paths);
}
/*################## Added for Reg2 #################*/
static void
gppsl_row_activated_cb(GtkTreeView *tree_view,

View File

@ -50,8 +50,8 @@ static void gnc_plugin_register_cmd_general_ledger (GtkAction *action, GncMainWi
static GtkActionEntry gnc_plugin_actions [] =
{
{
"ToolsGeneralLedgerAction", NULL, N_("Old St_yle General Ledger"), NULL,
N_("Open an old style general ledger window"),
"ToolsGeneralLedgerAction", NULL, N_("_General Ledger"), NULL,
N_("Open general ledger window"),
G_CALLBACK (gnc_plugin_register_cmd_general_ledger)
},
};

View File

@ -1,250 +0,0 @@
/*
* gnc-plugin-register2.c --
*
* Copyright (C) 2003 Jan Arne Petersen
* Author: Jan Arne Petersen <jpetersen@uni-bonn.de>
*
* 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@gnu.org
*/
#include "config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <string.h>
#include "gnc-component-manager.h"
#include "gnc-plugin-register2.h"
#include "gnc-plugin-page-register2.h"
#include "gnc-prefs.h"
static void gnc_plugin_register2_class_init (GncPluginRegister2Class *klass);
static void gnc_plugin_register2_init (GncPluginRegister2 *plugin);
static void gnc_plugin_register2_finalize (GObject *object);
static void gnc_plugin_register2_add_to_window (GncPlugin *plugin, GncMainWindow *window, GQuark type);
static void gnc_plugin_register2_remove_from_window (GncPlugin *plugin, GncMainWindow *window, GQuark type);
/* Command callbacks */
static void gnc_plugin_register2_cmd_general_ledger (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-register2-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-register2-ui.xml"
static GtkActionEntry gnc_plugin_actions [] =
{
{
"ToolsGeneralLedger2Action", NULL, N_("_General Ledger"), NULL,
N_("Open a general ledger window"),
G_CALLBACK (gnc_plugin_register2_cmd_general_ledger)
},
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
typedef struct GncPluginRegister2Private
{
gpointer dummy;
} GncPluginRegister2Private;
#define GNC_PLUGIN_REGISTER2_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_PLUGIN_REGISTER2, GncPluginRegister2Private))
static GObjectClass *parent_class = NULL;
static QofLogModule log_module = GNC_MOD_GUI;
/************************************************************
* Other Functions *
************************************************************/
/** This function is called whenever an entry in the general register
* preferences group is changed. It does nothing more than kick off a
* gui refresh which should be delivered to any open register page.
* The register pages will then reread their preferences and
* update the screen.
*
* @prefs Unused.
*
* @pref Unused.
*
* @user_data Unused.
*/
static void
gnc_plugin_register2_pref_changed (gpointer prefs, gchar *pref,
gpointer user_data)
{
ENTER("");
gnc_gui_refresh_all ();
LEAVE("");
}
/************************************************************
* Object Implementation *
************************************************************/
GType
gnc_plugin_register2_get_type (void)
{
static GType gnc_plugin_register2_type = 0;
if (gnc_plugin_register2_type == 0)
{
static const GTypeInfo our_info =
{
sizeof (GncPluginRegister2Class),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gnc_plugin_register2_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GncPluginRegister2),
0, /* n_preallocs */
(GInstanceInitFunc) gnc_plugin_register2_init
};
gnc_plugin_register2_type = g_type_register_static (GNC_TYPE_PLUGIN,
"GncPluginRegister2",
&our_info, 0);
}
return gnc_plugin_register2_type;
}
GncPlugin *
gnc_plugin_register2_new (void)
{
GncPluginRegister2 *plugin;
/* Reference the register page plugin to ensure it exists in
* the gtk type system. */
GNC_TYPE_PLUGIN_PAGE_REGISTER2;
plugin = g_object_new (GNC_TYPE_PLUGIN_REGISTER2,
NULL);
return GNC_PLUGIN (plugin);
}
static void
gnc_plugin_register2_class_init (GncPluginRegister2Class *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GncPluginClass *plugin_class = GNC_PLUGIN_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gnc_plugin_register2_finalize;
/* plugin info */
plugin_class->plugin_name = GNC_PLUGIN_REGISTER2_NAME;
/* function overrides */
plugin_class->add_to_window = gnc_plugin_register2_add_to_window;
plugin_class->remove_from_window =
gnc_plugin_register2_remove_from_window;
/* widget addition/removal */
plugin_class->actions_name = PLUGIN_ACTIONS_NAME;
plugin_class->actions = gnc_plugin_actions;
plugin_class->n_actions = gnc_plugin_n_actions;
plugin_class->ui_filename = PLUGIN_UI_FILENAME;
g_type_class_add_private(klass, sizeof(GncPluginRegister2Private));
}
static void
gnc_plugin_register2_init (GncPluginRegister2 *plugin)
{
}
static void
gnc_plugin_register2_finalize (GObject *object)
{
GncPluginRegister2 *plugin;
GncPluginRegister2Private *priv;
g_return_if_fail (GNC_IS_PLUGIN_REGISTER2 (object));
plugin = GNC_PLUGIN_REGISTER2 (object);
priv = GNC_PLUGIN_REGISTER2_GET_PRIVATE(plugin);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
/************************************************************
* Plugin Function Implementation *
************************************************************/
/** Initialize the registeru for a window. This function is
* called as part of the initialization of a window, after all the
* plugin menu items have been added to the menu structure. Its job
* is to correctly initialize the register. It does this by
* installing a function that listens for preference changes. Each
* time a preference changes, it kicks off a gui refresh.
*
* @param plugin A pointer to the gnc-plugin object responsible for
* adding/removing the register.
*
* @param window A pointer to the gnc-main-window that is being initialized.
*
* @param type Unused
*/
static void
gnc_plugin_register2_add_to_window (GncPlugin *plugin,
GncMainWindow *window,
GQuark type)
{
gnc_prefs_register_cb (GNC_PREFS_GROUP_GENERAL_REGISTER, NULL,
gnc_plugin_register2_pref_changed, window);
}
/** Finalize the register for this window. This function is
* called as part of the destruction of a window.
*
* @param plugin A pointer to the gnc-plugin object responsible for
* adding/removing the register. It stops listening for
* changes in the register preferences.
*
* @param window A pointer the gnc-main-window that is being destroyed.
*
* @param type Unused
*/
static void
gnc_plugin_register2_remove_from_window (GncPlugin *plugin,
GncMainWindow *window,
GQuark type)
{
gnc_prefs_remove_cb_by_func (GNC_PREFS_GROUP_GENERAL_REGISTER, NULL,
gnc_plugin_register2_pref_changed, window);
}
/************************************************************
* Command Callbacks *
************************************************************/
static void
gnc_plugin_register2_cmd_general_ledger (GtkAction *action,
GncMainWindowActionData *data)
{
GncPluginPage *page;
g_return_if_fail (data != NULL);
page = gnc_plugin_page_register2_new_gl ();
gnc_main_window_open_page (data->window, page);
}

View File

@ -1,60 +0,0 @@
/*
* gnc-plugin-register2.h --
*
* Copyright (C) 2003 Jan Arne Petersen
* Author: Jan Arne Petersen <jpetersen@uni-bonn.de>
*
* 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@gnu.org
*/
#ifndef __GNC_PLUGIN_REGISTER2_H
#define __GNC_PLUGIN_REGISTER2_H
#include "gnc-plugin.h"
G_BEGIN_DECLS
/* type macros */
#define GNC_TYPE_PLUGIN_REGISTER2 (gnc_plugin_register2_get_type ())
#define GNC_PLUGIN_REGISTER2(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_PLUGIN_REGISTER2, GncPluginRegister2))
#define GNC_PLUGIN_REGISTER2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_PLUGIN_REGISTER2, GncPluginRegister2Class))
#define GNC_IS_PLUGIN_REGISTER2(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_PLUGIN_REGISTER2))
#define GNC_IS_PLUGIN_REGISTER2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNC_TYPE_PLUGIN_REGISTER2))
#define GNC_PLUGIN_REGISTER2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_PLUGIN_REGISTER2, GncPluginRegister2Class))
#define GNC_PLUGIN_REGISTER2_NAME "gnc-plugin-register2"
/* typedefs & structures */
typedef struct
{
GncPlugin gnc_plugin;
} GncPluginRegister2;
typedef struct
{
GncPluginClass gnc_plugin;
} GncPluginRegister2Class;
/* function prototypes */
GType gnc_plugin_register2_get_type (void);
GncPlugin *gnc_plugin_register2_new (void);
G_END_DECLS
#endif /* __GNC_PLUGIN_REGISTER2_H */

File diff suppressed because it is too large Load Diff

View File

@ -1,158 +0,0 @@
/********************************************************************\
* gnc-split-reg2.h -- A widget for the common register look-n-feel.*
* Copyright (C) 1997 Robin D. Clark *
* Copyright (C) 1997-1998 Linas Vepstas <linas@linas.org> *
* Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu> *
* Copyright (C) 1999-2000 Dave Peticolas <dave@krondo.com> *
* Copyright (C) 2001 Gnumatic, Inc. *
* Copyright (C) 2002,2006 Joshua Sled <jsled@asynchronous.org> *
* Copyright (C) 2012 Robert Fewell *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* 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@gnu.org *
\********************************************************************/
#ifndef GNC_SPLIT_REG2_H
#define GNC_SPLIT_REG2_H
#include "gnc-ledger-display2.h"
#include "gnc-split-reg.h"
#include "gnc-tree-view-split-reg.h"
#define GNC_SPLIT_REG2(obj) G_TYPE_CHECK_INSTANCE_CAST( obj, gnc_split_reg2_get_type(), GNCSplitReg2 )
#define GNC_SPLIT_REG2_CLASS(klass) G_TYPE_CHECK_CLASS_CAST( klass, gnc_split_reg2_get_type(), GNCSplitReg2Class )
#define IS_GNC_SPLIT_REG2(obj) G_TYPE_CHECK_INSTANCE_TYPE( obj, gnc_split_reg2_get_type() )
typedef struct _GNCSplitReg2 GNCSplitReg2;
typedef struct _GNCSplitReg2Class GNCSplitReg2Class;
struct _GNCSplitReg2
{
/* The "parent" widget. */
GtkVBox vbox;
/* The containing window. */
GtkWidget *window;
GtkWidget *scroll_bar;
GtkAdjustment *scroll_adj;
GtkWidget *toolbar;
GtkWidget *summarybar;
/* Summary Bar Labels */
GtkWidget *balance_label;
GtkWidget *cleared_label;
GtkWidget *reconciled_label;
GtkWidget *future_label;
GtkWidget *projectedminimum_label;
GtkWidget *shares_label;
GtkWidget *value_label;
/** The current ledger display. **/
GNCLedgerDisplay2 *ledger;
gint numRows;
gboolean read_only;
};
struct _GNCSplitReg2Class
{
GtkVBoxClass parent_class;
/* Signal defaults */
void (*help_changed) (GNCSplitReg2 *w, gpointer user_data);
};
/*FIXME Note sure about this == Coming from original gnc-split-reg.h */
typedef GNC_SPLIT_REG_ITEM GNC_SPLIT_REG2_ITEM;
/**
* GTK-related; gets an identifier for the class of GNCSplitRegs.
**/
GType gnc_split_reg2_get_type (void);
/**
* Creates and returns a GNCSplitReg.
* @param ld The GNCLedgerDisplay to use for display.
* @param parent The containing window.
* @param numberOfLines The initial number of lines for the register.
* @param read_only If the contained register should be setup read-only.
**/
GtkWidget* gnc_split_reg2_new (GNCLedgerDisplay2 *ld,
GtkWindow *parent,
gint numberOfLines,
gboolean read_only);
/**
* Returns the GncTreeView Split Register in effect for this GNCSplitReg.
**/
GncTreeViewSplitReg *gnc_split_reg2_get_register (GNCSplitReg2 *gsr);
/**
* Create and returns a summarybar for this GNCSplitReg.
**/
GtkWidget *gnc_split_reg2_create_summary_bar (GNCSplitReg2 *gsr);
/**
* Gets/sets the style of the GNCSplitReg.
**/
void gnc_split_reg2_change_style (GNCSplitReg2 *gsr, SplitRegisterStyle2 style);
/**
* Can return NULL if the indicated subwidget was not created.
**/
GtkWidget *gnc_split_reg2_get_summarybar (GNCSplitReg2 *gsr);
/**
* Jump to split.
**/
void gnc_split_reg2_jump_to_split (GNCSplitReg2 *gsr, Split *split);
/**
* Move the cursor to the split in the non-blank amount column.
**/
void gnc_split_reg2_jump_to_split_amount (GNCSplitReg2 *gsr, Split *split);
/**
* Raise an existing register window to the front.
**/
void gnc_split_reg2_raise (GNCSplitReg2 *gsr);
/**
* Callers can use this to determine if they need to reflect some "read-only"
* status in the window which contains the GNCSplitReg.
* @return TRUE if the register is read-only, FALSE if not.
**/
gboolean gnc_split_reg2_get_read_only (GNCSplitReg2 *gsr);
/*
* Create a transaction entry with given amount and date. One account is
* specified, the other is undefined i.e. it defaults to orphan account.
* Jump to the transaction entry in the register.
* The purpose of this function to create an adjustment entry from the reconcile
* window.
*/
void gnc_split_reg2_balancing_entry (GNCSplitReg2 *gsr, Account *account,
time64 statement_date, gnc_numeric balancing_amount);
void gnc_split_reg2_set_moved_cb (GNCSplitReg2 *gsr, GFunc cb, gpointer cb_data);
#endif /* GNC_SPLIT_REG2_H */

View File

@ -275,36 +275,11 @@
<summary>Only display leaf account names.</summary>
<description>Show only the names of the leaf accounts in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Activating this option implies that you use unique leaf names.</description>
</key>
<key name="show-extra-dates" type="b">
<default>false</default>
<summary>Show the entered and reconcile dates</summary>
<description>Show the date when the transaction was entered below the posted date and reconciled date on split row.</description>
</key>
<key name="show-extra-dates-on-selection" type="b">
<default>false</default>
<summary>Show entered and reconciled dates on selection</summary>
<description>Show the entered date and reconciled date on transaction selection.</description>
</key>
<key name="show-calendar-buttons" type="b">
<default>false</default>
<summary>Show the calendar buttons</summary>
<description>Show the calendar buttons Cancel, Today and Select.</description>
</key>
<key name="selection-to-blank-on-expand" type="b">
<default>false</default>
<summary>Move the selection to the blank split on expand</summary>
<description>This will move the selection to the blank split when the transaction is expanded.</description>
</key>
<key name="max-transactions" type="d">
<default>0.0</default>
<summary>Number of transactions to show in a register.</summary>
<description>Show this many transactions in a register. A value of zero means show all transactions.</description>
</key>
<key name="key-length" type="d">
<default>2.0</default>
<summary>Number of characters for auto complete.</summary>
<description>This sets the number of characters before auto complete starts for description, notes and memo fields.</description>
</key>
</schema>
<schema id="org.gnucash.general.report" path="/org/gnucash/general/report/">

View File

@ -15,7 +15,6 @@ gtkbuilder_DATA = \
dialog-tax-info.glade \
gnc-plugin-page-budget.glade \
gnc-plugin-page-register.glade \
gnc-plugin-page-register2.glade \
window-autoclear.glade \
window-reconcile.glade

View File

@ -1,861 +0,0 @@
<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="Duplicate Transaction Dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Duplicate Transaction</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button76">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button77">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="duplicate_title_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;New Transaction Information&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="duplicate_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Date:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="num_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Number:</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
<property name="mnemonic_widget">num_spin</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="num_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkHBox" id="date_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-6">button76</action-widget>
<action-widget response="-5">button77</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="Filter By">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Filter register by...</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<signal name="response" handler="gnc_plugin_page_register2_filter_response_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton4">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton4">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox103">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<child>
<object class="GtkRadioButton" id="filter_show_all">
<property name="label" translatable="yes">Show _All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847680">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="filter_show_range">
<property name="label" translatable="yes">Select Range:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">filter_show_all</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_select_range_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkTable" id="select_range_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">7</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label847682">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Start:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="start_date_earliest">
<property name="label" translatable="yes">_Earliest</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_start_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="end_date_choose">
<property name="label" translatable="yes">Choo_se Date:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_end_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="end_date_today">
<property name="label" translatable="yes">Toda_y</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">end_date_choose</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_end_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="end_date_latest">
<property name="label" translatable="yes">_Latest</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">end_date_choose</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_end_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847683">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847684">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">End:</property>
</object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="start_date_choose">
<property name="label" translatable="yes">C_hoose Date:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">start_date_earliest</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_start_cb" swapped="no"/>
</object>
<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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="start_date_today">
<property name="label" translatable="yes">_Today</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">start_date_earliest</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_start_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkHBox" id="start_date_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="end_date_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label847678">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Date</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox104">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="n_rows">7</property>
<property name="n_columns">3</property>
<child>
<object class="GtkCheckButton" id="filter_status_unreconciled">
<property name="label" translatable="yes">_Unreconciled</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_status_one_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="filter_status_reconciled">
<property name="label" translatable="yes">_Reconciled</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_status_one_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="filter_status_cleared">
<property name="label" translatable="yes">C_leared</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_status_one_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="filter_status_voided">
<property name="label" translatable="yes">_Voided</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_status_one_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="filter_status_frozen">
<property name="label" translatable="yes">_Frozen</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_status_one_cb" swapped="no"/>
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkButton" id="button84">
<property name="label" translatable="yes">Select _All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_plugin_page_register2_filter_status_all_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel" id="label847679">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Status</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="filter_save">
<property name="label" translatable="yes">Sa_ve Filter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">1</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register2_filter_save_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">6</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-6">cancelbutton4</action-widget>
<action-widget response="-5">okbutton4</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="Void Transaction">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Void Transaction</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox100">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label847671">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Reason for voiding transaction:</property>
<property name="justify">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="reason">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="-6">cancelbutton1</action-widget>
<action-widget response="-5">okbutton1</action-widget>
</action-widgets>
</object>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">1000000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
</interface>

View File

@ -50,10 +50,8 @@
#include "gnc-plugin-basic-commands.h" /* FIXME Remove this line*/
#include "gnc-plugin-file-history.h" /* FIXME Remove this line*/
#include "gnc-plugin-register.h" /* FIXME Remove this line*/
#include "gnc-plugin-register2.h" /* FIXME Remove this line*/
#include "gnc-plugin-budget.h"
#include "gnc-plugin-page-register.h"
#include "gnc-plugin-page-register2.h"
#include "gnc-plugin-manager.h" /* FIXME Remove this line*/
#include "gnc-html.h"
#include "gnc-gnome-utils.h"
@ -418,8 +416,6 @@ gnc_main_gui_init (void)
gnc_plugin_manager_get (), gnc_plugin_menu_additions_new ());
gnc_plugin_manager_add_plugin (
gnc_plugin_manager_get (), gnc_plugin_register_new ());
gnc_plugin_manager_add_plugin (
gnc_plugin_manager_get (), gnc_plugin_register2_new ());
/* I'm not sure why the FIXME note says to remove this. Maybe
each module should be adding its own plugin to the manager?
Anyway... Oh, maybe... nah */

View File

@ -5,12 +5,9 @@ ui_DATA = \
gnc-plugin-account-tree-ui.xml \
gnc-plugin-basic-commands-ui.xml \
gnc-plugin-page-account-tree-ui.xml \
gnc-plugin-page-account-tree2-ui.xml \
gnc-plugin-file-history-ui.xml \
gnc-plugin-register-ui.xml \
gnc-plugin-register2-ui.xml \
gnc-plugin-page-register-ui.xml \
gnc-plugin-page-register2-ui.xml \
gnc-plugin-page-sx-list-ui.xml \
gnc-plugin-page-sxregister-ui.xml \
gnc-sxed-to-create-window-ui.xml \

View File

@ -1,74 +0,0 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<placeholder name="EditSelectedPlaceholder">
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
<menuitem name="EditDeleteAccount" action="EditDeleteAccountAction"/>
<menuitem name="EditRenumberSubaccounts" action="EditRenumberSubaccountsAction"/>
<separator name="EditSep2"/>
<menuitem name="FileOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="FileOpenAccount" action="FileOpenAccountAction"/>
<menuitem name="FileOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
<menuitem name="FileOpenSubaccounts" action="FileOpenSubaccountsAction"/>
</placeholder>
</menu>
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder">
<separator name="ActionsSep1"/>
<menuitem name="FileNewAccount" action="FileNewAccountAction"/>
<menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
<separator name="ActionsSep2"/>
<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
<menuitem name="ActionsAutoClear" action="ActionsAutoClearAction"/>
<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
<menuitem name="ActionLots" action="ActionsLotsAction"/>
<separator name="ActionsSep3"/>
<menu name="ScrubMenu" action="ScrubMenuAction">
<menuitem name="Scrub" action="ScrubAction"/>
<menuitem name="ScrubSub" action="ScrubSubAction"/>
<menuitem name="ScrubAll" action="ScrubAllAction"/>
</menu>
</placeholder>
</menu>
</menubar>
<popup name="MainPopup" action="FakeToplevel">
<placeholder name="PopupPlaceholder2">
<menuitem name="AccountOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="AccountOpenAccount" action="FileOpenAccountAction"/>
<menuitem name="AccountOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
<menuitem name="AccountOpenSubaccounts" action="FileOpenSubaccountsAction"/>
<menuitem name="AccountEditAccount" action="EditEditAccountAction"/>
<separator name="AccountSep1"/>
<menuitem name="AccountReconcile" action="ActionsReconcileAction"/>
<menuitem name="AccountAutoClear" action="ActionsAutoClearAction"/>
<menuitem name="AccountTransfer" action="ActionsTransferAction"/>
<menuitem name="AccountStockSplit" action="ActionsStockSplitAction"/>
<menuitem name="AccountLots" action="ActionsLotsAction"/>
<separator name="AccountSep2"/>
<menuitem name="AccountNewAccount" action="FileNewAccountAction"/>
<menuitem name="AccountDeleteAccount" action="EditDeleteAccountAction"/>
<separator name="AccountSep3"/>
</placeholder>
<placeholder name="PopupBottomPlaceholder">
<menu name="ScrubMenu" action="ScrubMenuAction">
<menuitem name="Scrub" action="ScrubAction"/>
<menuitem name="ScrubSub" action="ScrubSubAction"/>
<menuitem name="ScrubAll" action="ScrubAllAction"/>
</menu>
</placeholder>
</popup>
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder">
<separator name="ToolbarSep2"/>
<toolitem name="ToolbarOpenAccount" action="FileOpenAccountAction"/>
<toolitem name="ToolbarOpenAccount2" action="FileOpenAccount2Action"/>
<toolitem name="ToolbarEditAccount" action="EditEditAccountAction"/>
<separator name="ToolbarSep3"/>
<toolitem name="ToolbarNewAccount" action="FileNewAccountAction"/>
<toolitem name="ToolbarDeleteAccount" action="EditDeleteAccountAction"/>
</placeholder>
</toolbar>
</ui>

View File

@ -1,110 +0,0 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<placeholder name="EditAllSelectedPlaceholder">
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
</placeholder>
</menu>
<menu name="Transaction" action="TransactionAction">
<menuitem name="CutTransaction" action="CutTransactionAction"/>
<menuitem name="CopyTransaction" action="CopyTransactionAction"/>
<menuitem name="PasteTransaction" action="PasteTransactionAction"/>
<menuitem name="TransactionUp" action="TransactionUpAction"/>
<menuitem name="TransactionDown" action="TransactionDownAction"/>
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<!--menuitem name="ShiftTransactionForward" action="ShiftTransactionForwardAction"/-->
<separator name="TransactionSep1"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
<separator name="TransactionSep2"/>
<menuitem name="VoidTransaction" action="VoidTransactionAction"/>
<menuitem name="UnvoidTransaction" action="UnvoidTransactionAction"/>
<menuitem name="ReverseTransaction" action="ReverseTransactionAction"/>
</menu>
<menu name="View" action="ViewAction">
<placeholder name="ViewContentPlaceholder">
<menuitem name="ViewStyleBasic" action="ViewStyleBasicAction"/>
<menuitem name="ViewStyleAutoSplit" action="ViewStyleAutoSplitAction"/>
<menuitem name="ViewStyleJournal" action="ViewStyleJournalAction"/>
<separator name="ViewSep44"/>
<menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
<menuitem name="ViewStyleExtraDates" action="ViewStyleExtraDatesAction"/>
</placeholder>
</menu>
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder">
<separator name="ActionsSep1"/>
<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
<menuitem name="ActionLots" action="ActionsLotsAction"/>
<separator name="ActionsSep4"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
<menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
<menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
<menuitem name="JumpTransaction" action="JumpTransactionAction"/>
<separator name="ActionsSep5"/>
</placeholder>
<menu name="ScrubMenu" action="ScrubMenuAction">
<menuitem name="ScrubAll" action="ScrubAllAction"/>
<menuitem name="ScrubCurrent" action="ScrubCurrentAction"/>
</menu>
</menu>
<menu name="Reports" action="ReportsAction">
<placeholder name="AccountReports">
<menuitem name="ReportsAccountReport" action="ReportsAccountReportAction"/>
<menuitem name="ReportsAcctTransReport" action="ReportsAcctTransReportAction"/>
</placeholder>
</menu>
</menubar>
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder">
<toolitem name="ToolbarTransactionUp" action="TransactionUpAction"/>
<toolitem name="ToolbarTransactionDown" action="TransactionDownAction"/>
<toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
<toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
<separator name="ToolbarSep66"/>
<toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
<toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
<separator name="ToolbarSep67"/>
<toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
<toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
<toolitem name="ToolbarJumpTransaction" action="JumpTransactionAction"/>
<toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
<separator name="ToolbarSep68"/>
<toolitem name="ToolbarTransfer" action="ActionsTransferAction"/>
<toolitem name="ActionsReconcile" action="ActionsReconcileAction"/>
</placeholder>
</toolbar>
<popup name="MainPopup" action="FakeToplevel">
<placeholder name="PopupPlaceholder1">
<menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
</placeholder>
<placeholder name="PopupPlaceholder2">
<menuitem name="TransactionUp" action="TransactionUpAction"/>
<menuitem name="TransactionDown" action="TransactionDownAction"/>
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<!--menuitem name="ShiftTransactionForward" action="ShiftTransactionForwardAction"/-->
<separator name="PopupSep2"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
<separator name="PopupSep3"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
<menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
<menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
<menuitem name="JumpTransaction" action="JumpTransactionAction"/>
</placeholder>
</popup>
</ui>

View File

@ -3,9 +3,7 @@
<placeholder name="AdditionalMenusPlaceholder">
<menu action="SxListAction">
<menuitem name="SxListNew" action="SxListNewAction"/>
<menuitem name="SxListNew2" action="SxListNewAction2"/>
<menuitem name="SxListEdit" action="SxListEditAction"/>
<menuitem name="SxListEdit2" action="SxListEditAction2"/>
<menuitem name="SxListDelete" action="SxListDeleteAction"/>
</menu>
</placeholder>

View File

@ -1,9 +0,0 @@
<ui>
<menubar>
<menu name="Tools" action="ToolsAction">
<placeholder name="ToolsPlaceholder">
<menuitem name="ToolsGeneralLedger2" action="ToolsGeneralLedger2Action"/>
</placeholder>
</menu>
</menubar>
</ui>

File diff suppressed because it is too large Load Diff

View File

@ -1,68 +0,0 @@
/********************************************************************\
* window-reconcile2.h -- the reconcile window *
* Copyright (C) 1997 Robin D. Clark *
* Copyright (C) 1998-2000 Linas Vepstas *
* *
* 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@gnu.org *
\********************************************************************/
#ifndef WINDOW_RECONCILE2_H
#define WINDOW_RECONCILE2_H
#include "Account.h"
#include <gtk/gtk.h>
/** STRUCTS *********************************************************/
typedef struct _RecnWindow2 RecnWindow2;
/** PROTOTYPES ******************************************************/
/********************************************************************\
* recnWindow2 *
* opens up the window to reconcile an account *
* *
* Args: parent - the parent of this window *
* account - the account to reconcile *
*
* Return: recnData - the instance of this RecnWindow2, or NULL if the
* user pressed Cancel in the initial date query.
\********************************************************************/
RecnWindow2 *recnWindow2 (GtkWidget *parent, Account *account);
/********************************************************************\
* recnWindow2WithBalance
*
* Opens up the window to reconcile an account, but with ending
* balance and statement date already given.
*
* Args: parent - The parent widget of the new window
* account - The account to reconcile
* new_ending - The amount for ending balance
* statement_date - The date of the statement
* Return: recnData - the instance of this RecnWindow2
\********************************************************************/
RecnWindow2 *recnWindow2WithBalance (GtkWidget *parent,
Account *account,
gnc_numeric new_ending,
time64 statement_date);
void gnc_ui_reconcile_window2_raise (RecnWindow2 * recnData);
#endif /* WINDOW_RECONCILE2_H */

View File

@ -46,7 +46,6 @@
#include "gnc-plugin-manager.h"
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h"
#include "gnc-plugin-page-register2.h"
#include "gnc-main-window.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h" // for gnc_get_current_book
@ -445,12 +444,6 @@ main_window_to_account(GncMainWindow *window)
account = gnc_plugin_page_register_get_account(
GNC_PLUGIN_PAGE_REGISTER(page));
}
else if (strcmp(page_name, GNC_PLUGIN_PAGE_REGISTER2_NAME) == 0)
{
DEBUG("register2 page");
account = gnc_plugin_page_register2_get_account(
GNC_PLUGIN_PAGE_REGISTER2(page));
}
else if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0)
{
DEBUG("account tree page");

View File

@ -4,7 +4,6 @@ pkglib_LTLIBRARIES = libgncmod-ledger-core.la
libgncmod_ledger_core_la_SOURCES = \
gnc-ledger-display.c \
gnc-ledger-display2.c \
gncmod-ledger-core.c \
split-register.c \
split-register-control.c \
@ -16,7 +15,6 @@ libgncmod_ledger_core_la_SOURCES = \
noinst_HEADERS = \
gnc-ledger-display.h \
gnc-ledger-display2.h \
split-register.h \
split-register-control.h \
split-register-layout.h \

File diff suppressed because it is too large Load Diff

View File

@ -1,144 +0,0 @@
/********************************************************************\
* gnc-ledger-display.h -- utilities for dealing with multiple *
* register/ledger windows in GnuCash *
* *
* Copyright (C) 1997 Robin D. Clark *
* Copyright (C) 1997, 1998 Linas Vepstas *
* Copyright (C) 2001 Linux Developers Group *
* Copyright (C) 2012 Robert Fewell *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* 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., 675 Mass Ave, Cambridge, MA 02139, USA. *
* *
\********************************************************************/
#ifndef GNC_LEDGER_DISPLAY2_H
#define GNC_LEDGER_DISPLAY2_H
#include <glib.h>
#include "Account.h"
#include "Query.h"
#include "split-register.h"
#include "SchedXaction.h"
#include "Transaction.h"
#include "gnc-tree-model-split-reg.h"
#include "gnc-tree-view-split-reg.h"
/** Definitions *****************************************************/
/* The GNCLedgerDisplay2 struct describes a single register/ledger
* instance. It has a SplitRegister specially configured for
* displaying the results of a Query. It also stores the Query. */
typedef struct gnc_ledger_display2 GNCLedgerDisplay2;
typedef void (*GNCLedgerDisplay2Destroy) (GNCLedgerDisplay2 *ld);
typedef GtkWidget *(*GNCLedgerDisplay2GetParent) (GNCLedgerDisplay2 *ld);
typedef void (*GNCLedgerDisplay2SetHelp) (GNCLedgerDisplay2 *ld,
const char *help_str);
typedef enum
{
LD2_SINGLE,
LD2_SUBACCOUNT,
LD2_GL,
} GNCLedgerDisplay2Type;
/** Prototypes ******************************************************/
/* returns the 'lead' account of a ledger display, or NULL if none. */
Account * gnc_ledger_display2_leader (GNCLedgerDisplay2 *ld);
GNCLedgerDisplay2Type gnc_ledger_display2_type (GNCLedgerDisplay2 *ld);
/* get and set the user data associated with the ledger */
void gnc_ledger_display2_set_user_data (GNCLedgerDisplay2 *ld,
gpointer user_data);
gpointer gnc_ledger_display2_get_user_data (GNCLedgerDisplay2 *ld);
/* set the handlers used by the ledger display */
void gnc_ledger_display2_set_handlers (GNCLedgerDisplay2 *ld,
GNCLedgerDisplay2Destroy destroy,
GNCLedgerDisplay2GetParent get_parent);
/* Set and Get the tree view used by the ledger display */
void gnc_ledger_display2_set_split_view_register (GNCLedgerDisplay2 *ld, GncTreeViewSplitReg *view);
GncTreeViewSplitReg * gnc_ledger_display2_get_split_view_register (GNCLedgerDisplay2 *ld);
void gnc_ledger_display2_set_split_view_refresh (GNCLedgerDisplay2 *ld, gboolean ok);
/** Returns the parent of a given ledger display */
GtkWidget *gnc_ledger_display2_get_parent( GNCLedgerDisplay2 *ld );
/* return the split register associated with a ledger display */
GncTreeModelSplitReg * gnc_ledger_display2_get_split_model_register (GNCLedgerDisplay2 *ld);
/* opens up a register window to display a single account */
GNCLedgerDisplay2 * gnc_ledger_display2_simple (Account *account);
/* opens up a register window to display the parent account and all of
* its children. */
GNCLedgerDisplay2 * gnc_ledger_display2_subaccounts (Account *account);
/* opens up a general ledger window */
GNCLedgerDisplay2 * gnc_ledger_display2_gl (void);
/**
* Displays a template ledger.
* This lists template Splits from the given ScheduledTransaction.
*
* Really, requires a GList of scheduled transactions and kvp-frame
* data.
**/
GNCLedgerDisplay2 * gnc_ledger_display2_template_gl (char *id);
/* display a general ledger for an arbitrary query */
GNCLedgerDisplay2 * gnc_ledger_display2_query (Query *query,
SplitRegisterType2 type,
SplitRegisterStyle2 style);
/* Set the query used for a register. */
void gnc_ledger_display2_set_query (GNCLedgerDisplay2 *ledger_display,
Query *q);
/* return the query associated with a ledger */
Query * gnc_ledger_display2_get_query (GNCLedgerDisplay2 *ld);
/* If the given ledger display still exists, return it. Otherwise,
* return NULL */
GNCLedgerDisplay2 * gnc_ledger_display2_find_by_query (Query *q);
/* redisplay/redraw only the indicated window. Both routines do same
* thing, they differ only by the argument they take. */
void gnc_ledger_display2_refresh (GNCLedgerDisplay2 * ledger_display);
void gnc_ledger_display2_refresh_by_split_register (GncTreeModelSplitReg *model);
/* This is used to load the register for the schedule */
void gnc_ledger_display2_refresh_sched (GNCLedgerDisplay2 *ld, GList *splits);
/* Refilter the register */
void gnc_ledger_display2_refilter (GNCLedgerDisplay2 *ld);
/* close the window */
void gnc_ledger_display2_close (GNCLedgerDisplay2 * ledger_display);
/* Returns a boolean of whether this display should be single or double lined
* mode by default */
gboolean gnc_ledger_display2_default_double_line (GNCLedgerDisplay2 *gld);
#endif