Hi,
Am Mittwoch, den 20.06.2007, 10:13 +0200 schrieb Christian Stimming:
> Quoting Davide Imbeni <[EMAIL PROTECTED]>:
> > PS. One more question/doubt: why is there an option to "Enable euro support"
> > in the general preferences? Isn't euro supopdsed to be just one more
> > currency?
>
> Right, I thought of that as well. It should be removed. See
> http://bugzilla.gnome.org/show_bug.cgi?id=449395
I have a patch for that bug. It removes the preference and treats it as
always active. Here is what that means:
* registers for accounts with euro currencies, like ITL, will print all
amounts in both, ITL and EUR to the summary bar
* the summary bar in the accounts tree view shows an additional line for
EUR totals
As non-European users will find it confusing to see a EUR line, I wonder
how to control its visibility. Maybe by checking
gnc_is_euro_currency(gnc_default_currency())?
-- andi5
diff --git a/src/core-utils/gnc-gconf-utils.h b/src/core-utils/gnc-gconf-utils.h
index f6e699b..7698b3a 100644
--- a/src/core-utils/gnc-gconf-utils.h
+++ b/src/core-utils/gnc-gconf-utils.h
@@ -65,7 +65,6 @@
#define KEY_ACCOUNT_SEPARATOR "account_separator"
#define KEY_NEGATIVE_IN_RED "negative_in_red"
#define KEY_NUMBER_OF_ROWS "number_of_rows"
-#define KEY_ENABLE_EURO "enable_euro"
#define KEY_DATE_FORMAT "date_format"
typedef void (*GncGconfGeneralCb) (GConfEntry *entry, gpointer user_data);
diff --git a/src/gnome-utils/glade/preferences.glade b/src/gnome-utils/glade/preferences.glade
index a8cbdf8..aeeb1a1 100644
--- a/src/gnome-utils/glade/preferences.glade
+++ b/src/gnome-utils/glade/preferences.glade
@@ -1640,7 +1640,7 @@
<widget class="GtkTable" id="table2">
<property name="border_width">6</property>
<property name="visible">True</property>
- <property name="n_rows">17</property>
+ <property name="n_rows">16</property>
<property name="n_columns">4</property>
<property name="homogeneous">False</property>
<property name="row_spacing">0</property>
@@ -1699,30 +1699,6 @@
</child>
<child>
- <widget class="GtkCheckButton" id="gconf/general/enable_euro">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Enables support for the European Union EURO currency.</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Enable euro support</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_padding">12</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkCheckButton" id="gconf/dialogs/tip_of_the_day/show_at_startup">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Display hints for using GnuCash at startup</property>
@@ -1800,8 +1776,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
@@ -1829,8 +1805,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -1853,8 +1829,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">4</property>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -1882,8 +1858,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -1910,8 +1886,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -1939,8 +1915,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -1963,8 +1939,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -1986,8 +1962,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">4</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -2010,8 +1986,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">4</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -2039,8 +2015,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -2067,8 +2043,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -2095,8 +2071,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">14</property>
- <property name="bottom_attach">15</property>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -2123,8 +2099,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">15</property>
- <property name="bottom_attach">16</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -2152,8 +2128,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">16</property>
- <property name="bottom_attach">17</property>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -2176,8 +2152,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">16</property>
- <property name="bottom_attach">17</property>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
diff --git a/src/gnome-utils/window-main-summarybar.c b/src/gnome-utils/window-main-summarybar.c
index e28d967..e2a8346 100644
--- a/src/gnome-utils/window-main-summarybar.c
+++ b/src/gnome-utils/window-main-summarybar.c
@@ -80,7 +80,6 @@ typedef struct {
/** options for summarybar **/
typedef struct {
gnc_commodity *default_currency;
- gboolean euro;
gboolean grand_total;
gboolean non_currency;
time_t start_date;
@@ -153,15 +152,10 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
options.default_currency,
TOTAL_GRAND_TOTAL);
- if (options.euro)
- {
- euro_commodity = gnc_get_euro ();
- euro_accum = gnc_ui_get_currency_accumulator(currency_list,
- euro_commodity,
- TOTAL_CURR_TOTAL);
- }
- else
- euro_commodity = NULL;
+ euro_commodity = gnc_get_euro ();
+ euro_accum = gnc_ui_get_currency_accumulator(currency_list,
+ euro_commodity,
+ TOTAL_CURR_TOTAL);
if(!gnc_commodity_is_currency(account_currency)) {
non_currency = TRUE;
@@ -215,7 +209,7 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
GNC_RND_ROUND);
}
- if (options.euro && (currency_accum != euro_accum)) {
+ if (currency_accum != euro_accum) {
euro_accum->assets =
gnc_numeric_add (euro_accum->assets,
gnc_convert_to_euro(account_currency, end_amount),
@@ -275,7 +269,7 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
GNC_RND_ROUND);
}
- if (options.euro && (currency_accum != euro_accum)) {
+ if (currency_accum != euro_accum) {
euro_accum->profits =
gnc_numeric_add (euro_accum->profits,
gnc_convert_to_euro(account_currency, start_amount),
@@ -364,7 +358,6 @@ gnc_main_window_summary_refresh (GNCMainSummary * summary)
options.default_currency = gnc_default_report_currency ();
- options.euro = gnc_gconf_get_bool(GCONF_GENERAL, KEY_ENABLE_EURO, NULL);
options.grand_total =
gnc_gconf_get_bool(GCONF_SECTION, KEY_GRAND_TOTAL, NULL);
options.non_currency =
diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c
index f9279d8..fec9e63 100644
--- a/src/gnome/gnc-split-reg.c
+++ b/src/gnome/gnc-split-reg.c
@@ -531,13 +531,12 @@ gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data)
return;
leader = gnc_ledger_display_leader( gsr->ledger );
- euro = gnc_gconf_get_bool(GCONF_GENERAL, KEY_ENABLE_EURO, NULL);
commodity = xaccAccountGetCommodity( leader );
/* no EURO converson, if account is already EURO or no EURO currency */
if (commodity != NULL)
- euro = (euro && gnc_is_euro_currency( commodity ) &&
+ euro = (gnc_is_euro_currency( commodity ) &&
(strncasecmp(gnc_commodity_get_mnemonic(commodity), "EUR", 3)));
else
euro = FALSE;
diff --git a/src/gnome/schemas/apps_gnucash_general.schemas.in b/src/gnome/schemas/apps_gnucash_general.schemas.in
index 6bebf08..f2061fc 100644
--- a/src/gnome/schemas/apps_gnucash_general.schemas.in
+++ b/src/gnome/schemas/apps_gnucash_general.schemas.in
@@ -56,19 +56,6 @@
</schema>
<schema>
-
- <key>/schemas/apps/gnucash/general/enable_euro</key>
- <applyto>/apps/gnucash/general/enable_euro</applyto>
- <owner>gnucash</owner>
- <type>bool</type>
- <default>TRUE</default>
- <locale name="C">
- <short>Enables Euro support</short>
- <long>Enables additional support for the European Union EURO currency.</long>
- </locale>
- </schema>
-
- <schema>
<key>/schemas/apps/gnucash/general/auto_decimal_point</key>
<applyto>/apps/gnucash/general/auto_decimal_point</applyto>
<owner>gnucash</owner>
_______________________________________________
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
