IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Delete Register2 code, it can be retrieved from Git if needed.

Browse Source
This commit is contained in:
Mike Alexander 2022-02-04 00:33:39 -05:00
parent 3f5b4228b9
commit 3161df6fb8
48 changed files with 1254 additions and 28725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -53,7 +53,6 @@ option (WITH_GNUCASH "Build all of GnuCash, not just the library" ON)
option (WITH_OFX "compile with ofx support (needs LibOFX)" ON) option (WITH_OFX "compile with ofx support (needs LibOFX)" ON)
option (WITH_PYTHON "enable python plugin and bindings" OFF) option (WITH_PYTHON "enable python plugin and bindings" OFF)
option (ENABLE_BINRELOC "compile with binary relocation support" ON) option (ENABLE_BINRELOC "compile with binary relocation support" ON)
option (ENABLE_REGISTER2 "compile with register2 enabled" OFF)
option (DISABLE_NLS "do not use Native Language Support" OFF) option (DISABLE_NLS "do not use Native Language Support" OFF)
option (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF) option (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF)
option (DISABLE_DEPRECATED_GTK "don't use deprecated gtk, gdk or gdk-pixbuf functions" OFF) option (DISABLE_DEPRECATED_GTK "don't use deprecated gtk, gdk or gdk-pixbuf functions" OFF)

3
common/config.h.cmake.in
View File

@ -295,9 +295,6 @@
/* Name of package containing qt3-wizard. */ /* Name of package containing qt3-wizard. */
#define QT3_WIZARD_PACKAGE "aqbanking" #define QT3_WIZARD_PACKAGE "aqbanking"
/* We are not using Register2 */
#cmakedefine REGISTER2_ENABLED 1
/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#cmakedefine STDC_HEADERS 1 #cmakedefine STDC_HEADERS 1

8
gnucash/gnome-utils/CMakeLists.txt
View File

