rationalize register type naming

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@743 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-03-28 07:24:18 +00:00
parent e2bbbee623
commit 12ed405eeb
2 changed files with 42 additions and 39 deletions

View File

@ -142,14 +142,14 @@ configLayout (BasicRegister *reg, int type)
SET (SHRS_CELL, -1, -1, 10, TOT_SHRS_STR); SET (SHRS_CELL, -1, -1, 10, TOT_SHRS_STR);
switch (type) { switch (type) {
case BANK_LEDGER: case BANK_REGISTER:
case CASH_LEDGER: case CASH_REGISTER:
case ASSET_LEDGER: case ASSET_REGISTER:
case CREDIT_LEDGER: case CREDIT_REGISTER:
case LIABILITY_LEDGER: case LIABILITY_REGISTER:
case INCOME_LEDGER: case INCOME_REGISTER:
case EXPENSE_LEDGER: case EXPENSE_REGISTER:
case EQUITY_LEDGER: case EQUITY_REGISTER:
reg->num_cols = 8; reg->num_cols = 8;
reg->num_header_rows = 1; reg->num_header_rows = 1;
SET (XTO_CELL, -1, -1, 14, XFTO_STR); SET (XTO_CELL, -1, -1, 14, XFTO_STR);
@ -158,7 +158,7 @@ configLayout (BasicRegister *reg, int type)
SET (SHRS_CELL, -1, -1, 10, TOT_SHRS_STR); SET (SHRS_CELL, -1, -1, 10, TOT_SHRS_STR);
break; break;
case STOCK_LEDGER: case STOCK_REGISTER:
reg->num_cols = 11; reg->num_cols = 11;
SET (XTO_CELL, -1, -1, 14, XFTO_STR); SET (XTO_CELL, -1, -1, 14, XFTO_STR);
SET (PRIC_CELL, 7, 0, 9, PRICE_STR); SET (PRIC_CELL, 7, 0, 9, PRICE_STR);
@ -173,39 +173,39 @@ configLayout (BasicRegister *reg, int type)
/* setup custom labels for the debit/credit columns */ /* setup custom labels for the debit/credit columns */
switch (type) { switch (type) {
case BANK_LEDGER: case BANK_REGISTER:
reg->labels [DEBT_CELL] = PAYMENT_STR; reg->labels [DEBT_CELL] = PAYMENT_STR;
reg->labels [CRED_CELL] = DEPOSIT_STR; reg->labels [CRED_CELL] = DEPOSIT_STR;
break; break;
case CASH_LEDGER: case CASH_REGISTER:
reg->labels [DEBT_CELL] = SPEND_STR; reg->labels [DEBT_CELL] = SPEND_STR;
reg->labels [CRED_CELL] = RECEIVE_STR; reg->labels [CRED_CELL] = RECEIVE_STR;
break; break;
case ASSET_LEDGER: case ASSET_REGISTER:
reg->labels [DEBT_CELL] = DEPR_STR; reg->labels [DEBT_CELL] = DEPR_STR;
reg->labels [CRED_CELL] = APPR_STR; reg->labels [CRED_CELL] = APPR_STR;
break; break;
case CREDIT_LEDGER: case CREDIT_REGISTER:
reg->labels [DEBT_CELL] = CHARGE_STR; reg->labels [DEBT_CELL] = CHARGE_STR;
reg->labels [CRED_CELL] = PAYMENT_STR; reg->labels [CRED_CELL] = PAYMENT_STR;
break; break;
case LIABILITY_LEDGER: case LIABILITY_REGISTER:
reg->labels [DEBT_CELL] = INCREASE_STR; reg->labels [DEBT_CELL] = INCREASE_STR;
reg->labels [CRED_CELL] = DECREASE_STR; reg->labels [CRED_CELL] = DECREASE_STR;
break; break;
case INCOME_LEDGER: case INCOME_REGISTER:
reg->labels [DEBT_CELL] = INCOME_STR; reg->labels [DEBT_CELL] = INCOME_STR;
reg->labels [CRED_CELL] = CHARGE_STR; reg->labels [CRED_CELL] = CHARGE_STR;
break; break;
case EXPENSE_LEDGER: case EXPENSE_REGISTER:
reg->labels [DEBT_CELL] = REBATE_STR; reg->labels [DEBT_CELL] = REBATE_STR;
reg->labels [CRED_CELL] = EXPENSE_STR; reg->labels [CRED_CELL] = EXPENSE_STR;
break; break;
case EQUITY_LEDGER: case EQUITY_REGISTER:
reg->labels [DEBT_CELL] = SURPLUS_STR; reg->labels [DEBT_CELL] = SURPLUS_STR;
reg->labels [CRED_CELL] = DEFICIT_STR; reg->labels [CRED_CELL] = DEFICIT_STR;
break; break;
case STOCK_LEDGER: case STOCK_REGISTER:
reg->labels [DEBT_CELL] = SOLD_STR; reg->labels [DEBT_CELL] = SOLD_STR;
reg->labels [CRED_CELL] = BOUGHT_STR; reg->labels [CRED_CELL] = BOUGHT_STR;
break; break;
@ -225,14 +225,14 @@ configTraverse (BasicRegister *reg, int type)
CellBlock *curs = reg->cursor; CellBlock *curs = reg->cursor;
switch (type) { switch (type) {
case BANK_LEDGER: case BANK_REGISTER:
case CASH_LEDGER: case CASH_REGISTER:
case ASSET_LEDGER: case ASSET_REGISTER:
case CREDIT_LEDGER: case CREDIT_REGISTER:
case LIABILITY_LEDGER: case LIABILITY_REGISTER:
case INCOME_LEDGER: case INCOME_REGISTER:
case EXPENSE_LEDGER: case EXPENSE_REGISTER:
case EQUITY_LEDGER: case EQUITY_REGISTER:
xaccNextRight (curs, DATE_CELL_R, DATE_CELL_C, NUM_CELL_R, NUM_CELL_C); xaccNextRight (curs, DATE_CELL_R, DATE_CELL_C, NUM_CELL_R, NUM_CELL_C);
xaccNextRight (curs, NUM_CELL_R, NUM_CELL_C, XFRM_CELL_R, XFRM_CELL_C); xaccNextRight (curs, NUM_CELL_R, NUM_CELL_C, XFRM_CELL_R, XFRM_CELL_C);
xaccNextRight (curs, XFRM_CELL_R, XFRM_CELL_C, DESC_CELL_R, DESC_CELL_C); xaccNextRight (curs, XFRM_CELL_R, XFRM_CELL_C, DESC_CELL_R, DESC_CELL_C);
@ -243,7 +243,7 @@ configTraverse (BasicRegister *reg, int type)
xaccNextRight (curs, MEMO_CELL_R, MEMO_CELL_C, -1-DATE_CELL_R, -1-DATE_CELL_C); xaccNextRight (curs, MEMO_CELL_R, MEMO_CELL_C, -1-DATE_CELL_R, -1-DATE_CELL_C);
break; break;
case STOCK_LEDGER: case STOCK_REGISTER:
xaccNextRight (curs, DATE_CELL_R, DATE_CELL_C, NUM_CELL_R, NUM_CELL_C); xaccNextRight (curs, DATE_CELL_R, DATE_CELL_C, NUM_CELL_R, NUM_CELL_C);
xaccNextRight (curs, NUM_CELL_R, NUM_CELL_C, XFRM_CELL_R, XFRM_CELL_C); xaccNextRight (curs, NUM_CELL_R, NUM_CELL_C, XFRM_CELL_R, XFRM_CELL_C);
xaccNextRight (curs, XFRM_CELL_R, XFRM_CELL_C, DESC_CELL_R, DESC_CELL_C); xaccNextRight (curs, XFRM_CELL_R, XFRM_CELL_C, DESC_CELL_R, DESC_CELL_C);

View File

@ -46,18 +46,21 @@
#include "textcell.h" #include "textcell.h"
/* defined register types */ /* defined register types */
#define BANK_LEDGER 0 /* "registers" are single-account display windows.
#define CASH_LEDGER 1 * "ledgers" are multiple-account display windows */
#define ASSET_LEDGER 2 #define BANK_REGISTER 0
#define CREDIT_LEDGER 3 #define CASH_REGISTER 1
#define LIABILITY_LEDGER 4 #define ASSET_REGISTER 2
#define INCOME_LEDGER 5 #define CREDIT_REGISTER 3
#define EXPENSE_LEDGER 6 #define LIABILITY_REGISTER 4
#define EQUITY_LEDGER 7 #define INCOME_REGISTER 5
#define STOCK_LEDGER 8 #define EXPENSE_REGISTER 6
#define GENERAL_LEDGER 9 #define EQUITY_REGISTER 7
#define INCO_LEDGER 10 #define STOCK_REGISTER 8
#define PORTFOL 11
#define GENERAL_LEDGER 9
#define INCOME_LEDGER 10
#define PORTFOLIO 11
/* modified flags -- indicate how values have been modified */ /* modified flags -- indicate how values have been modified */
#define MOD_NONE 0x000 #define MOD_NONE 0x000