diff --git a/src/SplitLedger.c b/src/SplitLedger.c index ffe58d7846..784ec689a4 100644 --- a/src/SplitLedger.c +++ b/src/SplitLedger.c @@ -1287,7 +1287,6 @@ LedgerTraverse (Table *table, cell_type = xaccSplitRegisterGetCurrentCellType (reg); if (!(cell_type == XFRM_CELL || - cell_type == XTO_CELL || cell_type == MXFRM_CELL)) break; @@ -1299,10 +1298,6 @@ LedgerTraverse (Table *table, if (changed & MOD_XFRM) cell = reg->xfrmCell; break; - case XTO_CELL: - if (changed & MOD_XTO) - cell = reg->xtoCell; - break; case MXFRM_CELL: if (changed & MOD_MXFRM) cell = reg->mxfrmCell; @@ -2561,14 +2556,11 @@ xaccSRSaveRegEntryToSCM (SplitRegister *reg, SCM trans_scm, SCM split_scm, if (MOD_MEMO & changed) gnc_split_scm_set_memo(split_scm, reg->memoCell->cell.value); - if ((MOD_XFRM | MOD_XTO) & changed) { + if (MOD_XFRM & changed) { Account *new_account; char *new_name; - if (MOD_XFRM & changed) - new_name = reg->xfrmCell->cell.value; - else - new_name = reg->xtoCell->cell.value; + new_name = reg->xfrmCell->cell.value; new_account = xaccGetAccountByFullName(trans, new_name, account_separator); @@ -2859,31 +2851,20 @@ xaccSRSaveChangedCells (SplitRegister *reg, Transaction *trans, Split *split) * just reparent the indicated split, its it, and that's that. For * a two-line display, we want to reparent the "other" split, but * only if there is one. XFRM is the straight split, MXFRM is the - * mirrored split. XTO is the straight split, too :) Only one of - * XFRM or XTO should be in a given cursor. */ - if ((MOD_XFRM | MOD_XTO) & changed) + * mirrored split. */ + if (MOD_XFRM & changed) { Account *old_acc; Account *new_acc; char *new_name; - if (MOD_XFRM & changed) - { - DEBUG ("MOD_XFRM: %s", reg->xfrmCell->cell.value); - } - else - { - DEBUG ("MOD_XTO: %s", reg->xtoCell->cell.value); - } + DEBUG ("MOD_XFRM: %s", reg->xfrmCell->cell.value); /* do some reparenting. Insertion into new account will automatically * delete this split from the old account */ old_acc = xaccSplitGetAccount (split); - if (MOD_XFRM & changed) - new_name = reg->xfrmCell->cell.value; - else - new_name = reg->xtoCell->cell.value; + new_name = reg->xfrmCell->cell.value; new_acc = xaccGetAccountByFullName (trans, new_name, account_separator); @@ -3446,7 +3427,6 @@ xaccSRGetEntryHandler (VirtualLocation virt_loc, short _cell_type, break; case XFRM_CELL: - case XTO_CELL: { static char *name = NULL; @@ -3582,7 +3562,6 @@ xaccSRGetIOFlagsHandler (VirtualLocation virt_loc, gpointer user_data) case DESC_CELL: case ACTN_CELL: case XFRM_CELL: - case XTO_CELL: case MEMO_CELL: case CRED_CELL: case DEBT_CELL: @@ -4303,7 +4282,6 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist, /* set the completion character for the xfer cells */ xaccComboCellSetCompleteChar (reg->mxfrmCell, account_separator); xaccComboCellSetCompleteChar (reg->xfrmCell, account_separator); - xaccComboCellSetCompleteChar (reg->xtoCell, account_separator); /* enable callback for cursor user-driven moves */ table->move_cursor = LedgerMoveCursor; @@ -4409,7 +4387,6 @@ xaccSRLoadXferCells (SplitRegister *reg, Account *base_account) xaccLoadXferCell(reg->xfrmCell, group, base_account); xaccLoadXferCell(reg->mxfrmCell, group, base_account); - xaccLoadXferCell(reg->xtoCell, group, base_account); } /* ======================================================== */ diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c index 54a23e91ed..954226729e 100644 --- a/src/gnome/window-register.c +++ b/src/gnome/window-register.c @@ -1794,13 +1794,15 @@ regWindowLedger (xaccLedgerDisplay *ledger) { gboolean use_double_line; - use_double_line = gnc_lookup_boolean_option("Register", - "Double Line Mode", - FALSE); + use_double_line = gnc_lookup_boolean_option ("Register", + "Double Line Mode", + FALSE); /* be sure to initialize the gui elements associated with the cursor */ - xaccConfigSplitRegister(ledger->ledger, ledger->type, - ledger->ledger->style, use_double_line); + xaccConfigSplitRegister (ledger->ledger, + ledger->type, + ledger->ledger->style, + use_double_line); } /* Allow grow, allow shrink, auto-shrink */ diff --git a/src/register/splitreg.c b/src/register/splitreg.c index 95790914c3..7547af0276 100644 --- a/src/register/splitreg.c +++ b/src/register/splitreg.c @@ -73,7 +73,6 @@ struct _SplitRegisterBuffer CellBuffer balanceCell; CellBuffer actionCell; CellBuffer xfrmCell; - CellBuffer xtoCell; CellBuffer memoCell; CellBuffer creditCell; CellBuffer debitCell; @@ -93,7 +92,6 @@ static char *cell_sample_strings[] = N_("sample:999,999.000"+7), /* balance cell */ N_("Transfer"), /* action cell */ N_("sample:Expenses:Automobile:Gasoline"+7), /* xfrm cell */ - N_("sample:Expenses:Automobile:Gasoline"+7), /* xto cell */ N_("sample:Memo field sample text string"+7), /* memo cell */ N_("sample:999,999.000"+7), /* credit cell */ N_("sample:999,999.000"+7), /* debit cell */ @@ -118,7 +116,6 @@ static CellAlignment cell_alignments[] = CELL_ALIGN_RIGHT, /* balance cell */ CELL_ALIGN_LEFT, /* action cell */ CELL_ALIGN_RIGHT, /* xfrm cell */ - CELL_ALIGN_RIGHT, /* xto cell */ CELL_ALIGN_LEFT, /* memo cell */ CELL_ALIGN_RIGHT, /* credit cell */ CELL_ALIGN_RIGHT, /* debit cell */ @@ -187,7 +184,6 @@ configLabels (SplitRegister *reg) LABEL (BALN, _("Balance")); LABEL (ACTN, _("Action")); LABEL (XFRM, _("Account")); - LABEL (XTO, _("Account")); LABEL (MEMO, _("Memo")); LABEL (CRED, _("Credit")); LABEL (DEBT, _("Debit")); @@ -487,11 +483,10 @@ configLayout (SplitRegister *reg) set_cell (reg, curs, DATE_CELL, 0, 0); set_cell (reg, curs, NUM_CELL, 0, 1); set_cell (reg, curs, DESC_CELL, 0, 2); - set_cell (reg, curs, XTO_CELL, 0, 3); - set_cell (reg, curs, MXFRM_CELL, 0, 4); - set_cell (reg, curs, RECN_CELL, 0, 5); - set_cell (reg, curs, DEBT_CELL, 0, 6); - set_cell (reg, curs, CRED_CELL, 0, 7); + set_cell (reg, curs, MXFRM_CELL, 0, 3); + set_cell (reg, curs, RECN_CELL, 0, 4); + set_cell (reg, curs, DEBT_CELL, 0, 5); + set_cell (reg, curs, CRED_CELL, 0, 6); curs = reg->cursor_ledger_double; copy_cursor_row (reg, curs, reg->cursor_ledger_single, 0); @@ -503,8 +498,8 @@ configLayout (SplitRegister *reg) set_cell (reg, curs, DATE_CELL, 0, 0); set_cell (reg, curs, NUM_CELL, 0, 1); set_cell (reg, curs, DESC_CELL, 0, 2); - set_cell (reg, curs, TDEBT_CELL, 0, 6); - set_cell (reg, curs, TCRED_CELL, 0, 7); + set_cell (reg, curs, TDEBT_CELL, 0, 5); + set_cell (reg, curs, TCRED_CELL, 0, 6); curs = reg->cursor_journal_double; copy_cursor_row (reg, curs, reg->cursor_journal_single, 0); @@ -514,10 +509,10 @@ configLayout (SplitRegister *reg) curs = reg->cursor_split; set_cell (reg, curs, ACTN_CELL, 0, 1); set_cell (reg, curs, MEMO_CELL, 0, 2); - set_cell (reg, curs, XFRM_CELL, 0, 4); - set_cell (reg, curs, RECN_CELL, 0, 5); - set_cell (reg, curs, DEBT_CELL, 0, 6); - set_cell (reg, curs, CRED_CELL, 0, 7); + set_cell (reg, curs, XFRM_CELL, 0, 3); + set_cell (reg, curs, RECN_CELL, 0, 4); + set_cell (reg, curs, DEBT_CELL, 0, 5); + set_cell (reg, curs, CRED_CELL, 0, 6); break; } @@ -580,13 +575,12 @@ configLayout (SplitRegister *reg) set_cell (reg, curs, DATE_CELL, 0, 0); set_cell (reg, curs, NUM_CELL, 0, 1); set_cell (reg, curs, DESC_CELL, 0, 2); - set_cell (reg, curs, XTO_CELL, 0, 3); - set_cell (reg, curs, MXFRM_CELL, 0, 4); - set_cell (reg, curs, RECN_CELL, 0, 5); - set_cell (reg, curs, SHRS_CELL, 0, 6); - set_cell (reg, curs, PRIC_CELL, 0, 7); - set_cell (reg, curs, DEBT_CELL, 0, 8); - set_cell (reg, curs, CRED_CELL, 0, 9); + set_cell (reg, curs, MXFRM_CELL, 0, 3); + set_cell (reg, curs, RECN_CELL, 0, 4); + set_cell (reg, curs, SHRS_CELL, 0, 5); + set_cell (reg, curs, PRIC_CELL, 0, 6); + set_cell (reg, curs, DEBT_CELL, 0, 7); + set_cell (reg, curs, CRED_CELL, 0, 8); curs = reg->cursor_ledger_double; copy_cursor_row (reg, curs, reg->cursor_ledger_single, 0); @@ -598,9 +592,9 @@ configLayout (SplitRegister *reg) set_cell (reg, curs, DATE_CELL, 0, 0); set_cell (reg, curs, NUM_CELL, 0, 1); set_cell (reg, curs, DESC_CELL, 0, 2); - set_cell (reg, curs, TSHRS_CELL, 0, 6); - set_cell (reg, curs, TDEBT_CELL, 0, 8); - set_cell (reg, curs, TCRED_CELL, 0, 9); + set_cell (reg, curs, TSHRS_CELL, 0, 5); + set_cell (reg, curs, TDEBT_CELL, 0, 7); + set_cell (reg, curs, TCRED_CELL, 0, 8); curs = reg->cursor_journal_double; copy_cursor_row (reg, curs, reg->cursor_journal_single, 0); @@ -610,12 +604,12 @@ configLayout (SplitRegister *reg) curs = reg->cursor_split; set_cell (reg, curs, ACTN_CELL, 0, 1); set_cell (reg, curs, MEMO_CELL, 0, 2); - set_cell (reg, curs, XFRM_CELL, 0, 4); - set_cell (reg, curs, RECN_CELL, 0, 5); - set_cell (reg, curs, SHRS_CELL, 0, 6); - set_cell (reg, curs, PRIC_CELL, 0, 7); - set_cell (reg, curs, DEBT_CELL, 0, 8); - set_cell (reg, curs, CRED_CELL, 0, 9); + set_cell (reg, curs, XFRM_CELL, 0, 3); + set_cell (reg, curs, RECN_CELL, 0, 4); + set_cell (reg, curs, SHRS_CELL, 0, 5); + set_cell (reg, curs, PRIC_CELL, 0, 6); + set_cell (reg, curs, DEBT_CELL, 0, 7); + set_cell (reg, curs, CRED_CELL, 0, 8); break; } @@ -646,6 +640,9 @@ xaccMallocSplitRegister (SplitRegisterType type, reg = g_new0 (SplitRegister, 1); + if (type >= NUM_SINGLE_REGISTER_TYPES) + style = REG_STYLE_JOURNAL; + xaccInitSplitRegister (reg, type, style, @@ -685,7 +682,7 @@ mallocCursors (SplitRegister *reg) case INCOME_LEDGER: case GENERAL_LEDGER: case SEARCH_LEDGER: - num_cols = 8; + num_cols = 7; break; case STOCK_REGISTER: @@ -694,7 +691,7 @@ mallocCursors (SplitRegister *reg) break; case PORTFOLIO_LEDGER: - num_cols = 10; + num_cols = 9; break; default: @@ -776,7 +773,6 @@ xaccInitSplitRegister (SplitRegister *reg, NEW (SHRBALN, shrbaln, Price); NEW (BALN, balance, Price); NEW (XFRM, xfrm, Combo); - NEW (XTO, xto, Combo); NEW (ACTN, action, Combo); NEW (MEMO, memo, QuickFill); NEW (CRED, credit, Price); @@ -820,20 +816,13 @@ xaccInitSplitRegister (SplitRegister *reg, xaccSetBasicCellBlankHelp (®->xfrmCell->cell, help); } - xaccSetBasicCellBlankHelp (®->xtoCell->cell, - _("Enter the account to transfer to, or choose " - "one from the list")); - xaccComboCellSetIgnoreString (reg->mxfrmCell, _("Split")); - xaccComboCellSetIgnoreString (reg->xtoCell, _("Split")); - { const char *help = _("This transaction has multiple splits; " "switch to auto-split or transaction " "mode to see them all"); xaccComboCellSetIgnoreHelp (reg->mxfrmCell, help); - xaccComboCellSetIgnoreHelp (reg->xtoCell, help); } /* the memo cell */ @@ -943,6 +932,10 @@ xaccConfigSplitRegister (SplitRegister *reg, if (!reg) return; reg->type = newtype; + + if (reg->type >= NUM_SINGLE_REGISTER_TYPES) + newstyle = REG_STYLE_JOURNAL; + reg->style = newstyle; reg->use_double_line = use_double_line; @@ -994,7 +987,6 @@ xaccDestroySplitRegister (SplitRegister *reg) xaccDestroyPriceCell (reg->balanceCell); xaccDestroyComboCell (reg->actionCell); xaccDestroyComboCell (reg->xfrmCell); - xaccDestroyComboCell (reg->xtoCell); xaccDestroyQuickFillCell (reg->memoCell); xaccDestroyPriceCell (reg->creditCell); xaccDestroyPriceCell (reg->debitCell); @@ -1016,7 +1008,6 @@ xaccDestroySplitRegister (SplitRegister *reg) reg->balanceCell = NULL; reg->actionCell = NULL; reg->xfrmCell = NULL; - reg->xtoCell = NULL; reg->memoCell = NULL; reg->creditCell = NULL; reg->debitCell = NULL; @@ -1058,7 +1049,6 @@ xaccSplitRegisterGetChangeFlag (SplitRegister *reg) changed |= MOD_RECN & reg->recnCell->cell.changed; changed |= MOD_ACTN & reg->actionCell->cell.changed; changed |= MOD_XFRM & reg->xfrmCell->cell.changed; - changed |= MOD_XTO & reg->xtoCell->cell.changed; changed |= MOD_MEMO & reg->memoCell->cell.changed; changed |= MOD_AMNT & reg->creditCell->cell.changed; changed |= MOD_AMNT & reg->debitCell->cell.changed; @@ -1082,7 +1072,6 @@ xaccSplitRegisterGetConditionalChangeFlag (SplitRegister *reg) changed |= MOD_RECN & reg->recnCell->cell.conditionally_changed; changed |= MOD_ACTN & reg->actionCell->cell.conditionally_changed; changed |= MOD_XFRM & reg->xfrmCell->cell.conditionally_changed; - changed |= MOD_XTO & reg->xtoCell->cell.conditionally_changed; changed |= MOD_MEMO & reg->memoCell->cell.conditionally_changed; changed |= MOD_AMNT & reg->creditCell->cell.conditionally_changed; changed |= MOD_AMNT & reg->debitCell->cell.conditionally_changed; @@ -1105,7 +1094,6 @@ xaccSplitRegisterClearChangeFlag (SplitRegister *reg) reg->recnCell->cell.changed = 0; reg->actionCell->cell.changed = 0; reg->xfrmCell->cell.changed = 0; - reg->xtoCell->cell.changed = 0; reg->memoCell->cell.changed = 0; reg->creditCell->cell.changed = 0; reg->debitCell->cell.changed = 0; @@ -1363,7 +1351,6 @@ xaccDestroySplitRegisterBuffer (SplitRegisterBuffer *srb) destroyCellBuffer(&srb->balanceCell); destroyCellBuffer(&srb->actionCell); destroyCellBuffer(&srb->xfrmCell); - destroyCellBuffer(&srb->xtoCell); destroyCellBuffer(&srb->memoCell); destroyCellBuffer(&srb->creditCell); destroyCellBuffer(&srb->debitCell); @@ -1404,7 +1391,6 @@ xaccSplitRegisterSaveCursor(SplitRegister *sr, SplitRegisterBuffer *srb) saveCell(&sr->balanceCell->cell, &srb->balanceCell); saveCell(&sr->actionCell->cell, &srb->actionCell); saveCell(&sr->xfrmCell->cell, &srb->xfrmCell); - saveCell(&sr->xtoCell->cell, &srb->xtoCell); saveCell(&sr->memoCell->cell, &srb->memoCell); saveCell(&sr->creditCell->cell, &srb->creditCell); saveCell(&sr->debitCell->cell, &srb->debitCell); @@ -1468,7 +1454,6 @@ xaccSplitRegisterRestoreCursorChanged(SplitRegister *sr, restoreCellChanged(&sr->balanceCell->cell, &srb->balanceCell, cursor); restoreCellChanged(&sr->actionCell->cell, &srb->actionCell, cursor); restoreCellChanged(&sr->xfrmCell->cell, &srb->xfrmCell, cursor); - restoreCellChanged(&sr->xtoCell->cell, &srb->xtoCell, cursor); restoreCellChanged(&sr->memoCell->cell, &srb->memoCell, cursor); restoreCellChanged(&sr->creditCell->cell, &srb->creditCell, cursor); restoreCellChanged(&sr->debitCell->cell, &srb->debitCell, cursor); @@ -1489,7 +1474,6 @@ static const char *cell_names[] = "balance", "action", "account", - "split-account", "memo", "credit", "debit", diff --git a/src/register/splitreg.h b/src/register/splitreg.h index 3324d38c9b..cbdc309a35 100644 --- a/src/register/splitreg.h +++ b/src/register/splitreg.h @@ -89,7 +89,6 @@ typedef enum BALN_CELL, ACTN_CELL, XFRM_CELL, - XTO_CELL, MEMO_CELL, CRED_CELL, DEBT_CELL, @@ -133,12 +132,11 @@ typedef enum MOD_ACTN = 1 << 4, MOD_XFRM = 1 << 5, MOD_MXFRM = 1 << 6, - MOD_XTO = 1 << 7, - MOD_MEMO = 1 << 8, - MOD_AMNT = 1 << 9, - MOD_PRIC = 1 << 10, - MOD_SHRS = 1 << 11, - MOD_NOTES = 1 << 12, + MOD_MEMO = 1 << 7, + MOD_AMNT = 1 << 8, + MOD_PRIC = 1 << 9, + MOD_SHRS = 1 << 10, + MOD_NOTES = 1 << 11, MOD_ALL = 0xffff } CellModifiedFlags; @@ -191,7 +189,6 @@ struct _SplitRegister PriceCell * balanceCell; ComboCell * actionCell; ComboCell * xfrmCell; - ComboCell * xtoCell; QuickFillCell * memoCell; PriceCell * creditCell; PriceCell * debitCell;