[Gnucash-changes] Convert the account tree summary bar over to
using GConf preferences.
David Hampton
hampton at cvs.gnucash.org
Sun Oct 2 16:02:10 EDT 2005
Log Message:
-----------
Convert the account tree summary bar over to using GConf preferences.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/app-utils:
prefs.scm
gnucash/src/gnome:
window-main-summarybar.c
gnucash/src/gnome/schemas:
Makefile.am
gnucash/src/gnome-utils:
gnc-main-window.c
preferences.glade
gnucash/src/gnome-utils/ui:
gnc-main-window-ui.xml
Added Files:
-----------
gnucash/src/gnome/schemas:
apps_gnucash_window_pages_account_tree.schemas
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.299
retrieving revision 1.1487.2.300
diff -LChangeLog -LChangeLog -u -r1.1487.2.299 -r1.1487.2.300
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,23 @@
2005-10-02 David Hampton <hampton at employees.org>
+ * src/app-utils/prefs.scm:
+ * src/gnome/window-main-summarybar.c:
+ * src/gnome/schemas/Makefile.am:
+ * src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas:
+ * src/gnome-utils/gnc-main-window.c:
+ * src/gnome-utils/preferences.glade:
+ * src/gnome-utils/ui/gnc-main-window-ui.xml: Convert the account
+ tree summary bar over to using GConf preferences.
+
+ * src/gnome-utils/dialog-preferences.[ch]: Add support for a
+ GncDateEdit widget and the new GncPeriodSelect widget.
+
+ * src/app-utils/Makefile.am:
+ * src/app-utils/gnc-accounting-period.[ch]:
+ * src/gnome-utils/Makefile.am:
+ * src/gnome-utils/gnc-period-select.[ch]: Add a selection widget
+ and non-gui supporting functions for choosing accounting periods.
+
* src/engine/Account.c: Revert change to xaccAccountCommitEdit()
that causes gnucash to crash at exit.
@@ -164,6 +182,12 @@
* src/engine/Period.h
* src/engine/qofbackend-p.h
+2005-10-01 David Hampton <hampton at employees.org>
+
+ * src/gnome-utils/QuickFill.c: Improve quickfill behavior when
+ presenting accented characters. Patch from Didier Vidal
+ <didier-devel at 9online.fr>.
+
2005-09-29 David Hampton <hampton at employees.org>
* various: Fix a bunch of warnings generated by doxygen.
Index: window-main-summarybar.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/window-main-summarybar.c,v
retrieving revision 1.12.4.8
retrieving revision 1.12.4.9
diff -Lsrc/gnome/window-main-summarybar.c -Lsrc/gnome/window-main-summarybar.c -u -r1.12.4.8 -r1.12.4.9
--- src/gnome/window-main-summarybar.c
+++ src/gnome/window-main-summarybar.c
@@ -32,13 +32,16 @@
#include "Group.h"
#include "dialog-utils.h"
#include "global-options.h"
+#include "gnc-accounting-period.h"
#include "gnc-component-manager.h"
#include "gnc-engine-util.h"
#include "gnc-euro.h"
+#include "gnc-gconf-utils.h"
#include "gnc-ui-util.h"
#include "gnc-ui.h"
#include "messages.h"
#include "option-util.h"
+#include "qofbook.h"
#include "top-level.h"
#include "window-main-summarybar.h"
@@ -48,10 +51,21 @@
GtkListStore *datamodel;
int component_id;
SCM callback_id;
+ int cnxn_id;
} GNCMainSummary;
#define WINDOW_SUMMARYBAR_CM_CLASS "summary-bar"
+#define GCONF_SECTION "window/pages/account_tree/summary"
+#define KEY_GRAND_TOTAL "grand_total"
+#define KEY_NON_CURRENCY "non_currency"
+#define KEY_START_CHOICE "start_choice"
+#define KEY_START_DATE "start_date"
+#define KEY_START_PERIOD "start_period"
+#define KEY_END_CHOICE "end_choice"
+#define KEY_END_DATE "end_date"
+#define KEY_END_PERIOD "end_period"
+
/**
* An accumulator for a given currency.
*
@@ -331,6 +345,52 @@
N_COLUMNS,
};
+static time_t
+lookup_start_date_option(const gchar *section,
+ const gchar *key_choice,
+ const gchar *key_absolute,
+ const gchar *key_relative,
+ GDate *fy_end)
+{
+ const gchar *choice;
+ time_t time;
+ int which;
+
+ choice = gnc_gconf_get_string(section, key_choice, NULL);
+ if (choice && strcmp(choice, "absolute") == 0) {
+ time = gnc_gconf_get_int(section, key_absolute, NULL);
+ } else {
+ which = gnc_gconf_get_int(section, key_relative, NULL);
+ time = gnc_accounting_period_start_timet(which, fy_end, NULL);
+ }
+ return time;
+}
+
+
+static time_t
+lookup_end_date_option(const gchar *section,
+ const gchar *key_choice,
+ const gchar *key_absolute,
+ const gchar *key_relative,
+ GDate *fy_end)
+{
+ const gchar *choice;
+ time_t time;
+ int which;
+
+ choice = gnc_gconf_get_string(section, key_choice, NULL);
+ if (choice && strcmp(choice, "absolute") == 0) {
+ time = gnc_gconf_get_int(section, key_absolute, NULL);
+ } else {
+ which = gnc_gconf_get_int(section, key_relative, NULL);
+ time = gnc_accounting_period_end_timet(which, fy_end, NULL);
+ }
+ if (time == 0)
+ time == -1;
+ return time;
+}
+
+
/* The gnc_main_window_summary_refresh() subroutine redraws summary
* information. The statusbar includes two fields, titled 'profits'
* and 'assets'. The total assets equal the sum of all of the
@@ -358,25 +418,35 @@
GList *currency_list;
GList *current;
GNCSummarybarOptions options;
+ QofBook *book;
+ KvpFrame *book_frame;
+ gint64 month, day;
+ GDate *fy_end = NULL;
+
+ book = gnc_get_current_book();
+ book_frame = qof_book_get_slots(book);
+ month = kvp_frame_get_gint64(book_frame, "/book/fyear_end/month");
+ day = kvp_frame_get_gint64(book_frame, "/book/fyear_end/day");
+ if (g_date_valid_dmy(day, month, 2005 /* not leap year */))
+ fy_end = g_date_new_dmy(day, month, G_DATE_BAD_YEAR);
options.default_currency = gnc_default_report_currency ();
- options.euro = gnc_lookup_boolean_option("International",
- "Enable EURO support",
- FALSE);
- options.grand_total = gnc_lookup_boolean_option("Summarybar",
- "Show grand total",
- TRUE);
- options.non_currency = gnc_lookup_boolean_option("Summarybar",
- "Show non currency commodities",
-
- TRUE);
+ 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 =
+ gnc_gconf_get_bool(GCONF_SECTION, KEY_NON_CURRENCY, NULL);
/* we will need the balance of the last transaction before the start
date, so subtract 1 from start date */
- options.start_date = gnc_lookup_date_option("Summarybar", "Start date", NULL,
- NULL, NULL, NULL) - 1;
- options.end_date = gnc_lookup_date_option("Summarybar", "End date", NULL,
- NULL, NULL, NULL);
+ options.start_date =
+ lookup_start_date_option(GCONF_SECTION, KEY_START_CHOICE,
+ KEY_START_DATE, KEY_START_PERIOD, fy_end);
+ options.end_date =
+ lookup_end_date_option(GCONF_SECTION, KEY_END_CHOICE,
+ KEY_END_DATE, KEY_END_PERIOD, fy_end);
+ if (fy_end)
+ g_date_free(fy_end);
currency_list = NULL;
@@ -441,6 +511,7 @@
gnc_main_window_summary_destroy_cb(GtkObject * obj, gpointer data)
{
GNCMainSummary * summary = data;
+ gnc_gconf_remove_anon_notification(GCONF_SECTION, summary->cnxn_id);
gnc_unregister_option_change_callback_id(summary->callback_id);
gnc_unregister_gui_component(summary->component_id);
g_free(summary);
@@ -460,6 +531,16 @@
gnc_main_window_summary_refresh(summary);
}
+static void
+gconf_client_notify_cb (GConfClient *client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ gpointer user_data)
+{
+ GNCMainSummary * summary = user_data;
+ gnc_main_window_summary_refresh(summary);
+}
+
GtkWidget *
gnc_main_window_summary_new (void)
{
@@ -508,6 +589,10 @@
gnc_main_window_summary_refresh(retval);
+ retval->cnxn_id = gnc_gconf_add_anon_notification(GCONF_SECTION,
+ gconf_client_notify_cb,
+ retval);
+
return retval->hbox;
}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/schemas/Attic/Makefile.am,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Lsrc/gnome/schemas/Makefile.am -Lsrc/gnome/schemas/Makefile.am -u -r1.1.2.9 -r1.1.2.10
--- src/gnome/schemas/Makefile.am
+++ src/gnome/schemas/Makefile.am
@@ -7,6 +7,7 @@
apps_gnucash_dialog_totd.schemas \
apps_gnucash_general.schemas \
apps_gnucash_warnings.schemas \
+ apps_gnucash_window_pages_account_tree.schemas \
apps_gnucash_window_pages_register.schemas
install-data-local:
--- /dev/null
+++ src/gnome/schemas/apps_gnucash_window_pages_account_tree.schemas
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/grand_total</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/grand_total</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>TRUE</default>
+ <locale name="C">
+ <short>Show a grand total of all accounts converted to the default report currency</short>
+ <long>Show a grand total of all accounts converted to the default report currency</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/non_currency</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/non_currency</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>TRUE</default>
+ <locale name="C">
+ <short>Show non currency commodities</short>
+ <long>Show non currency commodities</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/start_choice</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/start_choice</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>relative</default>
+ <locale name="C">
+ <short>Profit/loss starting date type</short>
+ <long>
+ This setting controls the type of starting date used in
+ profit/loss calculations. If set to "absolute" then GnuCash
+ will retrieve the starting date specified by the start_date
+ key. If set to anything else, Gnucash will retrieve the
+ starting date specified by the start_period key.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/start_date</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/start_date</applyto>
+ <owner>gnucash</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Starting date (in seconds from Jan 1, 1970).</short>
+ <long>
+ This setting controls the starting date sed in profit/loss
+ calculations if the start_choice key is set to "absolute".
+ This field should contain a date as represented in seconds
+ from January 1st, 1970.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/start_period</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/start_period</applyto>
+ <owner>gnucash</owner>
+ <type>int</type>
+ <default>5</default>
+ <locale name="C">
+ <short>Starting time period identifier.</short>
+ <long>
+ This setting controls the starting date sed in profit/loss
+ calculations if the start_choice key is set to anything
+ other than "absolute". This field should contain a value
+ between 0 and 8.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/end_choice</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/end_choice</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>relative</default>
+ <locale name="C">
+ <short>Profit/loss ending date type</short>
+ <long>
+ This setting controls the type of ending date used in
+ profit/loss calculations. If set to "absolute" then GnuCash
+ will retrieve the ending date specified by the end_date
+ key. If set to anything else, Gnucash will retrieve the
+ ending date specified by the end_period key.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/end_date</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/end_date</applyto>
+ <owner>gnucash</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Ending date (in seconds from Jan 1, 1970).</short>
+ <long>
+ This setting controls the ending date sed in profit/loss
+ calculations if the end_choice key is set to "absolute".
+ This field should contain a date as represented in seconds
+ from January 1st, 1970.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnucash/window/pages/account_tree/summary/end_period</key>
+ <applyto>/apps/gnucash/window/pages/account_tree/summary/end_period</applyto>
+ <owner>gnucash</owner>
+ <type>int</type>
+ <default>5</default>
+ <locale name="C">
+ <short>Ending time period identifier.</short>
+ <long>
+ This setting controls the ending date sed in profit/loss
+ calculations if the end_choice key is set to anything
+ other than "absolute". This field should contain a value
+ between 0 and 8.
+ </long>
+ </locale>
+ </schema>
+
+ </schemalist>
+</gconfschemafile>
Index: gnc-main-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-main-window.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -Lsrc/gnome-utils/gnc-main-window.c -Lsrc/gnome-utils/gnc-main-window.c -u -r1.1.2.21 -r1.1.2.22
--- src/gnome-utils/gnc-main-window.c
+++ src/gnome-utils/gnc-main-window.c
@@ -42,7 +42,6 @@
#include "gnc-plugin-manager.h"
#include "gnc-main-window.h"
-#include "dialog-options.h"
#include "dialog-preferences.h"
#include "dialog-reset-warnings.h"
#include "dialog-transfer.h"
@@ -100,7 +99,6 @@
static void gnc_main_window_cmd_file_close (GtkAction *action, GncMainWindow *window);
static void gnc_main_window_cmd_file_quit (GtkAction *action, GncMainWindow *window);
static void gnc_main_window_cmd_edit_preferences (GtkAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_edit_preferences2 (GtkAction *action, GncMainWindow *window);
static void gnc_main_window_cmd_view_refresh (GtkAction *action, GncMainWindow *window);
static void gnc_main_window_cmd_view_toolbar (GtkAction *action, GncMainWindow *window);
static void gnc_main_window_cmd_view_summary (GtkAction *action, GncMainWindow *window);
@@ -184,9 +182,6 @@
{ "EditPreferencesAction", GTK_STOCK_PREFERENCES, N_("Pr_eferences"), NULL,
NULL,
G_CALLBACK (gnc_main_window_cmd_edit_preferences) },
- { "EditPreferences2Action", GTK_STOCK_PREFERENCES, N_("Pr_eferences (New)"), NULL,
- NULL,
- G_CALLBACK (gnc_main_window_cmd_edit_preferences2) },
/* View menu */
@@ -1819,12 +1814,6 @@
static void
gnc_main_window_cmd_edit_preferences (GtkAction *action, GncMainWindow *window)
{
- gnc_show_options_dialog ();
-}
-
-static void
-gnc_main_window_cmd_edit_preferences2 (GtkAction *action, GncMainWindow *window)
-{
gnc_preferences_dialog ();
}
Index: preferences.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/preferences.glade,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -Lsrc/gnome-utils/preferences.glade -Lsrc/gnome-utils/preferences.glade -u -r1.1.2.11 -r1.1.2.12
--- src/gnome-utils/preferences.glade
+++ src/gnome-utils/preferences.glade
@@ -4,8 +4,8 @@
<glade-interface>
<requires lib="gnome"/>
-<widget class="GtkDialog" id="Gnucash Preferences">
- <property name="title" translatable="yes">Gnucash Preferences</property>
+<widget class="GtkDialog" id="Gnucash Options">
+ <property name="title" translatable="yes">Gnucash Options</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -2658,6 +2658,372 @@
</child>
<child>
+ <widget class="GtkTable" id="table9">
+ <property name="visible">True</property>
+ <property name="n_rows">11</property>
+ <property name="n_columns">4</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">12</property>
+
+ <child>
+ <widget class="GtkLabel" id="label91">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Content</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="gconf/window/pages/account_tree/summary/grand_total">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Include grand total</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">1</property>
+ <property name="bottom_attach">2</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/window/pages/account_tree/summary/non_currency">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Include non currency totals</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">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label93">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Start Date</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</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>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label94">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label95">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>End Date</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</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>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/window/pages/account_tree/summary/start_choice/relative">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Relative</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">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/window/pages/account_tree/summary/start_choice/absolute">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Absolute</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>
+ <property name="group">gconf/window/pages/account_tree/summary/start_choice/relative</property>
+ </widget>
+ <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="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/window/pages/account_tree/summary/end_choice/relative">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Relative</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">1</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/window/pages/account_tree/summary/end_choice/absolute">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Absolute</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>
+ <property name="group">gconf/window/pages/account_tree/summary/end_choice/relative</property>
+ </widget>
+ <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="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="Custom" id="gconf/winow/pages/account_tree/summary/start_date">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_date_edit_new_glade</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sun, 11 Sep 2005 22:33:58 GMT</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="Custom" id="gconf/window/pages/account_tree/summary/end_date">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_date_edit_new_glade</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Sun, 11 Sep 2005 22:33:50 GMT</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="Custom" id="gconf/window/pages/account_tree/summary/end_period">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_period_select_new_glade</property>
+ <property name="int1">0</property>
+ <property name="int2">1</property>
+ <property name="last_modification_time">Tue, 13 Sep 2005 05:43:49 GMT</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="Custom" id="gconf/window/pages/account_tree/summary/start_period">
+ <property name="visible">True</property>
+ <property name="creation_function">gnc_period_select_new_glade</property>
+ <property name="int1">1</property>
+ <property name="int2">1</property>
+ <property name="last_modification_time">Tue, 13 Sep 2005 05:43:49 GMT</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">False</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label107">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Summarybar</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkTable" id="table5">
<property name="border_width">6</property>
<property name="visible">True</property>
Index: prefs.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/prefs.scm,v
retrieving revision 1.28.4.19
retrieving revision 1.28.4.20
diff -Lsrc/app-utils/prefs.scm -Lsrc/app-utils/prefs.scm -u -r1.28.4.19 -r1.28.4.20
--- src/app-utils/prefs.scm
+++ src/app-utils/prefs.scm
@@ -140,26 +140,6 @@
"e" (N_ "The default date format used for fancy printed dates") #f))
-;;; Summarybar Options
-
-(gnc:register-configuration-option
- (gnc:make-simple-boolean-option
- (N_ "Summarybar") (N_ "Show grand total")
- "a" (N_ "Show a grand total of all accounts converted to the default report currency")
- #t))
-
-(gnc:register-configuration-option
- (gnc:make-simple-boolean-option
- (N_ "Summarybar") (N_ "Show non currency commodities")
- "b" (N_ "Show non currency commodities")
- #t))
-
-(gnc:options-make-date-interval!
- gnc:*options-entries* (N_ "Summarybar")
- (N_ "Start date") (N_ "Start date for profit/loss calculation")
- (N_ "End date") (N_ "End date for profit/loss and date for net assets calculation")
- "c")
-
;;; Internal options -- Section names that start with "__" are not
;;; displayed in option dialogs.
Index: gnc-main-window-ui.xml
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/ui/Attic/gnc-main-window-ui.xml,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/gnome-utils/ui/gnc-main-window-ui.xml -Lsrc/gnome-utils/ui/gnc-main-window-ui.xml -u -r1.1.2.7 -r1.1.2.8
--- src/gnome-utils/ui/gnc-main-window-ui.xml
+++ src/gnome-utils/ui/gnc-main-window-ui.xml
@@ -45,7 +45,6 @@
<placeholder name="EditFindPlaceholder"/>
<separator name="EditSep4"/>
<menuitem name="EditPreferences" action="EditPreferencesAction"/>
- <menuitem name="EditPreferences2" action="EditPreferences2Action"/>
<placeholder name="EditPreferencesPlaceholder"/>
<separator name="EditSep5"/>
<placeholder name="EditStyleSheetsPlaceholder"/>
More information about the gnucash-changes
mailing list