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

Use the new user_symbol property where relevant

Browse Source 
Author:    Frédéric Perrin <frederic.perrin@resel.fr>

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23322 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens
2013-10-24 12:27:49 +00:00
parent 13fcf19a72
commit 7a0b3405da
3 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/app-utils/gnc-ui-util.c
View File

@@ -1454,37 +1454,7 @@ xaccSPrintAmount (char * bufp, gnc_numeric val, GNCPrintAmountInfo info)
return 0;
lc = gnc_localeconv();
if (info.use_symbol)
{
/* There was a bug here: don't use gnc_locale_default_currency */
if (gnc_commodity_equiv (info.commodity,
gnc_locale_default_currency_nodefault ()))
{
currency_symbol = lc->currency_symbol;
}
else
{
if (info.commodity && !gnc_commodity_is_iso (info.commodity))
is_shares = TRUE;
currency_symbol = gnc_commodity_get_mnemonic (info.commodity);
info.use_locale = 0;
}
if (currency_symbol == NULL)
currency_symbol = "";
}
else
currency_symbol = NULL;
if (!info.use_locale)
{
cs_precedes = is_shares ? 0 : 1;
sep_by_space = 1;
}
else
{
if (info.use_locale)
if (gnc_numeric_negative_p (val))
{
cs_precedes = lc->n_cs_precedes;
@@ -1495,8 +1465,26 @@ xaccSPrintAmount (char * bufp, gnc_numeric val, GNCPrintAmountInfo info)
cs_precedes = lc->p_cs_precedes;
sep_by_space = lc->p_sep_by_space;
}
else
{
cs_precedes = TRUE;
sep_by_space = TRUE;
}
if (info.commodity && info.use_symbol)
{
if (gnc_commodity_is_iso (info.commodity))
currency_symbol = gnc_commodity_get_nice_symbol (info.commodity);
else
{
currency_symbol = gnc_commodity_get_mnemonic (info.commodity);
cs_precedes = FALSE;
sep_by_space = TRUE;
}
}
else /* !info.use_symbol || !info.commodity */
currency_symbol = "";
if (gnc_numeric_negative_p (val))
{
sign = lc->negative_sign;
@@ -1759,6 +1747,22 @@ printable_value (gdouble val, gint denom)
return xaccPrintAmount (num, info);
}
const char*
gnc_commodity_get_nice_symbol(const gnc_commodity *cm)
{
const char *nice_symbol;
if (!cm) return NULL;
nice_symbol = gnc_commodity_get_user_symbol(cm);
if (nice_symbol)
return nice_symbol;
else if (gnc_commodity_equiv (cm, gnc_locale_default_currency_nodefault ()))
return gnc_localeconv()->currency_symbol;
else if ((nice_symbol = gnc_commodity_get_mnemonic(cm)))
return nice_symbol;
else
return "";
}
/********************************************************************\
* xaccParseAmount *