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

Refactor register color functions to reduce duplication

Browse Source
This commit is contained in:
Geert Janssens 2014-08-30 15:51:22 +02:00
parent 0a394c5bba
commit 904afd8bd5
3 changed files with 147 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

343
src/register/ledger-core/split-register-model.c
View File

@ -40,15 +40,41 @@
#include "engine-helpers.h" #include "engine-helpers.h"
static SplitRegisterColors reg_colors = typedef enum
{ {
0x96B183, COLOR_TABLE_DEFAULT,
0xBFDEB9, COLOR_TABLE_GTKRC,
0xF6FFDA, } SplitRegisterColorTable;
0xFFEF98,
0xFFEF98, /* Alternative color tables to use for the register.
0xEDE7D3, * The colors in this array are ordered according to the RegisterColor Enum
0xFFEF98, * Be careful to respect this order !
*/
static const guint32 reg_colors_default [] =
{
0x000000, // COLOR_UNKNOWN
0x96B183, // COLOR_HEADER
0xBFDEB9, // COLOR_PRIMARY
0xFFEF98, // COLOR_PRIMARY_ACTIVE
0xF6FFDA, // COLOR_SECONDARY
0xFFEF98, // COLOR_SECONDARY_ACTIVE
0xEDE7D3, // COLOR_SPLIT
0xFFEF98, // COLOR_SPLIT_ACTIVE
};
/* The colors in this array are ordered according to the RegisterColor Enum
* Be careful to respect this order !
*/
static const guint32 reg_colors_gtkrc [] =
{
COLOR_UNKNOWN, // COLOR_UNKNOWN
COLOR_HEADER, // COLOR_HEADER
COLOR_PRIMARY, // COLOR_PRIMARY
COLOR_PRIMARY_ACTIVE, // COLOR_PRIMARY_ACTIVE
COLOR_SECONDARY, // COLOR_SECONDARY
COLOR_SECONDARY_ACTIVE, // COLOR_SECONDARY_ACTIVE
COLOR_SPLIT, // COLOR_SPLIT
COLOR_SPLIT_ACTIVE, // COLOR_SPLIT_ACTIVE
}; };
/* This static indicates the debugging module that this .o belongs to. */ /* This static indicates the debugging module that this .o belongs to. */
@ -513,7 +539,7 @@ get_trans_total_balance (SplitRegister *reg, Transaction *trans)
} }
static guint32 static guint32
gnc_split_register_get_shares_fg_color (VirtualLocation virt_loc, gnc_split_register_get_fg_color (VirtualLocation virt_loc,
gpointer user_data) gpointer user_data)
{ {
SplitRegister *reg = user_data; SplitRegister *reg = user_data;
@ -521,7 +547,7 @@ gnc_split_register_get_shares_fg_color (VirtualLocation virt_loc,
const guint32 red = 0xff0000; const guint32 red = 0xff0000;
const char * cell_name; const char * cell_name;
gboolean is_current; gboolean is_current;
gnc_numeric shares; gnc_numeric value;
Split *split; Split *split;
if (!use_red_for_negative) if (!use_red_for_negative)
@ -533,64 +559,122 @@ gnc_split_register_get_shares_fg_color (VirtualLocation virt_loc,
cell_name = gnc_table_get_cell_name (reg->table, virt_loc); cell_name = gnc_table_get_cell_name (reg->table, virt_loc);
is_current = virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc);
if (gnc_cell_name_equal (cell_name, TSHRS_CELL)) if (gnc_cell_name_equal (cell_name, TSHRS_CELL))
shares = get_trans_total_amount (reg, xaccSplitGetParent (split)); value = get_trans_total_amount (reg, xaccSplitGetParent (split));
else if (is_current) else if (gnc_cell_name_equal (cell_name, SHRS_CELL))
shares = gnc_price_cell_get_value {
if (virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc))
value = gnc_price_cell_get_value
((PriceCell *) gnc_table_layout_get_cell (reg->table->layout, ((PriceCell *) gnc_table_layout_get_cell (reg->table->layout,
SHRS_CELL)); SHRS_CELL));
else else
shares = xaccSplitGetAmount (split); value = xaccSplitGetAmount (split);
}
else if (gnc_cell_name_equal (cell_name, BALN_CELL))
value = xaccSplitGetBalance (split);
else if (gnc_cell_name_equal (cell_name, RBALN_CELL))
value = gnc_split_register_get_rbaln (virt_loc, user_data, TRUE);
else if (gnc_cell_name_equal (cell_name, TBALN_CELL))
value = get_trans_total_balance (reg, xaccSplitGetParent (split));
if (gnc_numeric_negative_p (shares)) if ((gnc_cell_name_equal (cell_name, BALN_CELL)) ||
(gnc_cell_name_equal (cell_name, RBALN_CELL)) ||
(gnc_cell_name_equal (cell_name, TBALN_CELL)))
{
Account *account = xaccSplitGetAccount (split);
if (gnc_reverse_balance (account))
value = gnc_numeric_neg (value);
}
if (gnc_numeric_negative_p (value))
return red; return red;
return black; return black;
} }
static guint32 static guint32
gnc_split_register_get_balance_fg_color (VirtualLocation virt_loc, gnc_split_register_get_bg_color_internal (VirtualLocation virt_loc,
gpointer user_data) SplitRegister *reg,
const guint32 *color_table,
guint32 default_color)
{ {
SplitRegister *reg = user_data; const char *cursor_name;
const guint32 black = 0x000000; VirtualCell *vcell;
const guint32 red = 0xff0000; gboolean is_current;
const char * cell_name; gboolean double_alternate_virt;
gnc_numeric balance;
Split *split;
if (!use_red_for_negative) if (!reg)
return black; return default_color;
split = gnc_split_register_get_split (reg, virt_loc.vcell_loc); if (gnc_table_virtual_location_in_header (reg->table, virt_loc))
if (!split) return color_table[COLOR_HEADER];
return black;
cell_name = gnc_table_get_cell_name (reg->table, virt_loc); vcell = gnc_table_get_virtual_cell (reg->table, virt_loc.vcell_loc);
if (!vcell || !vcell->cellblock)
return default_color;
if (gnc_cell_name_equal (cell_name, BALN_CELL)) if ((virt_loc.phys_col_offset < vcell->cellblock->start_col) ||
balance = xaccSplitGetBalance (split); (virt_loc.phys_col_offset > vcell->cellblock->stop_col))
else if (gnc_cell_name_equal (cell_name, RBALN_CELL)) return default_color;
balance = gnc_split_register_get_rbaln (virt_loc, user_data, TRUE);
else
balance = get_trans_total_balance (reg, xaccSplitGetParent (split));
is_current = virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc);
cursor_name = vcell->cellblock->cursor_name;
if (g_strcmp0 (cursor_name, CURSOR_SINGLE_JOURNAL) == 0 ||
g_strcmp0 (cursor_name, CURSOR_SINGLE_LEDGER) == 0)
{ {
Account *account; if (is_current)
return vcell->start_primary_color ?
color_table[COLOR_PRIMARY_ACTIVE] :
color_table[COLOR_SECONDARY_ACTIVE];
account = xaccSplitGetAccount (split); return vcell->start_primary_color ?
color_table[COLOR_PRIMARY] : color_table[COLOR_SECONDARY];
if (gnc_reverse_balance (account))
balance = gnc_numeric_neg (balance);
} }
if (gnc_numeric_negative_p (balance)) if (g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL) == 0 ||
return red; g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL_NUM_ACTN) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_LEDGER) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_LEDGER_NUM_ACTN) == 0)
{
double_alternate_virt = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL_REGISTER,
GNC_PREF_ALT_COLOR_BY_TRANS);
if (is_current)
{
if (double_alternate_virt)
return vcell->start_primary_color ?
color_table[COLOR_PRIMARY_ACTIVE] :
color_table[COLOR_SECONDARY_ACTIVE];
return black; return (virt_loc.phys_row_offset % 2 == 0) ?
color_table[COLOR_PRIMARY_ACTIVE] :
color_table[COLOR_SECONDARY_ACTIVE];
}
if (double_alternate_virt)
return vcell->start_primary_color ?
color_table[COLOR_PRIMARY] :
color_table[COLOR_SECONDARY];
return (virt_loc.phys_row_offset % 2 == 0) ?
color_table[COLOR_PRIMARY] :
color_table[COLOR_SECONDARY];
}
if (g_strcmp0 (cursor_name, CURSOR_SPLIT) == 0)
{
if (is_current)
return color_table[COLOR_SPLIT_ACTIVE];
return color_table[COLOR_SPLIT];
}
PWARN ("Unexpected cursor: %s\n", cursor_name);
return default_color;
} }
static guint32 static guint32
@ -599,172 +683,25 @@ gnc_split_register_get_bg_color (VirtualLocation virt_loc,
gpointer user_data) gpointer user_data)
{ {
SplitRegister *reg = user_data; SplitRegister *reg = user_data;
const char *cursor_name;
VirtualCell *vcell;
guint32 bg_color;
gboolean is_current;
gboolean double_alternate_virt;
if (hatching) if (hatching)
*hatching = FALSE; *hatching = FALSE;
bg_color = 0xffffff; /* white */ return gnc_split_register_get_bg_color_internal (virt_loc, reg, reg_colors_default, 0xffffff);
if (!reg)
return bg_color;
if (gnc_table_virtual_location_in_header (reg->table, virt_loc))
return reg_colors.header_bg_color;
vcell = gnc_table_get_virtual_cell (reg->table, virt_loc.vcell_loc);
if (!vcell || !vcell->cellblock)
return bg_color;
if ((virt_loc.phys_col_offset < vcell->cellblock->start_col) ||
(virt_loc.phys_col_offset > vcell->cellblock->stop_col))
return bg_color;
is_current = virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc);
cursor_name = vcell->cellblock->cursor_name;
if (g_strcmp0 (cursor_name, CURSOR_SINGLE_JOURNAL) == 0 ||
g_strcmp0 (cursor_name, CURSOR_SINGLE_LEDGER) == 0)
{
if (is_current)
return vcell->start_primary_color ?
reg_colors.primary_active_bg_color :
reg_colors.secondary_active_bg_color;
return vcell->start_primary_color ?
reg_colors.primary_bg_color : reg_colors.secondary_bg_color;
}
if (g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL_NUM_ACTN) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_LEDGER) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_LEDGER_NUM_ACTN) == 0)
{
double_alternate_virt = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL_REGISTER,
GNC_PREF_ALT_COLOR_BY_TRANS);
if (is_current)
{
if (double_alternate_virt)
return vcell->start_primary_color ?
reg_colors.primary_active_bg_color :
reg_colors.secondary_active_bg_color;
return (virt_loc.phys_row_offset % 2 == 0) ?
reg_colors.primary_active_bg_color :
reg_colors.secondary_active_bg_color;
}
if (double_alternate_virt)
return vcell->start_primary_color ?
reg_colors.primary_bg_color :
reg_colors.secondary_bg_color;
return (virt_loc.phys_row_offset % 2 == 0) ?
reg_colors.primary_bg_color :
reg_colors.secondary_bg_color;
}
if (g_strcmp0 (cursor_name, CURSOR_SPLIT) == 0)
{
if (is_current)
return reg_colors.split_active_bg_color;
return reg_colors.split_bg_color;
}
PWARN ("Unexpected cursor: %s\n", cursor_name);
return bg_color;
} }
static RegisterColor static RegisterColor
gnc_split_register_get_gtkrc_bg_color (VirtualLocation virt_loc, gnc_split_register_get_gtkrc_bg_color (VirtualLocation virt_loc,
gboolean *hatching, gboolean *hatching,
gpointer user_data) gpointer user_data)
{ {
SplitRegister *reg = user_data; SplitRegister *reg = user_data;
const char *cursor_name;
VirtualCell *vcell;
gboolean is_current;
gboolean double_alternate_virt;
if (!reg) if (hatching)
return COLOR_UNKNOWN; *hatching = FALSE;
if (gnc_table_virtual_location_in_header (reg->table, virt_loc)) return gnc_split_register_get_bg_color_internal (virt_loc, reg, reg_colors_gtkrc, COLOR_UNKNOWN);
return COLOR_HEADER;
vcell = gnc_table_get_virtual_cell (reg->table, virt_loc.vcell_loc);
if (!vcell || !vcell->cellblock)
return COLOR_UNKNOWN;
if ((virt_loc.phys_col_offset < vcell->cellblock->start_col) ||
(virt_loc.phys_col_offset > vcell->cellblock->stop_col))
return COLOR_UNKNOWN;
is_current = virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc);
cursor_name = vcell->cellblock->cursor_name;
if (g_strcmp0 (cursor_name, CURSOR_SINGLE_JOURNAL) == 0 ||
g_strcmp0 (cursor_name, CURSOR_SINGLE_LEDGER) == 0)
{
if (is_current)
return vcell->start_primary_color ?
COLOR_PRIMARY_ACTIVE :
COLOR_SECONDARY_ACTIVE;
return vcell->start_primary_color ?
COLOR_PRIMARY : COLOR_SECONDARY;
}
if (g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL_NUM_ACTN) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_LEDGER) == 0 ||
g_strcmp0 (cursor_name, CURSOR_DOUBLE_LEDGER_NUM_ACTN) == 0)
{
double_alternate_virt = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL_REGISTER,
GNC_PREF_ALT_COLOR_BY_TRANS);
if (is_current)
{
if (double_alternate_virt)
return vcell->start_primary_color ?
COLOR_PRIMARY_ACTIVE :
COLOR_SECONDARY_ACTIVE;
return (virt_loc.phys_row_offset % 2 == 0) ?
COLOR_PRIMARY_ACTIVE :
COLOR_SECONDARY_ACTIVE;
}
if (double_alternate_virt)
return vcell->start_primary_color ?
COLOR_PRIMARY :
COLOR_SECONDARY;
return (virt_loc.phys_row_offset % 2 == 0) ?
COLOR_PRIMARY :
COLOR_SECONDARY;
}
if (g_strcmp0 (cursor_name, CURSOR_SPLIT) == 0)
{
if (is_current)
return COLOR_SPLIT_ACTIVE;
return COLOR_SPLIT;
}
PWARN ("Unexpected cursor: %s\n", cursor_name);
return COLOR_UNKNOWN;
} }
static guint32 static guint32
@ -2660,19 +2597,19 @@ gnc_split_register_model_new (void)
gnc_table_model_set_fg_color_handler( gnc_table_model_set_fg_color_handler(
model, gnc_split_register_get_shares_fg_color, SHRS_CELL); model, gnc_split_register_get_fg_color, SHRS_CELL);
gnc_table_model_set_fg_color_handler( gnc_table_model_set_fg_color_handler(
model, gnc_split_register_get_shares_fg_color, TSHRS_CELL); model, gnc_split_register_get_fg_color, TSHRS_CELL);
gnc_table_model_set_fg_color_handler( gnc_table_model_set_fg_color_handler(
model, gnc_split_register_get_balance_fg_color, BALN_CELL); model, gnc_split_register_get_fg_color, BALN_CELL);
gnc_table_model_set_fg_color_handler( gnc_table_model_set_fg_color_handler(
model, gnc_split_register_get_balance_fg_color, TBALN_CELL); model, gnc_split_register_get_fg_color, TBALN_CELL);
gnc_table_model_set_fg_color_handler( gnc_table_model_set_fg_color_handler(
model, gnc_split_register_get_balance_fg_color, RBALN_CELL); model, gnc_split_register_get_fg_color, RBALN_CELL);
gnc_table_model_set_default_bg_color_handler( gnc_table_model_set_default_bg_color_handler(

14
src/register/ledger-core/split-register.h
View File

@ -238,20 +238,6 @@ typedef enum
NUM_CURSOR_CLASSES NUM_CURSOR_CLASSES
} CursorClass; } CursorClass;
typedef struct split_register_colors
{
guint32 header_bg_color;
guint32 primary_bg_color;
guint32 secondary_bg_color;
guint32 primary_active_bg_color;
guint32 secondary_active_bg_color;
guint32 split_bg_color;
guint32 split_active_bg_color;
} SplitRegisterColors;
/** @brief A split register created with ::gnc_split_register_new */ /** @brief A split register created with ::gnc_split_register_new */
typedef struct split_register SplitRegister; typedef struct split_register SplitRegister;