@ -87,7 +87,6 @@ set (gnome_utils_SOURCES
gnc-splash.c gnc-splash.c
gnc-sx-instance-dense-cal-adapter.c gnc-sx-instance-dense-cal-adapter.c
gnc-sx-list-tree-model-adapter.c gnc-sx-list-tree-model-adapter.c
gnc-tree-control-split-reg.c
gnc-tree-model.c gnc-tree-model.c
gnc-tree-model-account-types.c gnc-tree-model-account-types.c
gnc-tree-model-account.c gnc-tree-model-account.c
@ -95,13 +94,10 @@ set (gnome_utils_SOURCES
gnc-tree-model-owner.c gnc-tree-model-owner.c
gnc-tree-model-commodity.c gnc-tree-model-commodity.c
gnc-tree-model-price.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-account.c
gnc-tree-view-commodity.c gnc-tree-view-commodity.c
gnc-tree-view-owner.c gnc-tree-view-owner.c
gnc-tree-view-price.c gnc-tree-view-price.c
gnc-tree-view-split-reg.c
gnc-tree-view-sx-list.c gnc-tree-view-sx-list.c
gnc-tree-view.c gnc-tree-view.c
gnc-window.c gnc-window.c
@ -176,7 +172,6 @@ set (gnome_utils_HEADERS
gnc-splash.h gnc-splash.h
gnc-sx-instance-dense-cal-adapter.h gnc-sx-instance-dense-cal-adapter.h
gnc-sx-list-tree-model-adapter.h gnc-sx-list-tree-model-adapter.h
gnc-tree-control-split-reg.h
gnc-tree-model.h gnc-tree-model.h
gnc-tree-model-account-types.h gnc-tree-model-account-types.h
gnc-tree-model-account.h gnc-tree-model-account.h
@ -184,13 +179,10 @@ set (gnome_utils_HEADERS
gnc-tree-model-owner.h gnc-tree-model-owner.h
gnc-tree-model-commodity.h gnc-tree-model-commodity.h
gnc-tree-model-price.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-account.h
gnc-tree-view-commodity.h gnc-tree-view-commodity.h
gnc-tree-view-owner.h gnc-tree-view-owner.h
gnc-tree-view-price.h gnc-tree-view-price.h
gnc-tree-view-split-reg.h
gnc-tree-view-sx-list.h gnc-tree-view-sx-list.h
gnc-tree-view.h gnc-tree-view.h
gnc-ui.h gnc-ui.h

16
gnucash/gnome-utils/dialog-preferences.c
View File

@ -1372,22 +1372,6 @@ gnc_preferences_dialog_create (GtkWindow *parent)
/* parent */ /* parent */
gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(parent)); gtk_window_set_transient_for (GTK_WINDOW(dialog), GTK_WINDOW(parent));
#ifndef REGISTER2_ENABLED
/* Hide preferences that are related to register2 */
box = GTK_WIDGET(gtk_builder_get_object (builder, "label14"));
gtk_widget_hide (box);
box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general.register/key-length"));
gtk_widget_hide (box);
box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general.register/show-extra-dates"));
gtk_widget_hide (box);
box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general.register/show-calendar-buttons"));
gtk_widget_hide (box);
box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general.register/selection-to-blank-on-expand"));
gtk_widget_hide (box);
box = GTK_WIDGET(gtk_builder_get_object (builder, "pref/general.register/show-extra-dates-on-selection"));
gtk_widget_hide (box);
#endif
label = GTK_WIDGET(gtk_builder_get_object (builder, "sample_account")); label = GTK_WIDGET(gtk_builder_get_object (builder, "sample_account"));
g_object_set_data (G_OBJECT(dialog), "sample_account", label); g_object_set_data (G_OBJECT(dialog), "sample_account", label);

2188
gnucash/gnome-utils/gnc-tree-control-split-reg.c
View File

File diff suppressed because it is too large Load Diff

132
gnucash/gnome-utils/gnc-tree-control-split-reg.h
View File

@ -1,132 +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
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-tree-control-split-reg.h
*/
/*****************************************************************************/
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 */

3301
gnucash/gnome-utils/gnc-tree-model-split-reg.c
View File

File diff suppressed because it is too large Load Diff

337
gnucash/gnome-utils/gnc-tree-model-split-reg.h
View File

@ -1,337 +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
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-tree-model-split-reg.h
*/
/* 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_JOURNAL2 = 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 */
gboolean mismatched_commodities; /**< Are there different commodities */
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. */
GtkSortType sort_direction; /**< This is the direction of sort */
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_gnc_color_theme; /**< whether to use the gnucash built-in color theme */
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, gboolean mismatched_commodities);
/** 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);
/** 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 journal 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 */

1354
gnucash/gnome-utils/gnc-tree-util-split-reg.c
View File

File diff suppressed because it is too large Load Diff

94
gnucash/gnome-utils/gnc-tree-util-split-reg.h
View File

@ -1,94 +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
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-tree-util-split-reg.h
*/
/*****************************************************************************/
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 */

6343
gnucash/gnome-utils/gnc-tree-view-split-reg.c
View File

File diff suppressed because it is too large Load Diff

192
gnucash/gnome-utils/gnc-tree-view-split-reg.h
View File

@ -1,192 +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
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-tree-view-split-reg.h
*/
#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.
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 */

12
gnucash/gnome/CMakeLists.txt
View File

@ -17,7 +17,6 @@ set (gnc_gnome_noinst_HEADERS
dialog-fincalc.h dialog-fincalc.h
dialog-find-account.h dialog-find-account.h
dialog-find-transactions.h dialog-find-transactions.h
dialog-find-transactions2.h
dialog-imap-editor.h dialog-imap-editor.h
dialog-invoice.h dialog-invoice.h
dialog-job.h dialog-job.h
@ -30,7 +29,6 @@ set (gnc_gnome_noinst_HEADERS
dialog-report-column-view.h dialog-report-column-view.h
dialog-report-style-sheet.h dialog-report-style-sheet.h
dialog-sx-editor.h dialog-sx-editor.h
dialog-sx-editor2.h
dialog-sx-from-trans.h dialog-sx-from-trans.h
dialog-sx-since-last-run.h dialog-sx-since-last-run.h
dialog-vendor.h dialog-vendor.h
@ -40,23 +38,19 @@ set (gnc_gnome_noinst_HEADERS
gnc-plugin-budget.h gnc-plugin-budget.h
gnc-plugin-business.h gnc-plugin-business.h
gnc-plugin-register.h gnc-plugin-register.h
gnc-plugin-register2.h
gnc-plugin-report-system.h gnc-plugin-report-system.h
gnc-plugin-page-account-tree.h gnc-plugin-page-account-tree.h
gnc-plugin-page-budget.h gnc-plugin-page-budget.h
gnc-plugin-page-invoice.h gnc-plugin-page-invoice.h
gnc-plugin-page-owner-tree.h gnc-plugin-page-owner-tree.h
gnc-plugin-page-register.h gnc-plugin-page-register.h
gnc-plugin-page-register2.h
gnc-plugin-page-report.h gnc-plugin-page-report.h
gnc-plugin-page-sx-list.h gnc-plugin-page-sx-list.h
gnc-split-reg.h gnc-split-reg.h
gnc-split-reg2.h
reconcile-view.h reconcile-view.h
search-owner.h search-owner.h
top-level.h top-level.h
window-reconcile.h window-reconcile.h
window-reconcile2.h
window-report.h window-report.h
window-autoclear.h window-autoclear.h
) )
@ -86,7 +80,6 @@ set (gnc_gnome_SOURCES
dialog-fincalc.c dialog-fincalc.c
dialog-find-account.c dialog-find-account.c
dialog-find-transactions.c dialog-find-transactions.c
dialog-find-transactions2.c
dialog-imap-editor.c dialog-imap-editor.c
dialog-invoice.c dialog-invoice.c
dialog-job.c dialog-job.c
@ -101,7 +94,6 @@ set (gnc_gnome_SOURCES
dialog-report-column-view.c dialog-report-column-view.c
dialog-report-style-sheet.c dialog-report-style-sheet.c
dialog-sx-editor.c dialog-sx-editor.c
dialog-sx-editor2.c
dialog-sx-from-trans.c dialog-sx-from-trans.c
dialog-sx-since-last-run.c dialog-sx-since-last-run.c
dialog-tax-info.c dialog-tax-info.c
@ -112,23 +104,19 @@ set (gnc_gnome_SOURCES
gnc-plugin-budget.c gnc-plugin-budget.c
gnc-plugin-business.c gnc-plugin-business.c
gnc-plugin-register.c gnc-plugin-register.c
gnc-plugin-register2.c
gnc-plugin-report-system.c gnc-plugin-report-system.c
gnc-plugin-page-account-tree.c gnc-plugin-page-account-tree.c
gnc-plugin-page-budget.c gnc-plugin-page-budget.c
gnc-plugin-page-invoice.c gnc-plugin-page-invoice.c
gnc-plugin-page-owner-tree.c gnc-plugin-page-owner-tree.c
gnc-plugin-page-register.c gnc-plugin-page-register.c
gnc-plugin-page-register2.c
gnc-plugin-page-report.c gnc-plugin-page-report.c
gnc-plugin-page-sx-list.c gnc-plugin-page-sx-list.c
gnc-split-reg.c gnc-split-reg.c
gnc-split-reg2.c
reconcile-view.c reconcile-view.c
search-owner.c search-owner.c
top-level.c top-level.c
window-reconcile.c window-reconcile.c
window-reconcile2.c
window-report.c window-report.c
window-autoclear.c window-autoclear.c
) )

245
gnucash/gnome/dialog-find-transactions2.c
View File

@ -1,245 +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>
#ifdef REGISTER2_ENABLED
#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"
#include "dialog-utils.h"
#define GNC_PREFS_GROUP_SEARCH "dialogs.find"
struct _ftd_data
{
QofQuery *q;
QofQuery *ledger_q;
GNCSearchWindow *sw;
GtkWindow *parent;
};
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 (GNC_MAIN_WINDOW(ftd->parent), 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());
GtkWindow *parent = GTK_WINDOW(gnc_ledger_display2_get_parent (orig_ledg));
/* 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_("Closing Entries"), NULL,
type, SPLIT_TRANS, TRANS_IS_CLOSING,
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_("Amount"), 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, (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);
{
GList *params2 = NULL;
params2 = gnc_search_param_prepend (params2, "", NULL,
type, SPLIT_MEMO, NULL);
params2 = gnc_search_param_prepend (params2, "", NULL,
type, SPLIT_TRANS, TRANS_DESCRIPTION,
NULL);
params2 = gnc_search_param_prepend (params2, "", NULL,
type, SPLIT_TRANS, TRANS_NOTES, NULL);
params = gnc_search_param_prepend_compound (params,
N_("Description, Notes, or Memo"),
params2,
GTK_JUSTIFY_LEFT, SEARCH_PARAM_ANY);
}
params = gnc_search_param_prepend (params, N_("Memo"), NULL,
type, SPLIT_MEMO, NULL);
params = gnc_search_param_prepend (params, N_("Notes"), NULL,
type, SPLIT_TRANS, TRANS_NOTES, 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 separate 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 );
if (g_list_length(al) != 0)
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->parent = parent;
ftd->sw = gnc_search_dialog_create (parent, type, _("Find Transaction"),
params, NULL, start_q, show_q,
NULL, do_find_cb, NULL,
ftd, free_ftd_cb, GNC_PREFS_GROUP_SEARCH, NULL,
"gnc-class-transactions");
if (!ftd->sw)
{
free_ftd_cb (ftd);
return NULL;
}
return ftd->sw;
}
#endif

33
gnucash/gnome/dialog-find-transactions2.h
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

1787
gnucash/gnome/dialog-sx-editor2.c
View File

File diff suppressed because it is too large Load Diff

50
gnucash/gnome/dialog-sx-editor2.h
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 (GtkWindow *parent,
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

19
gnucash/gnome/dialog-sx-since-last-run.c
View File

@ -48,12 +48,6 @@
#include "qof.h" #include "qof.h"
#include "gnc-ledger-display.h" #include "gnc-ledger-display.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
#include "gnc-ledger-display2.h"
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
#endif
#include "gnc-main-window.h" #include "gnc-main-window.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-gui-query.h" #include "gnc-gui-query.h"
@ -1077,11 +1071,7 @@ gnc_ui_sx_since_last_run_dialog (GtkWindow *parent, GncSxInstanceModel *sx_insta
static void static void
_show_created_transactions (GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids) _show_created_transactions (GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids)
{ {
#ifdef REGISTER2_ENABLED
GNCLedgerDisplay2 *ledger;
#else
GNCLedgerDisplay *ledger; GNCLedgerDisplay *ledger;
#endif
GncPluginPage *page; GncPluginPage *page;
Query *book_query, *guid_query, *query; Query *book_query, *guid_query, *query;
GList *guid_iter; GList *guid_iter;
@ -1094,19 +1084,10 @@ _show_created_transactions (GncSxSinceLastRunDialog *app_dialog, GList *created_
xaccQueryAddGUIDMatch (guid_query, (GncGUID*)guid_iter->data, GNC_ID_TRANS, QOF_QUERY_OR); xaccQueryAddGUIDMatch (guid_query, (GncGUID*)guid_iter->data, GNC_ID_TRANS, QOF_QUERY_OR);
} }
query = qof_query_merge (book_query, guid_query, QOF_QUERY_AND); query = qof_query_merge (book_query, guid_query, QOF_QUERY_AND);
#ifdef REGISTER2_ENABLED
/*################## 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 #################*/
#else
// inspired by dialog-find-transactions:do_find_cb: // inspired by dialog-find-transactions:do_find_cb:
ledger = gnc_ledger_display_query (query, SEARCH_LEDGER, REG_STYLE_JOURNAL); ledger = gnc_ledger_display_query (query, SEARCH_LEDGER, REG_STYLE_JOURNAL);
gnc_ledger_display_refresh (ledger); gnc_ledger_display_refresh (ledger);
page = gnc_plugin_page_register_new_ledger (ledger); page = gnc_plugin_page_register_new_ledger (ledger);
#endif
g_object_set (G_OBJECT(page), "page-name", _("Created Transactions"), NULL); g_object_set (G_OBJECT(page), "page-name", _("Created Transactions"), NULL);
gnc_main_window_open_page (NULL, page); gnc_main_window_open_page (NULL, page);

3
gnucash/gnome/gnc-plugin-basic-commands.c
View File

@ -44,9 +44,6 @@
#include "dialog-file-access.h" #include "dialog-file-access.h"
#include "dialog-fincalc.h" #include "dialog-fincalc.h"
#include "dialog-find-transactions.h" #include "dialog-find-transactions.h"
#ifdef REGISTER2_ENABLED
#include "dialog-find-transactions2.h"
#endif
#include "dialog-imap-editor.h" #include "dialog-imap-editor.h"
#include "dialog-sx-since-last-run.h" #include "dialog-sx-since-last-run.h"
#include "dialog-totd.h" #include "dialog-totd.h"

113
gnucash/gnome/gnc-plugin-page-account-tree.c
View File

@ -38,9 +38,6 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include "gnc-plugin-page-account-tree.h" #include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#ifdef REGISTER2_ENABLED
#include "gnc-plugin-page-register2.h"
#endif
#include "Scrub.h" #include "Scrub.h"
#include "Scrub3.h" #include "Scrub3.h"
@ -175,11 +172,6 @@ static void gnc_plugin_page_account_tree_cmd_scrub_sub (GtkAction *action, GncPl
static void gnc_plugin_page_account_tree_cmd_scrub_all (GtkAction *action, GncPluginPageAccountTree *page); static void gnc_plugin_page_account_tree_cmd_scrub_all (GtkAction *action, GncPluginPageAccountTree *page);
static void gnc_plugin_page_account_tree_cmd_cascade_account_properties (GtkAction *action, GncPluginPageAccountTree *page); static void gnc_plugin_page_account_tree_cmd_cascade_account_properties (GtkAction *action, GncPluginPageAccountTree *page);
#ifdef REGISTER2_ENABLED
/* 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);
#endif
/* Account Deletion Actions. */ /* Account Deletion Actions. */
static int confirm_delete_account (GtkAction *action, static int confirm_delete_account (GtkAction *action,
GncPluginPageAccountTree *page, Account* ta, GncPluginPageAccountTree *page, Account* ta,
@ -209,43 +201,17 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] =
N_("Extend the current book by merging with new account type categories"), N_("Extend the current book by merging with new account type categories"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy) G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy)
}, },
#ifdef REGISTER2_ENABLED
{
"FileOpenAccount2Action", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL,
N_("Open the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account)
},
{
"FileOpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Old Style Register Account"), NULL,
N_("Open the old style register selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account)
},
#else
{ {
"FileOpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL, "FileOpenAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL,
N_("Open the selected account"), N_("Open the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account) G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account)
}, },
#endif
#ifdef REGISTER2_ENABLED
{
"FileOpenSubaccounts2Action", GNC_ICON_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_ICON_OPEN_ACCOUNT, N_("Open Old St_yle Subaccounts"), NULL,
N_("Open the old style register selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts)
},
#else
{ {
"FileOpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL, "FileOpenSubaccountsAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL,
N_("Open the selected account and all its subaccounts"), N_("Open the selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts) G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts)
}, },
#endif
/* Edit menu */ /* Edit menu */
{ {
@ -345,18 +311,6 @@ static GtkActionEntry gnc_plugin_page_account_tree_actions [] =
}, },
/* Extensions Menu */ /* Extensions Menu */
{ "Register2TestAction", NULL, N_("_Register2"), NULL, NULL, NULL }, { "Register2TestAction", NULL, N_("_Register2"), NULL, NULL, NULL },
#ifdef REGISTER2_ENABLED
{
"Register2TestAccountAction", GNC_ICON_OPEN_ACCOUNT, N_("Open _Account"), NULL,
N_("Open the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account)
},
{
"Register2TestSubAccountAction", GNC_ICON_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)
},
#endif
}; };
/** The number of actions provided by this plugin. */ /** The number of actions provided by this plugin. */
static guint gnc_plugin_page_account_tree_n_actions = G_N_ELEMENTS (gnc_plugin_page_account_tree_actions); static guint gnc_plugin_page_account_tree_n_actions = G_N_ELEMENTS (gnc_plugin_page_account_tree_actions);
@ -378,9 +332,6 @@ static const gchar *actions_requiring_account_rw[] =
static const gchar *actions_requiring_account_always[] = static const gchar *actions_requiring_account_always[] =
{ {
"FileOpenAccountAction", "FileOpenAccountAction",
#ifdef REGISTER2_ENABLED
"FileOpenAccount2Action",
#endif
"FileOpenSubaccountsAction", "FileOpenSubaccountsAction",
"ActionsLotsAction", "ActionsLotsAction",
NULL NULL
@ -408,9 +359,6 @@ static const gchar* readonly_inactive_actions[] =
static action_toolbar_labels toolbar_labels[] = static action_toolbar_labels toolbar_labels[] =
{ {
{ "FileOpenAccountAction", N_("Open") }, { "FileOpenAccountAction", N_("Open") },
#ifdef REGISTER2_ENABLED
{ "FileOpenAccount2Action", N_("Open2") },
#endif
{ "EditEditAccountAction", N_("Edit") }, { "EditEditAccountAction", N_("Edit") },
{ "FileNewAccountAction", N_("New") }, { "FileNewAccountAction", N_("New") },
{ "EditDeleteAccountAction", N_("Delete") }, { "EditDeleteAccountAction", N_("Delete") },
@ -522,19 +470,11 @@ gnc_plugin_page_account_tree_init (GncPluginPageAccountTree *plugin_page)
/* Init parent declared variables */ /* Init parent declared variables */
parent = GNC_PLUGIN_PAGE(plugin_page); parent = GNC_PLUGIN_PAGE(plugin_page);
#ifdef REGISTER2_ENABLED
g_object_set(G_OBJECT(plugin_page),
"page-name", _("Accounts"),
"page-uri", "default:",
"ui-description", "gnc-plugin-page-account-tree2-ui.xml",
NULL);
#else
g_object_set(G_OBJECT(plugin_page), g_object_set(G_OBJECT(plugin_page),
"page-name", _("Accounts"), "page-name", _("Accounts"),
"page-uri", "default:", "page-uri", "default:",
"ui-description", "gnc-plugin-page-account-tree-ui.xml", "ui-description", "gnc-plugin-page-account-tree-ui.xml",
NULL); NULL);
#endif
g_signal_connect (G_OBJECT (plugin_page), "selected", g_signal_connect (G_OBJECT (plugin_page), "selected",
G_CALLBACK (gnc_plugin_page_account_tree_selected), plugin_page); G_CALLBACK (gnc_plugin_page_account_tree_selected), plugin_page);
@ -1059,27 +999,6 @@ gppat_open_account_common (GncPluginPageAccountTree *page,
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page); gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
} }
#ifdef REGISTER2_ENABLED
/*################## 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 #################*/
#endif
static void static void
gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview, gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
GtkTreePath *path, GtkTreePath *path,
@ -1114,11 +1033,7 @@ gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
else else
{ {
/* No placeholder account, so open its register */ /* No placeholder account, so open its register */
#ifdef REGISTER2_ENABLED
gppat_open2_account_common (page, account, FALSE);
#else
gppat_open_account_common (page, account, FALSE); gppat_open_account_common (page, account, FALSE);
#endif
} }
} }
} }
@ -1212,34 +1127,6 @@ gnc_plugin_page_account_tree_cmd_open_subaccounts (GtkAction *action,
gppat_open_account_common (page, account, TRUE); gppat_open_account_common (page, account, TRUE);
} }
#ifdef REGISTER2_ENABLED
/*################## 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 #################*/
#endif
static void static void
gnc_plugin_page_account_tree_cmd_edit_account (GtkAction *action, GncPluginPageAccountTree *page) gnc_plugin_page_account_tree_cmd_edit_account (GtkAction *action, GncPluginPageAccountTree *page)
{ {

34
gnucash/gnome/gnc-plugin-page-register.c
View File

@ -42,11 +42,6 @@
#include "guile-mappings.h" #include "guile-mappings.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
#endif
#include "gnc-plugin-register.h" #include "gnc-plugin-register.h"
#include "gnc-plugin-menu-additions.h" #include "gnc-plugin-menu-additions.h"
#include "gnc-plugin-page-report.h" #include "gnc-plugin-page-report.h"
@ -804,38 +799,9 @@ gnc_plugin_page_register_new (Account* account, gboolean subaccounts)
gnc_commodity* com0; gnc_commodity* com0;
gnc_commodity* com1; gnc_commodity* com1;
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
const GList* item;
GncPluginPageRegister2* new_register_page;
/*################## Added for Reg2 #################*/
#endif
ENTER ("account=%p, subaccounts=%s", account, ENTER ("account=%p, subaccounts=%s", account,
subaccounts ? "TRUE" : "FALSE"); subaccounts ? "TRUE" : "FALSE");
#ifdef REGISTER2_ENABLED
/*################## 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)))
{
GtkWindow* window = GTK_WINDOW (gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (
new_register_page)));
gnc_error_dialog (window, "%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 #################*/
#endif
com0 = gnc_account_get_currency_or_parent (account); com0 = gnc_account_get_currency_or_parent (account);
com1 = gnc_account_foreach_descendant_until (account, com1 = gnc_account_foreach_descendant_until (account,
gnc_plug_page_register_check_commodity, com0); gnc_plug_page_register_check_commodity, com0);

4117
gnucash/gnome/gnc-plugin-page-register2.c
View File

File diff suppressed because it is too large Load Diff

163
gnucash/gnome/gnc-plugin-page-register2.h
View File

@ -1,163 +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 *
**********************************************************************/
#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"
#include "Query.h"
G_BEGIN_DECLS
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-plugin-page-register2.h
*/
/* 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 journal.
*
* @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 Query associated with this "register" plugin page.
*
* @param plugin_page A "register" page.
*
* @return The query.
*/
Query *
gnc_plugin_page_register2_get_query (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 */

103
gnucash/gnome/gnc-plugin-page-sx-list.c
View File

@ -52,11 +52,6 @@
#include "Split.h" #include "Split.h"
#include "Transaction.h" #include "Transaction.h"
#include "dialog-sx-editor.h" #include "dialog-sx-editor.h"
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
#include "dialog-sx-editor2.h"
/*################## Added for Reg2 #################*/
#endif
#include "dialog-utils.h" #include "dialog-utils.h"
#include "gnc-commodity.h" #include "gnc-commodity.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
@ -124,12 +119,6 @@ static void gppsl_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, G
static void gnc_plugin_page_sx_list_cmd_new (GtkAction *action, GncPluginPageSxList *page); 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); static void gnc_plugin_page_sx_list_cmd_edit (GtkAction *action, GncPluginPageSxList *page);
#ifdef REGISTER2_ENABLED
/*################## 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 #################*/
#endif
static void gnc_plugin_page_sx_list_cmd_delete (GtkAction *action, GncPluginPageSxList *page); static void gnc_plugin_page_sx_list_cmd_delete (GtkAction *action, GncPluginPageSxList *page);
static void gnc_plugin_page_sx_list_cmd_refresh (GtkAction *action, GncPluginPageSxList *page); static void gnc_plugin_page_sx_list_cmd_refresh (GtkAction *action, GncPluginPageSxList *page);
@ -141,26 +130,10 @@ static GtkActionEntry gnc_plugin_page_sx_list_actions [] =
"SxListNewAction", GNC_ICON_NEW_ACCOUNT, N_("_New"), NULL, "SxListNewAction", GNC_ICON_NEW_ACCOUNT, N_("_New"), NULL,
N_("Create a new scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_new) N_("Create a new scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_new)
}, },
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
{
"SxListNewAction2", GNC_ICON_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 #################*/
#endif
{ {
"SxListEditAction", GNC_ICON_EDIT_ACCOUNT, N_("_Edit"), NULL, "SxListEditAction", GNC_ICON_EDIT_ACCOUNT, N_("_Edit"), NULL,
N_("Edit the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_edit) N_("Edit the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_edit)
}, },
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
{
"SxListEditAction2", GNC_ICON_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 #################*/
#endif
{ {
"SxListDeleteAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete"), NULL, "SxListDeleteAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete"), NULL,
N_("Delete the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_delete) N_("Delete the selected scheduled transaction"), G_CALLBACK(gnc_plugin_page_sx_list_cmd_delete)
@ -243,19 +216,11 @@ gnc_plugin_page_sx_list_init (GncPluginPageSxList *plugin_page)
/* Init parent declared variables */ /* Init parent declared variables */
parent = GNC_PLUGIN_PAGE(plugin_page); parent = GNC_PLUGIN_PAGE(plugin_page);
#ifdef REGISTER2_ENABLED
g_object_set(G_OBJECT(plugin_page),
"page-name", _("Scheduled Transactions"),
"page-uri", "default:",
"ui-description", "gnc-plugin-page-sx-list2-ui.xml",
NULL);
#else
g_object_set(G_OBJECT(plugin_page), g_object_set(G_OBJECT(plugin_page),
"page-name", _("Scheduled Transactions"), "page-name", _("Scheduled Transactions"),
"page-uri", "default:", "page-uri", "default:",
"ui-description", "gnc-plugin-page-sx-list-ui.xml", "ui-description", "gnc-plugin-page-sx-list-ui.xml",
NULL); NULL);
#endif
gnc_plugin_page_add_book (parent, gnc_get_current_book()); gnc_plugin_page_add_book (parent, gnc_get_current_book());
action_group = action_group =
@ -684,33 +649,6 @@ gnc_plugin_page_sx_list_cmd_new (GtkAction *action, GncPluginPageSxList *page)
gppsl_update_selected_list (page, TRUE, new_sx); gppsl_update_selected_list (page, TRUE, new_sx);
} }
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
static void
gnc_plugin_page_sx_list_cmd_new2 (GtkAction *action, GncPluginPageSxList *page)
{
GtkWindow *window = GTK_WINDOW (gnc_plugin_page_get_window (GNC_PLUGIN_PAGE(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 (window, new_sx, new_sx_flag);
}
/*################## Added for Reg2 #################*/
#endif
static void static void
gnc_plugin_page_sx_list_cmd_refresh (GtkAction *action, GncPluginPageSxList *page) gnc_plugin_page_sx_list_cmd_refresh (GtkAction *action, GncPluginPageSxList *page)
{ {
@ -729,17 +667,6 @@ _edit_sx(gpointer data, gpointer user_data)
(SchedXaction*)data, FALSE); (SchedXaction*)data, FALSE);
} }
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
static void
_edit_sx2 (gpointer data, gpointer user_data)
{
gnc_ui_scheduled_xaction_editor_dialog_create2 (GTK_WINDOW(user_data),
(SchedXaction*)data, FALSE);
}
/*################## Added for Reg2 #################*/
#endif
static SchedXaction* static SchedXaction*
_argument_reorder_fn (GtkTreePath* list_path_data, GncTreeViewSxList* user_tree_view) _argument_reorder_fn (GtkTreePath* list_path_data, GncTreeViewSxList* user_tree_view)
{ {
@ -781,36 +708,6 @@ gnc_plugin_page_sx_list_cmd_edit (GtkAction *action, GncPluginPageSxList *page)
g_list_free (selected_paths); g_list_free (selected_paths);
} }
#ifdef REGISTER2_ENABLED
/*################## 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);
GtkWindow *window = GTK_WINDOW(gnc_plugin_page_get_window (GNC_PLUGIN_PAGE(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 (!gnc_list_length_cmp (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, window);
g_list_free (to_edit);
g_list_foreach (selected_paths, (GFunc)gtk_tree_path_free, NULL);
g_list_free (selected_paths);
}
/*################## Added for Reg2 #################*/
#endif
static void static void
gppsl_row_activated_cb (GtkTreeView *tree_view, gppsl_row_activated_cb (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,

6
gnucash/gnome/gnc-plugin-register.c
View File

@ -50,15 +50,9 @@ static void gnc_plugin_register_cmd_general_ledger (GtkAction *action, GncMainWi
static GtkActionEntry gnc_plugin_actions [] = static GtkActionEntry gnc_plugin_actions [] =
{ {
{ {
#ifdef REGISTER2_ENABLED
"ToolsGeneralJournalAction", NULL, N_("Old St_yle General Journal"), NULL,
N_("Open an old style general journal window"),
G_CALLBACK (gnc_plugin_register_cmd_general_ledger)
#else
"ToolsGeneralJournalAction", NULL, N_("_General Journal"), NULL, "ToolsGeneralJournalAction", NULL, N_("_General Journal"), NULL,
N_("Open general journal window"), N_("Open general journal window"),
G_CALLBACK (gnc_plugin_register_cmd_general_ledger) G_CALLBACK (gnc_plugin_register_cmd_general_ledger)
#endif
}, },
}; };
static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions); static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);

237
gnucash/gnome/gnc-plugin-register2.c
View File

@ -1,237 +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>
#ifdef REGISTER2_ENABLED
#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"
#ifdef REGISTER2_ENABLED
#define PLUGIN_UI_FILENAME "gnc-plugin-register2-ui.xml"
#else
#define PLUGIN_UI_FILENAME "gnc-plugin-register22-ui.xml"
#endif
static GtkActionEntry gnc_plugin_actions [] =
{
#ifdef REGISTER2_ENABLED
{
"ToolsGeneralJournal2Action", NULL, N_("_General Journal"), NULL,
N_("Open a general journal window"),
G_CALLBACK (gnc_plugin_register2_cmd_general_ledger)
},
#endif
/* Extensions Menu */
{ "Register2TestAction", NULL, N_("_Register2"), NULL, NULL, NULL },
{
"Register2TestGLAction", NULL, N_("Register2 Open GL Account"), NULL,
N_("Register2 Open GL Account"),
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;
G_DEFINE_TYPE_WITH_PRIVATE(GncPluginRegister2, gnc_plugin_register2, GNC_TYPE_PLUGIN)
#define GNC_PLUGIN_REGISTER2_GET_PRIVATE(o) \
((GncPluginRegister2Private*)g_type_instance_get_private((GTypeInstance*)o, GNC_TYPE_PLUGIN_REGISTER2))
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 *
************************************************************/
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;
}
static void
gnc_plugin_register2_init (GncPluginRegister2 *plugin)
{
}
static void
gnc_plugin_register2_finalize (GObject *object)
{
GncPluginRegister2 *plugin;
plugin = GNC_PLUGIN_REGISTER2 (object);
g_return_if_fail (GNC_IS_PLUGIN_REGISTER2 (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);
}
#endif

66
gnucash/gnome/gnc-plugin-register2.h
View File

@ -1,66 +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
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-plugin-register2.h
*/
/* 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 */

1144
gnucash/gnome/gnc-split-reg2.c
View File

File diff suppressed because it is too large Load Diff

183
gnucash/gnome/gnc-split-reg2.h
View File

@ -1,183 +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-tree-view-split-reg.h"
/** @ingroup Register
* @addtogroup Register2
* @{
*/
/** @file gnc-split-reg2.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. */
GtkBox 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
{
GtkBoxClass parent_class;
/* Signal defaults */
void (*help_changed) (GNCSplitReg2 *w, gpointer user_data);
};
/* Something somewhere sets these to silly values and causes problems */
#undef DELETE
#undef DUPLICATE
typedef enum
{
ENTER,
CANCEL,
DELETE,
REINIT,
DUPLICATE,
SCHEDULE,
SPLIT,
BLANK,
JUMP,
CUT,
CUT_TXN,
COPY,
COPY_TXN,
PASTE,
PASTE_TXN,
SORT_ORDER_SUBMENU,
STYLE_SUBMENU,
} 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 */

10
gnucash/gnome/top-level.c
View File

@ -56,15 +56,9 @@
#include "gnc-plugin-basic-commands.h" /* FIXME Remove this line*/ #include "gnc-plugin-basic-commands.h" /* FIXME Remove this line*/
#include "gnc-plugin-file-history.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-register.h" /* FIXME Remove this line*/
#ifdef REGISTER2_ENABLED
#include "gnc-plugin-register2.h" /* FIXME Remove this line*/
#endif
#include "gnc-plugin-budget.h" #include "gnc-plugin-budget.h"
#include "gnc-plugin-business.h" #include "gnc-plugin-business.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#ifdef REGISTER2_ENABLED
#include "gnc-plugin-page-register2.h"
#endif
#include "gnc-plugin-manager.h" /* FIXME Remove this line*/ #include "gnc-plugin-manager.h" /* FIXME Remove this line*/
#include "gnc-html.h" #include "gnc-html.h"
#include "gnc-gnome-utils.h" #include "gnc-gnome-utils.h"
@ -438,10 +432,6 @@ gnc_main_gui_init (void)
gnc_plugin_manager_get (), gnc_plugin_menu_additions_new ()); gnc_plugin_manager_get (), gnc_plugin_menu_additions_new ());
gnc_plugin_manager_add_plugin ( gnc_plugin_manager_add_plugin (
gnc_plugin_manager_get (), gnc_plugin_register_new ()); gnc_plugin_manager_get (), gnc_plugin_register_new ());
#ifdef REGISTER2_ENABLED
gnc_plugin_manager_add_plugin (
gnc_plugin_manager_get (), gnc_plugin_register2_new ());
#endif
gnc_plugin_manager_add_plugin ( gnc_plugin_manager_add_plugin (
gnc_plugin_manager_get (), gnc_plugin_business_new ()); gnc_plugin_manager_get (), gnc_plugin_business_new ());
/* I'm not sure why the FIXME note says to remove this. Maybe /* I'm not sure why the FIXME note says to remove this. Maybe

2221
gnucash/gnome/window-reconcile2.c
View File

File diff suppressed because it is too large Load Diff

68
gnucash/gnome/window-reconcile2.h
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 */

5
gnucash/gnucash-fallback.css
View File

@ -36,11 +36,6 @@
@define-color default-color currentColor; @define-color default-color currentColor;
@define-color negative-numbers rgb(75%, 0%, 0%); @define-color negative-numbers rgb(75%, 0%, 0%);
/* Register2 grid lines color */
.gnc-class-register2-grid-lines {
border-color: black;
}
/* Make some labels more important */ /* Make some labels more important */
.gnc-class-underline-title { .gnc-class-underline-title {
font-size: large; font-size: large;

1
gnucash/gtkbuilder/CMakeLists.txt
View File

@ -56,7 +56,6 @@ set (gtkbuilder_SOURCES
gnc-date-format.glade gnc-date-format.glade
gnc-frequency.glade gnc-frequency.glade
gnc-plugin-page-budget.glade gnc-plugin-page-budget.glade
gnc-plugin-page-register2.glade
gnc-plugin-page-register.glade gnc-plugin-page-register.glade
gnc-recurrence.glade gnc-recurrence.glade
gnc-tree-view-owner.glade gnc-tree-view-owner.glade

3086
gnucash/gtkbuilder/dialog-preferences.glade
View File

File diff suppressed because it is too large Load Diff

823
gnucash/gtkbuilder/gnc-plugin-page-register2.glade
View File

@ -1,823 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">1000000000</property>
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
<object class="GtkDialog" id="duplicate_transaction_dialog">
<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="GtkBox" id="dialog-vbox15">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" 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" translatable="yes">_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-underline">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" translatable="yes">_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-underline">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="halign">start</property>
<property name="margin-start">6</property>
<property name="label" translatable="yes">New Transaction Information</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=4 -->
<object class="GtkGrid" id="duplicate_table">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="border-width">6</property>
<property name="row-spacing">3</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Date</property>
<property name="use-underline">True</property>
<property name="justify">center</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="num_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Number</property>
<property name="use-underline">True</property>
<property name="justify">center</property>
<property name="mnemonic-widget">num_entry</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkBox" 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="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="num_entry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="tnum_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">_Transaction Number</property>
<property name="use-underline">True</property>
<property name="justify">center</property>
<property name="mnemonic-widget">tnum_entry</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="link_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Keep Linked Document Entry</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="tnum_entry">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="link_check_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">start</property>
<property name="image-position">top</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</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_dialog">
<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="GtkBox" id="dialog-vbox19">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" 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" translatable="yes">_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-underline">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" translatable="yes">_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-underline">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="GtkBox" id="vbox103">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="border-width">12</property>
<property name="orientation">vertical</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="halign">start</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="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="halign">start</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">1</property>
</packing>
</child>
<child>
<!-- n-columns=3 n-rows=7 -->
<object class="GtkGrid" id="select_range_table">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-top">12</property>
<property name="row-spacing">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="halign">end</property>
<property name="label" translatable="yes">Start</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</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="halign">start</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="top-attach">0</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="halign">start</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="top-attach">6</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="halign">start</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="top-attach">5</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="halign">start</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="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847683">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label847684">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">End</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">4</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="halign">start</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="top-attach">2</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="halign">start</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="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkBox" 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="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkBox" 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="top-attach">6</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">2</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="GtkBox" id="vbox104">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<!-- n-columns=1 n-rows=7 -->
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="border-width">12</property>
<property name="row-spacing">3</property>
<property name="column-spacing">6</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="halign">start</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="left-attach">0</property>
<property name="top-attach">0</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="halign">start</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="left-attach">0</property>
<property name="top-attach">1</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="halign">start</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="left-attach">0</property>
<property name="top-attach">2</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="halign">start</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="left-attach">0</property>
<property name="top-attach">3</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="halign">start</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="left-attach">0</property>
<property name="top-attach">4</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="halign">center</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">0</property>
<property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="hseparator1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">5</property>
</packing>
</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="GtkBox" 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-underline">True</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_dialog">
<property name="can-focus">False</property>
<property name="border-width">6</property>
<property name="title" translatable="yes">Void Transaction</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="GtkBox" id="dialog-vbox16">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child internal-child="action_area">
<object class="GtkButtonBox" 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" translatable="yes">_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-underline">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" translatable="yes">_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-underline">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="GtkBox" id="vbox100">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label847671">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</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>
</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>
</interface>

11
gnucash/import-export/aqb/gnc-plugin-aqbanking.c
View File

@ -46,9 +46,6 @@
#include "gnc-plugin-manager.h" #include "gnc-plugin-manager.h"
#include "gnc-plugin-page-account-tree.h" #include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#ifdef REGISTER2_ENABLED
#include "gnc-plugin-page-register2.h"
#endif
#include "gnc-main-window.h" #include "gnc-main-window.h"
#include "gnc-prefs.h" #include "gnc-prefs.h"
#include "gnc-ui-util.h" // for gnc_get_current_book #include "gnc-ui-util.h" // for gnc_get_current_book
@ -465,14 +462,6 @@ main_window_to_account(GncMainWindow *window)
account = gnc_plugin_page_register_get_account( account = gnc_plugin_page_register_get_account(
GNC_PLUGIN_PAGE_REGISTER(page)); GNC_PLUGIN_PAGE_REGISTER(page));
} }
#ifdef REGISTER2_ENABLED
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));
}
#endif
else if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0) else if (strcmp(page_name, GNC_PLUGIN_PAGE_ACCOUNT_TREE_NAME) == 0)
{ {
DEBUG("account tree page"); DEBUG("account tree page");

16
gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
View File

@ -31,11 +31,6 @@
#include "assistant-csv-export.h" #include "assistant-csv-export.h"
#include "gnc-plugin-page-register.h" #include "gnc-plugin-page-register.h"
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
#endif
#include "Query.h" #include "Query.h"
static void gnc_plugin_csv_export_class_init (GncPluginCsvExportClass *klass); static void gnc_plugin_csv_export_class_init (GncPluginCsvExportClass *klass);
@ -158,17 +153,6 @@ gnc_plugin_csv_export_register_cmd (GtkAction *action,
acc = gnc_plugin_page_register_get_account (GNC_PLUGIN_PAGE_REGISTER(page)); acc = gnc_plugin_page_register_get_account (GNC_PLUGIN_PAGE_REGISTER(page));
gnc_file_csv_export_register (XML_EXPORT_REGISTER, query, acc); gnc_file_csv_export_register (XML_EXPORT_REGISTER, query, acc);
} }
#ifdef REGISTER2_ENABLED
/*################## Added for Reg2 #################*/
if (GNC_IS_PLUGIN_PAGE_REGISTER2(page))
{
query = gnc_plugin_page_register2_get_query (page);
acc = gnc_plugin_page_register2_get_account (GNC_PLUGIN_PAGE_REGISTER2(page));
gnc_file_csv_export_register (XML_EXPORT_REGISTER, query, acc);
}
/*################## Added for Reg2 #################*/
#endif
} }
/************************************************************ /************************************************************

2
gnucash/register/ledger-core/CMakeLists.txt
View File

@ -3,7 +3,6 @@ add_subdirectory(test)
set (ledger_core_SOURCES set (ledger_core_SOURCES
gnc-ledger-display.c gnc-ledger-display.c
gnc-ledger-display2.c
split-register.c split-register.c
split-register-control.c split-register-control.c
split-register-copy-ops.c split-register-copy-ops.c
@ -23,7 +22,6 @@ set (ledger_core_SOURCES
set (ledger_core_HEADERS set (ledger_core_HEADERS
gnc-ledger-display.h gnc-ledger-display.h
gnc-ledger-display2.h
split-register.h split-register.h
split-register-control.h split-register-control.h
split-register-copy-ops.h split-register-copy-ops.h

1051
gnucash/register/ledger-core/gnc-ledger-display2.c
View File

File diff suppressed because it is too large Load Diff

148
gnucash/register/ledger-core/gnc-ledger-display2.h
View File

@ -1,148 +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 "SchedXaction.h"
#include "Transaction.h"
#include "gnc-tree-model-split-reg.h"
#include "gnc-tree-view-split-reg.h"
/** @ingroup Register
* @addtogroup Register2
* @brief Register2 is a reimplementation of the original Register with new
* classes based on GtkListView.
* @{
*/
/** @file gnc-ledger-display2.h
* @brief Public declarations for GncLedgerDisplay2 class.
*/
/**@brief Defines 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;
/** 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, gboolean mismatched_commodities);
/** 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

4
gnucash/ui/CMakeLists.txt
View File

@ -10,20 +10,16 @@ set (ui_SOURCES
gnc-plugin-customer-import-ui.xml gnc-plugin-customer-import-ui.xml
gnc-plugin-file-history-ui.xml gnc-plugin-file-history-ui.xml
gnc-plugin-log-replay-ui.xml gnc-plugin-log-replay-ui.xml
gnc-plugin-page-account-tree2-ui.xml
gnc-plugin-page-account-tree-ui.xml gnc-plugin-page-account-tree-ui.xml
gnc-plugin-page-budget-ui.xml gnc-plugin-page-budget-ui.xml
gnc-plugin-page-invoice-ui.xml gnc-plugin-page-invoice-ui.xml
gnc-plugin-page-owner-tree-ui.xml gnc-plugin-page-owner-tree-ui.xml
gnc-plugin-page-register2-ui.xml
gnc-plugin-page-register-ui.xml gnc-plugin-page-register-ui.xml
gnc-plugin-page-report-ui.xml gnc-plugin-page-report-ui.xml
gnc-plugin-page-sx-list2-ui.xml gnc-plugin-page-sx-list2-ui.xml
gnc-plugin-page-sx-list-ui.xml gnc-plugin-page-sx-list-ui.xml
gnc-plugin-page-sxregister-ui.xml gnc-plugin-page-sxregister-ui.xml
gnc-plugin-qif-import-ui.xml gnc-plugin-qif-import-ui.xml
gnc-plugin-register22-ui.xml
gnc-plugin-register2-ui.xml
gnc-plugin-register-ui.xml gnc-plugin-register-ui.xml
gnc-plugin-report-system-ui.xml gnc-plugin-report-system-ui.xml
gnc-reconcile-window-ui.xml gnc-reconcile-window-ui.xml

7
gnucash/ui/gnc-plugin-page-account-tree-ui.xml
View File

@ -32,12 +32,7 @@
</placeholder> </placeholder>
</menu> </menu>
<menu name="Extensions" action="ExtensionsAction"> <menu name="Extensions" action="ExtensionsAction">
<placeholder name="ExtensionsPlaceholder"> <placeholder name="ExtensionsPlaceholder"/>
<menu name="Register2Test" action="Register2TestAction">
<menuitem name="Register2TestAccount" action="Register2TestAccountAction"/>
<menuitem name="Register2TestSubAccount" action="Register2TestSubAccountAction"/>
</menu>
</placeholder>
</menu> </menu>
</menubar> </menubar>

89
gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
View File

@ -1,89 +0,0 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<placeholder name="EditSelectedPlaceholder">
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
<menuitem name="EditDeleteAccount" action="EditDeleteAccountAction"/>
<menuitem name="EditAccountFindAccount" action="EditFindAccountAction"/>
<menuitem name="AccountCascadeProperty" action="EditCascadeAccountAction"/>
<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>
<menu name="Extensions" action="ExtensionsAction">
<placeholder name="ExtensionsPlaceholder">
<menu name="Register2Test" action="Register2TestAction">
<menuitem name="Register2TestAccount" action="Register2TestAccountAction"/>
<menuitem name="Register2TestSubAccount" action="Register2TestSubAccountAction"/>
</menu>
</placeholder>
</menu>
</menubar>
<popup name="MainPopup" action="FakeToplevel">
<placeholder name="PopupPlaceholder1">
<menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
</placeholder>
<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"/>
<menuitem name="AccountCascadeProperty" action="EditCascadeAccountAction"/>
<menuitem name="AccountFindAccountPopup" action="EditFindAccountPopupAction"/>
<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>

113
gnucash/ui/gnc-plugin-page-register2-ui.xml
View File

@ -1,113 +0,0 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<placeholder name="EditAllSelectedPlaceholder">
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
<menuitem name="EditFindAccount" action="EditFindAccountAction"/>
</placeholder>
<menuitem name="EditTaxOptions" action="EditTaxOptionsAction"/>
</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="ActionsAutoClear" action="ActionsAutoClearAction"/>
<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>

17
gnucash/ui/gnc-plugin-register2-ui.xml
View File

@ -1,17 +0,0 @@
<ui>
<menubar>
<menu name="Tools" action="ToolsAction">
<placeholder name="ToolsPlaceholder">
<menuitem name="ToolsGeneralJournal2" action="ToolsGeneralJournal2Action"/>
</placeholder>
</menu>
<menu name="Extensions" action="ExtensionsAction">
<placeholder name="ExtensionsPlaceholder">
<menu name="Register2Test" action="Register2TestAction">
<menuitem name="Register2TestGL" action="Register2TestGLAction"/>
</menu>
</placeholder>
</menu>
</menubar>
</ui>

11
gnucash/ui/gnc-plugin-register22-ui.xml
View File

@ -1,11 +0,0 @@
<ui>
<menubar>
<menu name="Extensions" action="ExtensionsAction">
<placeholder name="ExtensionsPlaceholder">
<menu name="Register2Test" action="Register2TestAction">
<menuitem name="Register2TestGL" action="Register2TestGLAction"/>
</menu>
</placeholder>
</menu>
</menubar>
</ui>

12
po/POTFILES.in
View File

@ -64,7 +64,6 @@ gnucash/gnome/dialog-doclink.c
gnucash/gnome/dialog-employee.c gnucash/gnome/dialog-employee.c
gnucash/gnome/dialog-fincalc.c gnucash/gnome/dialog-fincalc.c
gnucash/gnome/dialog-find-account.c gnucash/gnome/dialog-find-account.c
gnucash/gnome/dialog-find-transactions2.c
gnucash/gnome/dialog-find-transactions.c gnucash/gnome/dialog-find-transactions.c
gnucash/gnome/dialog-imap-editor.c gnucash/gnome/dialog-imap-editor.c
gnucash/gnome/dialog-invoice.c gnucash/gnome/dialog-invoice.c
@ -79,7 +78,6 @@ gnucash/gnome/dialog-print-check.c
gnucash/gnome/dialog-progress.c gnucash/gnome/dialog-progress.c
gnucash/gnome/dialog-report-column-view.c gnucash/gnome/dialog-report-column-view.c
gnucash/gnome/dialog-report-style-sheet.c gnucash/gnome/dialog-report-style-sheet.c
gnucash/gnome/dialog-sx-editor2.c
gnucash/gnome/dialog-sx-editor.c gnucash/gnome/dialog-sx-editor.c
gnucash/gnome/dialog-sx-from-trans.c gnucash/gnome/dialog-sx-from-trans.c
gnucash/gnome/dialog-sx-since-last-run.c gnucash/gnome/dialog-sx-since-last-run.c
@ -94,14 +92,11 @@ gnucash/gnome/gnc-plugin-page-account-tree.c
gnucash/gnome/gnc-plugin-page-budget.c gnucash/gnome/gnc-plugin-page-budget.c
gnucash/gnome/gnc-plugin-page-invoice.c gnucash/gnome/gnc-plugin-page-invoice.c
gnucash/gnome/gnc-plugin-page-owner-tree.c gnucash/gnome/gnc-plugin-page-owner-tree.c
gnucash/gnome/gnc-plugin-page-register2.c
gnucash/gnome/gnc-plugin-page-register.c gnucash/gnome/gnc-plugin-page-register.c
gnucash/gnome/gnc-plugin-page-report.c gnucash/gnome/gnc-plugin-page-report.c
gnucash/gnome/gnc-plugin-page-sx-list.c gnucash/gnome/gnc-plugin-page-sx-list.c
gnucash/gnome/gnc-plugin-register2.c
gnucash/gnome/gnc-plugin-register.c gnucash/gnome/gnc-plugin-register.c
gnucash/gnome/gnc-plugin-report-system.c gnucash/gnome/gnc-plugin-report-system.c
gnucash/gnome/gnc-split-reg2.c
gnucash/gnome/gnc-split-reg.c gnucash/gnome/gnc-split-reg.c
gnucash/gnome/gnucash.appdata.xml.in.in gnucash/gnome/gnucash.appdata.xml.in.in
gnucash/gnome/gnucash.desktop.in.in gnucash/gnome/gnucash.desktop.in.in
@ -110,7 +105,6 @@ gnucash/gnome/report-menus.scm
gnucash/gnome/search-owner.c gnucash/gnome/search-owner.c
gnucash/gnome/top-level.c gnucash/gnome/top-level.c
gnucash/gnome/window-autoclear.c gnucash/gnome/window-autoclear.c
gnucash/gnome/window-reconcile2.c
gnucash/gnome/window-reconcile.c gnucash/gnome/window-reconcile.c
gnucash/gnome/window-report.c gnucash/gnome/window-report.c
gnucash/gnome-search/dialog-search.c gnucash/gnome-search/dialog-search.c
@ -187,7 +181,6 @@ gnucash/gnome-utils/gnc-recurrence.c
gnucash/gnome-utils/gnc-splash.c gnucash/gnome-utils/gnc-splash.c
gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c gnucash/gnome-utils/gnc-sx-instance-dense-cal-adapter.c
gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c
gnucash/gnome-utils/gnc-tree-control-split-reg.c
gnucash/gnome-utils/gnc-tree-model-account.c gnucash/gnome-utils/gnc-tree-model-account.c
gnucash/gnome-utils/gnc-tree-model-account-types.c gnucash/gnome-utils/gnc-tree-model-account-types.c
gnucash/gnome-utils/gnc-tree-model-budget.c gnucash/gnome-utils/gnc-tree-model-budget.c
@ -195,14 +188,11 @@ gnucash/gnome-utils/gnc-tree-model.c
gnucash/gnome-utils/gnc-tree-model-commodity.c gnucash/gnome-utils/gnc-tree-model-commodity.c
gnucash/gnome-utils/gnc-tree-model-owner.c gnucash/gnome-utils/gnc-tree-model-owner.c
gnucash/gnome-utils/gnc-tree-model-price.c gnucash/gnome-utils/gnc-tree-model-price.c
gnucash/gnome-utils/gnc-tree-model-split-reg.c
gnucash/gnome-utils/gnc-tree-util-split-reg.c
gnucash/gnome-utils/gnc-tree-view-account.c gnucash/gnome-utils/gnc-tree-view-account.c
gnucash/gnome-utils/gnc-tree-view.c gnucash/gnome-utils/gnc-tree-view.c
gnucash/gnome-utils/gnc-tree-view-commodity.c gnucash/gnome-utils/gnc-tree-view-commodity.c
gnucash/gnome-utils/gnc-tree-view-owner.c gnucash/gnome-utils/gnc-tree-view-owner.c
gnucash/gnome-utils/gnc-tree-view-price.c gnucash/gnome-utils/gnc-tree-view-price.c
gnucash/gnome-utils/gnc-tree-view-split-reg.c
gnucash/gnome-utils/gnc-tree-view-sx-list.c gnucash/gnome-utils/gnc-tree-view-sx-list.c
gnucash/gnome-utils/gnc-window.c gnucash/gnome-utils/gnc-window.c
gnucash/gnome-utils/gnome-utils.scm gnucash/gnome-utils/gnome-utils.scm
@ -290,7 +280,6 @@ gnucash/gtkbuilder/dialog-vendor.glade
gnucash/gtkbuilder/gnc-date-format.glade gnucash/gtkbuilder/gnc-date-format.glade
gnucash/gtkbuilder/gnc-frequency.glade gnucash/gtkbuilder/gnc-frequency.glade
gnucash/gtkbuilder/gnc-plugin-page-budget.glade gnucash/gtkbuilder/gnc-plugin-page-budget.glade
gnucash/gtkbuilder/gnc-plugin-page-register2.glade
gnucash/gtkbuilder/gnc-plugin-page-register.glade gnucash/gtkbuilder/gnc-plugin-page-register.glade
gnucash/gtkbuilder/gnc-recurrence.glade gnucash/gtkbuilder/gnc-recurrence.glade
gnucash/gtkbuilder/gnc-tree-view-owner.glade gnucash/gtkbuilder/gnc-tree-view-owner.glade
@ -393,7 +382,6 @@ gnucash/register/ledger-core/gncEntryLedgerDisplay.c
gnucash/register/ledger-core/gncEntryLedgerLayout.c gnucash/register/ledger-core/gncEntryLedgerLayout.c
gnucash/register/ledger-core/gncEntryLedgerLoad.c gnucash/register/ledger-core/gncEntryLedgerLoad.c
gnucash/register/ledger-core/gncEntryLedgerModel.c gnucash/register/ledger-core/gncEntryLedgerModel.c
gnucash/register/ledger-core/gnc-ledger-display2.c
gnucash/register/ledger-core/gnc-ledger-display.c gnucash/register/ledger-core/gnc-ledger-display.c
gnucash/register/ledger-core/split-register.c gnucash/register/ledger-core/split-register.c
gnucash/register/ledger-core/split-register-control.c gnucash/register/ledger-core/split-register-control.c