IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5141 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas
2001-08-16 07:38:09 +00:00
parent fc39779392
commit f917b12b06
8 changed files with 205 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/register/register-core/basiccell.c
+23 -3
View File
@@ -155,6 +155,28 @@ gnc_basic_cell_set_sample_text (BasicCell *cell,
cell->sample_text = g_strdup (sample_text);
}
void
gnc_basic_cell_set_alignment (BasicCell *cell,
CellAlignment alignment)
{
if (!cell) return;
cell->alignment = alignment;
}
void
gnc_basic_cell_set_expandable (BasicCell *cell, gboolean expandable)
{
if (!cell) return;
cell->expandable = expandable;
}
void
gnc_basic_cell_set_span (BasicCell *cell, gboolean span)
{
if (!cell) return;
cell->span = span;
}
const char *
gnc_basic_cell_get_value (BasicCell *cell)
{
@@ -164,7 +186,7 @@ gnc_basic_cell_get_value (BasicCell *cell)
}
void
xaccSetBasicCellValue (BasicCell *cell, const char *val)
gnc_basic_cell_set_value (BasicCell *cell, const char *val)
{
CellSetValueFunc cb;
@@ -355,5 +377,3 @@ gnc_wcsdup (const GdkWChar *src)
return dest;
}
/* ================== end of file ====================== */
src/register/register-core/basiccell.h
+7 -1
View File
@@ -240,9 +240,15 @@ void gnc_basic_cell_set_name (BasicCell *cell, int cell_type);
void gnc_basic_cell_set_sample_text (BasicCell *cell,
const char *sample_text);
void gnc_basic_cell_set_alignment (BasicCell *cell,
CellAlignment alignment);
void gnc_basic_cell_set_expandable (BasicCell *cell,
gboolean expandable);
void gnc_basic_cell_set_span (BasicCell *cell,
gboolean span);
const char * gnc_basic_cell_get_value (BasicCell *cell);
void xaccSetBasicCellValue (BasicCell *bcell, const char *value);
void gnc_basic_cell_set_value (BasicCell *bcell, const char *value);
gboolean gnc_basic_cell_get_changed (BasicCell *cell);
gboolean gnc_basic_cell_get_conditionally_changed (BasicCell *cell);
src/register/register-core/splitreg.c
+168 -89
View File
@@ -58,61 +58,6 @@
/* This static indicates the debugging module that this .o belongs to. */
static short module = MOD_REGISTER;
typedef struct
{
const char *string;
int offset;
} sample_string;
static sample_string cell_sample_strings[] =
{
{ N_("sample: 12/12/2000"), 7}, /* date cell */
{ N_("sample:99999"), 7}, /* num cell */
{ N_("sample:Description of a transaction"), 7}, /* desc cell */
{ N_("Reconciled:R"), 11}, /* recn cell */
{ N_("sample:999,999.000"), 7}, /* balance cell */
{ N_("Transfer"), 0}, /* action cell */
{ N_("sample:Expenses:Automobile:Gasoline"), 7}, /* xfrm 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 */
{ N_("sample:999,999.000"), 7}, /* price cell */
{ N_("sample:999,999.000"), 7}, /* shares cell */
{ N_("sample:Expenses:Automobile:Gasoline"), 7}, /* mxfrm cell */
{ N_("sample:999,999.000"), 7}, /* tcredit cell */
{ N_("sample:999,999.000"), 7}, /* tdebit cell */
{ N_("sample:999,999.000"), 7}, /* tshares cell */
{ N_("sample:999,999.000"), 7}, /* tbalance cell */
{ N_("sample:Notes field sample text string"), 7}, /* notes cell */
{ N_("sample:(x + 0.33 * y + (x+y) )"), 7 }, /* formula credit cell */
{ N_("sample:(x + 0.33 * y + (x+y) )"), 7 }, /* formula debit cell */
};
static CellAlignment cell_alignments[] =
{
CELL_ALIGN_RIGHT, /* date cell */
CELL_ALIGN_LEFT, /* num cell */
CELL_ALIGN_LEFT, /* desc cell */
CELL_ALIGN_CENTER, /* recn cell */
CELL_ALIGN_RIGHT, /* balance cell */
CELL_ALIGN_LEFT, /* action cell */
CELL_ALIGN_RIGHT, /* xfrm cell */
CELL_ALIGN_LEFT, /* memo cell */
CELL_ALIGN_RIGHT, /* credit cell */
CELL_ALIGN_RIGHT, /* debit cell */
CELL_ALIGN_RIGHT, /* price cell */
CELL_ALIGN_RIGHT, /* shares cell */
CELL_ALIGN_RIGHT, /* mxfrm cell */
CELL_ALIGN_RIGHT, /* tcredit cell */
CELL_ALIGN_RIGHT, /* tdebit cell */
CELL_ALIGN_RIGHT, /* tshares cell */
CELL_ALIGN_RIGHT, /* tbalance cell */
CELL_ALIGN_LEFT, /* notes cell */
CELL_ALIGN_LEFT, /* formula credit cell */
CELL_ALIGN_LEFT, /* formula debit cell */
};
static void
xaccInitSplitRegister (SplitRegister *reg,
SplitRegisterType type,
@@ -126,7 +71,11 @@ xaccInitSplitRegister (SplitRegister *reg,
static void
gnc_register_add_cell (SplitRegister *sr,
CellType cell_type,
const char *cell_type_name)
const char *cell_type_name,
const char *sample_text,
CellAlignment alignment,
gboolean expandable,
gboolean span)
{
BasicCell *cell;
@@ -136,6 +85,10 @@ gnc_register_add_cell (SplitRegister *sr,
cell = gnc_register_make_cell (cell_type_name);
gnc_basic_cell_set_name (cell, cell_type);
gnc_basic_cell_set_sample_text (cell, sample_text);
gnc_basic_cell_set_alignment (cell, alignment);
gnc_basic_cell_set_expandable (cell, expandable);
gnc_basic_cell_set_span (cell, span);
gnc_table_layout_add_cell (sr->table->layout, cell);
}
@@ -254,12 +207,9 @@ set_cell (SplitRegister *reg, CellBlock *cursor,
CellBlock *header;
CellBlock *cursor_sl;
CellBlockCell *cb_cell;
sample_string *ss;
header = gnc_table_layout_get_cursor (reg->table->layout, CURSOR_HEADER);
ss = &cell_sample_strings[cell_type];
cursor->start_col = MIN (cursor->start_col, col);
cursor->stop_col = MAX (cursor->stop_col, col);
@@ -269,10 +219,6 @@ set_cell (SplitRegister *reg, CellBlock *cursor,
cb_cell = gnc_cellblock_get_cell (cursor, row, col);
cb_cell->cell = gnc_table_layout_get_cell (reg->table->layout, cell_type);
cb_cell->cell->sample_text = g_strdup (_(ss->string) + ss->offset);
cb_cell->cell->alignment = cell_alignments[cell_type];
cb_cell->cell->expandable = cell_type == DESC_CELL;
cb_cell->cell->span = cell_type == MEMO_CELL || cell_type == NOTES_CELL;
cb_cell = gnc_cellblock_get_cell (header, row, col);
@@ -280,13 +226,7 @@ set_cell (SplitRegister *reg, CellBlock *cursor,
CURSOR_SINGLE_LEDGER);
if (cb_cell && (cursor == cursor_sl))
{
cb_cell->cell = gnc_table_layout_get_cell (reg->table->layout, cell_type);
cb_cell->cell->sample_text = g_strdup (_(ss->string) + ss->offset);
cb_cell->cell->alignment = cell_alignments[cell_type];
cb_cell->cell->expandable = cell_type == DESC_CELL;
cb_cell->cell->span = cell_type == MEMO_CELL || cell_type == NOTES_CELL;
}
}
static void
@@ -700,26 +640,165 @@ xaccInitSplitRegister (SplitRegister *reg,
/* --------------------------- */
/* malloc the workhorse cells */
gnc_register_add_cell (reg, DATE_CELL, DATE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, NUM_CELL, NUM_CELL_TYPE_NAME);
gnc_register_add_cell (reg, DESC_CELL, QUICKFILL_CELL_TYPE_NAME);
gnc_register_add_cell (reg, RECN_CELL, RECN_CELL_TYPE_NAME);
gnc_register_add_cell (reg, BALN_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, XFRM_CELL, COMBO_CELL_TYPE_NAME);
gnc_register_add_cell (reg, ACTN_CELL, COMBO_CELL_TYPE_NAME);
gnc_register_add_cell (reg, MEMO_CELL, QUICKFILL_CELL_TYPE_NAME);
gnc_register_add_cell (reg, CRED_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, DEBT_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, PRIC_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, SHRS_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, MXFRM_CELL, COMBO_CELL_TYPE_NAME);
gnc_register_add_cell (reg, TCRED_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, TDEBT_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, TSHRS_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, TBALN_CELL, PRICE_CELL_TYPE_NAME);
gnc_register_add_cell (reg, NOTES_CELL, QUICKFILL_CELL_TYPE_NAME);
gnc_register_add_cell (reg, FCRED_CELL, QUICKFILL_CELL_TYPE_NAME);
gnc_register_add_cell (reg, FDEBT_CELL, QUICKFILL_CELL_TYPE_NAME);
gnc_register_add_cell (reg,
DATE_CELL,
DATE_CELL_TYPE_NAME,
N_("sample:12/12/2000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
NUM_CELL,
NUM_CELL_TYPE_NAME,
N_("sample:99999") + 7,
CELL_ALIGN_LEFT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
DESC_CELL,
QUICKFILL_CELL_TYPE_NAME,
N_("sample:Description of a transaction") + 7,
CELL_ALIGN_LEFT,
TRUE,
FALSE);
gnc_register_add_cell (reg,
RECN_CELL,
RECN_CELL_TYPE_NAME,
N_("Reconciled:R") + 11,
CELL_ALIGN_CENTER,
FALSE,
FALSE);
gnc_register_add_cell (reg,
BALN_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
XFRM_CELL,
COMBO_CELL_TYPE_NAME,
N_("Transfer"),
CELL_ALIGN_LEFT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
MXFRM_CELL,
COMBO_CELL_TYPE_NAME,
N_("sample:Expenses:Automobile:Gasoline") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
ACTN_CELL,
COMBO_CELL_TYPE_NAME,
N_("sample:Expenses:Automobile:Gasoline") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
MEMO_CELL,
QUICKFILL_CELL_TYPE_NAME,
N_("sample:Memo field sample text string") + 7,
CELL_ALIGN_LEFT,
FALSE,
TRUE);
gnc_register_add_cell (reg,
DEBT_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
CRED_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
PRIC_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
SHRS_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
TDEBT_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
TCRED_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
TSHRS_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
TBALN_CELL,
PRICE_CELL_TYPE_NAME,
N_("sample:999,999.000") + 7,
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
NOTES_CELL,
QUICKFILL_CELL_TYPE_NAME,
N_("sample:Notes field sample text string") + 7,
CELL_ALIGN_LEFT,
FALSE,
TRUE);
gnc_register_add_cell (reg,
FCRED_CELL,
QUICKFILL_CELL_TYPE_NAME,
N_("sample:(x + 0.33 * y + (x+y) )") + 7,
CELL_ALIGN_LEFT,
FALSE,
FALSE);
gnc_register_add_cell (reg,
FDEBT_CELL,
QUICKFILL_CELL_TYPE_NAME,
N_("sample:(x + 0.33 * y + (x+y) )") + 7,
CELL_ALIGN_LEFT,
FALSE,
FALSE);
/* --------------------------- */
src/register/register-core/table-allgui.c
+3 -3
View File
@@ -795,7 +795,7 @@ gnc_table_move_cursor_internal (Table *table,
entry = gnc_table_get_entry_internal (table, virt_loc,
&conditionally_changed);
xaccSetBasicCellValue (cell, entry);
gnc_basic_cell_set_value (cell, entry);
cell->changed = FALSE;
cell->conditionally_changed = conditionally_changed;
@@ -1169,7 +1169,7 @@ gnc_table_modify_update(Table *table,
else
{
char *newval_mb = gnc_wcstombs (newval);
xaccSetBasicCellValue (cell, newval_mb);
gnc_basic_cell_set_value (cell, newval_mb);
g_free (newval_mb);
}
@@ -1242,7 +1242,7 @@ gnc_table_direct_update (Table *table,
! (table->model->confirm_handler (virt_loc,
table->model->handler_user_data)))
{
xaccSetBasicCellValue (cell, old_value);
gnc_basic_cell_set_value (cell, old_value);
*newval_ptr = NULL;
result = TRUE;
}
src/register/register-core/table-layout.c
+1 -1
View File
@@ -354,7 +354,7 @@ restore_cell (BasicCell *bcell, CellBuffer *cb, CellBlock *cursor)
if (cb_cell->cell == bcell)
{
xaccSetBasicCellValue (bcell, cb->value);
gnc_basic_cell_set_value (bcell, cb->value);
bcell->changed = cb->changed;
bcell->conditionally_changed = cb->conditionally_changed;
return;
src/register/register-gnome/combocell-gnome.c
+1 -5
View File
@@ -450,16 +450,12 @@ xaccAddComboCellMenuItem (ComboCell *cell, char * menustr)
box->list_sorted = FALSE;
}
/* =============================================== */
void
xaccSetComboCellValue (ComboCell *cell, const char *str)
{
xaccSetBasicCellValue (&cell->cell, str);
gnc_basic_cell_set_value (&cell->cell, str);
}
/* =============================================== */
static void
ComboMV (BasicCell *_cell,
const GdkWChar *change,
src/register/register-gnome/datecell-gnome.c
+1 -1
View File
@@ -723,7 +723,7 @@ DateMV (BasicCell *_cell,
if (box->in_date_select)
{
char *newval_mb = gnc_wcstombs (newval);
xaccSetBasicCellValue (_cell, newval_mb);
gnc_basic_cell_set_value (_cell, newval_mb);
g_free (newval_mb);
return;
}
src/register/register-gnome/quickfillcell-gnome.c
+1 -3
View File
@@ -86,7 +86,7 @@ QuickFillDirect (BasicCell *bcell,
if ((match_str != NULL) &&
(strncmp (match_str, bcell->value, strlen (bcell->value)) == 0) &&
(strcmp (match_str, bcell->value) != 0))
xaccSetBasicCellValue (bcell, match_str);
gnc_basic_cell_set_value (bcell, match_str);
*cursor_position += prefix_len;
*start_selection = *cursor_position;
@@ -105,8 +105,6 @@ xaccQuickFillGUIInit (QuickFillCell *cell)
cell->cell.direct_update = QuickFillDirect;
}
/* =============== end of file =================== */
/*
Local Variables:
c-basic-offset: 8