37
src/register/register-core/table-allgui.c
View File

@ -364,12 +364,13 @@ gnc_table_get_fg_color (Table *table, VirtualLocation virt_loc)
return fg_color_handler (virt_loc, table->model->handler_user_data); return fg_color_handler (virt_loc, table->model->handler_user_data);
} }
guint32 static guint32
gnc_table_get_bg_color (Table *table, VirtualLocation virt_loc, gnc_table_get_bg_color_internal (Table *table, VirtualLocation virt_loc,
gboolean *hatching) gboolean *hatching,
gboolean want_gtkrc)
{ {
TableGetBGColorHandler bg_color_handler; TableGetBGColorHandler bg_color_handler;
const char *cell_name; const char *handler_name = "gtkrc";
if (hatching) if (hatching)
*hatching = FALSE; *hatching = FALSE;
@ -377,10 +378,11 @@ gnc_table_get_bg_color (Table *table, VirtualLocation virt_loc,
if (!table || !table->model) if (!table || !table->model)
return 0xffffff; /* white */ return 0xffffff; /* white */
cell_name = gnc_table_get_cell_name (table, virt_loc); if (!want_gtkrc)
handler_name = gnc_table_get_cell_name (table, virt_loc);
bg_color_handler = gnc_table_model_get_bg_color_handler (table->model, bg_color_handler = gnc_table_model_get_bg_color_handler (table->model,
cell_name); handler_name);
if (!bg_color_handler) if (!bg_color_handler)
return 0xffffff; return 0xffffff;
@ -388,25 +390,18 @@ gnc_table_get_bg_color (Table *table, VirtualLocation virt_loc,
table->model->handler_user_data); table->model->handler_user_data);
} }
guint32
gnc_table_get_bg_color (Table *table, VirtualLocation virt_loc,
gboolean *hatching)
{
return gnc_table_get_bg_color_internal (table, virt_loc, hatching, FALSE);
}
guint32 guint32
gnc_table_get_gtkrc_bg_color (Table *table, VirtualLocation virt_loc, gnc_table_get_gtkrc_bg_color (Table *table, VirtualLocation virt_loc,
gboolean *hatching) gboolean *hatching)
{ {
TableGetBGColorHandler bg_color_handler; return gnc_table_get_bg_color_internal (table, virt_loc, hatching, TRUE);
if (hatching)
*hatching = FALSE;
if (!table || !table->model)
return 0xffffff; /* white */
bg_color_handler = gnc_table_model_get_bg_color_handler (table->model,
"gtkrc");
if (!bg_color_handler)
return 0xffffff;
return bg_color_handler (virt_loc, hatching,
table->model->handler_user_data);
} }
void void