mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Added 'sort by entry' register option.
Miscellaneous work. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2264 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
bcab34831a
commit
cf940173dd
15
ChangeLog
15
ChangeLog
@ -1,5 +1,20 @@
|
||||
2000-05-04 Dave Peticolas <peticola@cs.ucdavis.edu>
|
||||
|
||||
* src/gnome/window-main.c (gnc_main_create_toolbar): removed the
|
||||
'open file' item from the toolbar, to lessen conflict with the
|
||||
'open account' item.
|
||||
|
||||
2000-05-03 Dave Peticolas <peticola@cs.ucdavis.edu>
|
||||
|
||||
* src/gnome/window-register.c: add a gui option for sorting by
|
||||
date entered.
|
||||
|
||||
* src/engine/Query.c: add a BY_DATE_ENTERED sorting option.
|
||||
|
||||
* src/scm/prefs.scm: convert the gui options to internal options.
|
||||
|
||||
* src/scm/options.scm: add an interal option type with no frills.
|
||||
|
||||
* src/engine/util.c (xaccSPrintAmount): add a space after the
|
||||
currency code to make the currency symbol.
|
||||
(gnc_lconv_set_char): check for the lconv default value using
|
||||
|
@ -467,6 +467,29 @@ split_cmp_func(sort_type_t how, gconstpointer ga, gconstpointer gb) {
|
||||
return 0;
|
||||
break;
|
||||
|
||||
case BY_DATE_ENTERED:
|
||||
/* if dates differ, return */
|
||||
if ( (ta->date_entered.tv_sec) <
|
||||
(tb->date_entered.tv_sec)) {
|
||||
return -1;
|
||||
}
|
||||
else if ((ta->date_entered.tv_sec) >
|
||||
(tb->date_entered.tv_sec)) {
|
||||
return +1;
|
||||
}
|
||||
|
||||
/* else, seconds match. check nanoseconds */
|
||||
if ( (ta->date_entered.tv_nsec) <
|
||||
(tb->date_entered.tv_nsec)) {
|
||||
return -1;
|
||||
}
|
||||
else if ( (ta->date_entered.tv_nsec) >
|
||||
(tb->date_entered.tv_nsec)) {
|
||||
return +1;
|
||||
}
|
||||
return 0;
|
||||
break;
|
||||
|
||||
case BY_NUM:
|
||||
/* sort on transaction number */
|
||||
da = ta->num;
|
||||
|
@ -43,6 +43,7 @@ typedef enum {
|
||||
typedef enum {
|
||||
BY_STANDARD,
|
||||
BY_DATE,
|
||||
BY_DATE_ENTERED,
|
||||
BY_NUM,
|
||||
BY_AMOUNT,
|
||||
BY_MEMO,
|
||||
|
@ -74,7 +74,7 @@ struct _accwindow
|
||||
* data - gtk user data pointer, will point to the *
|
||||
* accWindow structure *
|
||||
* Return: none *
|
||||
\********************************************************************/
|
||||
\********************************************************************/
|
||||
static void
|
||||
gnc_ui_accWindow_list_select_cb(GtkCList * type_list, gint row, gint column,
|
||||
GdkEventButton * event, gpointer data)
|
||||
@ -116,7 +116,7 @@ gnc_ui_accWindow_list_select_cb(GtkCList * type_list, gint row, gint column,
|
||||
* data - gtk user data pointer, will point to the *
|
||||
* accWindow structure *
|
||||
* Return: none *
|
||||
\********************************************************************/
|
||||
\********************************************************************/
|
||||
static void
|
||||
gnc_ui_accWindow_list_unselect_cb(GtkCList * type_list, gint row, gint column,
|
||||
GdkEventButton * event, gpointer data)
|
||||
|
@ -921,11 +921,11 @@ gnc_get_window_size(const char *prefix, int *width, int *height)
|
||||
if (gnc_lookup_boolean_option("General", "Save Window Geometry", FALSE))
|
||||
{
|
||||
name = g_strconcat(prefix, "_width", NULL);
|
||||
w = gnc_lookup_number_range_option("__gui", name, 0.0);
|
||||
w = gnc_lookup_number_option("__gui", name, 0.0);
|
||||
g_free(name);
|
||||
|
||||
name = g_strconcat(prefix, "_height", NULL);
|
||||
h = gnc_lookup_number_range_option("__gui", name, 0.0);
|
||||
h = gnc_lookup_number_option("__gui", name, 0.0);
|
||||
g_free(name);
|
||||
}
|
||||
else
|
||||
@ -951,14 +951,14 @@ gnc_save_window_size(const char *prefix, int width, int height)
|
||||
|
||||
name = g_strconcat(prefix, "_width", NULL);
|
||||
if (save)
|
||||
gnc_set_number_range_option("__gui", name, width);
|
||||
gnc_set_number_option("__gui", name, width);
|
||||
else
|
||||
gnc_set_option_default("__gui", name);
|
||||
g_free(name);
|
||||
|
||||
name = g_strconcat(prefix, "_height", NULL);
|
||||
if (save)
|
||||
gnc_set_number_range_option("__gui", name, height);
|
||||
gnc_set_number_option("__gui", name, height);
|
||||
else
|
||||
gnc_set_option_default("__gui", name);
|
||||
g_free(name);
|
||||
|
@ -209,8 +209,8 @@ gnc_lookup_multichoice_option(const char *section, const char *name,
|
||||
|
||||
|
||||
/********************************************************************\
|
||||
* gnc_lookup_number_range_option *
|
||||
* looks up a number range option. If present, return its value *
|
||||
* gnc_lookup_number_option *
|
||||
* looks up a number option. If present, return its value *
|
||||
* as a gdouble, otherwise returns default_value. *
|
||||
* *
|
||||
* Args: section - section name of option *
|
||||
@ -219,11 +219,11 @@ gnc_lookup_multichoice_option(const char *section, const char *name,
|
||||
* Return: char * option value *
|
||||
\********************************************************************/
|
||||
gdouble
|
||||
gnc_lookup_number_range_option(const char *section, const char *name,
|
||||
gdouble default_value)
|
||||
gnc_lookup_number_option(const char *section, const char *name,
|
||||
gdouble default_value)
|
||||
{
|
||||
return gnc_option_db_lookup_number_range_option(global_options, section,
|
||||
name, default_value);
|
||||
return gnc_option_db_lookup_number_option(global_options, section,
|
||||
name, default_value);
|
||||
}
|
||||
|
||||
|
||||
@ -304,8 +304,8 @@ gnc_set_option_default(const char *section, const char *name)
|
||||
|
||||
|
||||
/********************************************************************\
|
||||
* gnc_set_number_range_option *
|
||||
* sets the number range option to the given value. If successful *
|
||||
* gnc_set_number_option *
|
||||
* sets the number option to the given value. If successful *
|
||||
* returns TRUE, otherwise FALSE. *
|
||||
* *
|
||||
* Args: section - section name of option *
|
||||
@ -314,12 +314,9 @@ gnc_set_option_default(const char *section, const char *name)
|
||||
* Return: success indicator *
|
||||
\********************************************************************/
|
||||
gboolean
|
||||
gnc_set_number_range_option(const char *section, const char *name,
|
||||
gdouble value)
|
||||
gnc_set_number_option(const char *section, const char *name, gdouble value)
|
||||
{
|
||||
return gnc_option_db_set_number_range_option(global_options,
|
||||
section, name,
|
||||
value);
|
||||
return gnc_option_db_set_number_option(global_options, section, name, value);
|
||||
}
|
||||
|
||||
|
||||
|
@ -54,8 +54,8 @@ char * gnc_lookup_string_option(const char *section, const char *name,
|
||||
char * gnc_lookup_multichoice_option(const char *section, const char *name,
|
||||
char *default_value);
|
||||
|
||||
gdouble gnc_lookup_number_range_option(const char *section, const char *name,
|
||||
gdouble default_value);
|
||||
gdouble gnc_lookup_number_option(const char *section, const char *name,
|
||||
gdouble default_value);
|
||||
|
||||
gboolean gnc_lookup_color_option(const char *section, const char *name,
|
||||
gdouble *red, gdouble *green,
|
||||
@ -69,8 +69,8 @@ GSList * gnc_lookup_list_option(const char *section, const char *name,
|
||||
|
||||
void gnc_set_option_default(const char *section, const char *name);
|
||||
|
||||
gboolean gnc_set_number_range_option(const char *section, const char *name,
|
||||
gdouble value);
|
||||
gboolean gnc_set_number_option(const char *section, const char *name,
|
||||
gdouble value);
|
||||
|
||||
/* private */
|
||||
|
||||
|
@ -1671,8 +1671,8 @@ gnc_option_db_lookup_date_option(GNCOptionDB *odb,
|
||||
|
||||
|
||||
/********************************************************************\
|
||||
* gnc_option_db_lookup_number_range_option *
|
||||
* looks up a number range option. If present, returns its value *
|
||||
* gnc_option_db_lookup_number_option *
|
||||
* looks up a number option. If present, returns its value *
|
||||
* as a gdouble, otherwise returns the default_value. *
|
||||
* *
|
||||
* Args: odb - option database to search in *
|
||||
@ -1682,10 +1682,10 @@ gnc_option_db_lookup_date_option(GNCOptionDB *odb,
|
||||
* Return: gdouble representation of value *
|
||||
\********************************************************************/
|
||||
gdouble
|
||||
gnc_option_db_lookup_number_range_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble default_value)
|
||||
gnc_option_db_lookup_number_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble default_value)
|
||||
{
|
||||
GNCOption *option;
|
||||
SCM getter;
|
||||
@ -1858,8 +1858,8 @@ gnc_option_db_set_option_default(GNCOptionDB *odb,
|
||||
}
|
||||
|
||||
/********************************************************************\
|
||||
* gnc_option_db_set_number_range_option *
|
||||
* sets the number range option to the given value. If successful *
|
||||
* gnc_option_db_set_number_option *
|
||||
* sets the number option to the given value. If successful *
|
||||
* returns TRUE, otherwise FALSE. *
|
||||
* *
|
||||
* Args: odb - option database to search in *
|
||||
@ -1869,10 +1869,10 @@ gnc_option_db_set_option_default(GNCOptionDB *odb,
|
||||
* Return: success indicator *
|
||||
\********************************************************************/
|
||||
gboolean
|
||||
gnc_option_db_set_number_range_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble value)
|
||||
gnc_option_db_set_number_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble value)
|
||||
{
|
||||
GNCOption *option;
|
||||
SCM scm_value;
|
||||
|
@ -151,10 +151,10 @@ time_t gnc_option_db_lookup_date_option(GNCOptionDB *odb,
|
||||
Timespec *set_value,
|
||||
Timespec *default_value);
|
||||
|
||||
gdouble gnc_option_db_lookup_number_range_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble default_value);
|
||||
gdouble gnc_option_db_lookup_number_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble default_value);
|
||||
|
||||
gboolean gnc_option_db_lookup_color_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
@ -180,10 +180,10 @@ void gnc_option_db_set_option_default(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name);
|
||||
|
||||
gboolean gnc_option_db_set_number_range_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble value);
|
||||
gboolean gnc_option_db_set_number_option(GNCOptionDB *odb,
|
||||
const char *section,
|
||||
const char *name,
|
||||
gdouble value);
|
||||
|
||||
/* private */
|
||||
|
||||
|
@ -680,16 +680,6 @@ gnc_main_create_toolbar(GnomeApp *app, GNCMainInfo *main_info)
|
||||
|
||||
static GnomeUIInfo toolbar[] =
|
||||
{
|
||||
{ GNOME_APP_UI_ITEM,
|
||||
OPEN_STR_N,
|
||||
TOOLTIP_OPEN_FILE_N,
|
||||
gnc_ui_filemenu_cb,
|
||||
GINT_TO_POINTER(FMB_OPEN),
|
||||
NULL,
|
||||
GNOME_APP_PIXMAP_STOCK,
|
||||
GNOME_STOCK_PIXMAP_OPEN,
|
||||
0, 0, NULL
|
||||
},
|
||||
{ GNOME_APP_UI_ITEM,
|
||||
SAVE_STR_N,
|
||||
TOOLTIP_SAVE_FILE_N,
|
||||
@ -781,9 +771,9 @@ gnc_main_create_toolbar(GnomeApp *app, GNCMainInfo *main_info)
|
||||
|
||||
list = main_info->account_sensitives;
|
||||
|
||||
list = g_slist_prepend(list, toolbar[3].widget);
|
||||
list = g_slist_prepend(list, toolbar[4].widget);
|
||||
list = g_slist_prepend(list, toolbar[5].widget);
|
||||
list = g_slist_prepend(list, toolbar[8].widget);
|
||||
list = g_slist_prepend(list, toolbar[7].widget);
|
||||
|
||||
main_info->account_sensitives = list;
|
||||
}
|
||||
|
@ -67,6 +67,7 @@ struct _RecnWindow
|
||||
|
||||
GtkWidget *starting; /* The starting balance */
|
||||
GtkWidget *ending; /* The ending balance */
|
||||
GtkWidget *reconciled; /* The reconciled balance */
|
||||
GtkWidget *difference; /* Text field, amount left to reconcile */
|
||||
|
||||
GtkWidget *total_debit; /* Text field, total debit reconciled */
|
||||
@ -154,6 +155,7 @@ recnRecalculateBalance(RecnWindow *recnData)
|
||||
double credit;
|
||||
double starting;
|
||||
double ending;
|
||||
double reconciled;
|
||||
double diff;
|
||||
short shares = PRTSYM | PRTSEP;
|
||||
gboolean reverse_balance;
|
||||
@ -166,6 +168,7 @@ recnRecalculateBalance(RecnWindow *recnData)
|
||||
(account_type == CURRENCY))
|
||||
shares |= PRTSHR;
|
||||
|
||||
/* update the starting balance */
|
||||
starting = xaccAccountGetReconciledBalance(recnData->account);
|
||||
if (reverse_balance)
|
||||
starting = -starting;
|
||||
@ -175,6 +178,7 @@ recnRecalculateBalance(RecnWindow *recnData)
|
||||
if (reverse_balance)
|
||||
starting = -starting;
|
||||
|
||||
/* update the ending balance */
|
||||
ending = recnData->new_ending;
|
||||
if (reverse_balance)
|
||||
ending = -ending;
|
||||
@ -190,14 +194,25 @@ recnRecalculateBalance(RecnWindow *recnData)
|
||||
credit = gnc_reconcile_list_reconciled_balance
|
||||
(GNC_RECONCILE_LIST(recnData->credit));
|
||||
|
||||
/* Update the difference field, and the total fields */
|
||||
/* Update the total debit and credit fields */
|
||||
amount = xaccPrintAmount(DABS(debit), shares, NULL);
|
||||
gtk_label_set_text(GTK_LABEL(recnData->total_debit), amount);
|
||||
|
||||
amount = xaccPrintAmount(credit, shares, NULL);
|
||||
gtk_label_set_text(GTK_LABEL(recnData->total_credit), amount);
|
||||
|
||||
diff = ending - (starting + debit - credit);
|
||||
/* update the reconciled balance */
|
||||
reconciled = starting + debit - credit;
|
||||
if (reverse_balance)
|
||||
reconciled = -reconciled;
|
||||
amount = xaccPrintAmount(reconciled, shares, NULL);
|
||||
gnc_set_label_color(recnData->reconciled, reconciled);
|
||||
gtk_label_set_text(GTK_LABEL(recnData->reconciled), amount);
|
||||
if (reverse_balance)
|
||||
reconciled = -reconciled;
|
||||
|
||||
/* update the difference */
|
||||
diff = ending - reconciled;
|
||||
if (reverse_balance)
|
||||
diff = -diff;
|
||||
amount = xaccPrintAmount(diff, shares, NULL);
|
||||
@ -293,9 +308,9 @@ startRecnWindow(GtkWidget *parent, Account *account, double *new_ending)
|
||||
GtkWidget *main_area = gtk_hbox_new(FALSE, 5);
|
||||
GtkWidget *left_column = gtk_vbox_new(TRUE, 0);
|
||||
GtkWidget *right_column = gtk_vbox_new(TRUE, 0);
|
||||
GtkWidget *prev_title = gtk_label_new(PREV_BALN_C_STR);
|
||||
GtkWidget *start_title = gtk_label_new(START_BALN_C_STR);
|
||||
GtkWidget *end_title = gtk_label_new(END_BALN_C_STR);
|
||||
GtkWidget *prev_value = gtk_label_new(amount);
|
||||
GtkWidget *start_value = gtk_label_new(amount);
|
||||
GtkWidget *vbox = GNOME_DIALOG(dialog)->vbox;
|
||||
end_value = gtk_entry_new();
|
||||
|
||||
@ -310,9 +325,9 @@ startRecnWindow(GtkWidget *parent, Account *account, double *new_ending)
|
||||
gnome_dialog_editable_enters(GNOME_DIALOG(dialog),
|
||||
GTK_EDITABLE(end_value));
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(start_title), 0.95, 0.5);
|
||||
gtk_misc_set_alignment(GTK_MISC(start_value), 0, 0.5);
|
||||
gtk_misc_set_alignment(GTK_MISC(end_title), 0.95, 0.5);
|
||||
gtk_misc_set_alignment(GTK_MISC(prev_title), 0.95, 0.5);
|
||||
gtk_misc_set_alignment(GTK_MISC(prev_value), 0, 0.5);
|
||||
|
||||
gtk_container_set_border_width(GTK_CONTAINER(main_area), 10);
|
||||
gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
|
||||
@ -322,10 +337,10 @@ startRecnWindow(GtkWidget *parent, Account *account, double *new_ending)
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(main_area), left_column, FALSE, FALSE, 0);
|
||||
gtk_box_pack_end(GTK_BOX(main_area), right_column, TRUE, TRUE, 0);
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(left_column), prev_title, TRUE, TRUE, 0);
|
||||
|
||||
gtk_box_pack_start(GTK_BOX(left_column), start_title, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(left_column), end_title, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(right_column), prev_value, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(right_column), start_value, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(right_column), end_value, TRUE, TRUE, 0);
|
||||
|
||||
gtk_widget_show_all(dialog);
|
||||
@ -1081,22 +1096,22 @@ recnWindow(GtkWidget *parent, Account *account)
|
||||
gtk_container_set_border_width(GTK_CONTAINER(totals_hbox), 5);
|
||||
|
||||
/* vbox to hold titles */
|
||||
title_vbox = gtk_vbox_new(TRUE, 3);
|
||||
title_vbox = gtk_vbox_new(FALSE, 3);
|
||||
gtk_box_pack_start(GTK_BOX(totals_hbox), title_vbox, FALSE, FALSE, 0);
|
||||
|
||||
/* vbox to hold values */
|
||||
value_vbox = gtk_vbox_new(TRUE, 3);
|
||||
value_vbox = gtk_vbox_new(FALSE, 3);
|
||||
gtk_box_pack_start(GTK_BOX(totals_hbox), value_vbox, TRUE, TRUE, 0);
|
||||
|
||||
/* previous balance title/value */
|
||||
title = gtk_label_new(PREV_BALN_C_STR);
|
||||
/* starting balance title/value */
|
||||
title = gtk_label_new(START_BALN_C_STR);
|
||||
gtk_misc_set_alignment(GTK_MISC(title), 0.95, 0.5);
|
||||
gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 3);
|
||||
|
||||
value = gtk_label_new("");
|
||||
recnData->starting = value;
|
||||
gtk_misc_set_alignment(GTK_MISC(value), 0.95, 0.5);
|
||||
gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 3);
|
||||
|
||||
/* ending balance title/value */
|
||||
title = gtk_label_new(END_BALN_C_STR);
|
||||
@ -1108,6 +1123,16 @@ recnWindow(GtkWidget *parent, Account *account)
|
||||
gtk_misc_set_alignment(GTK_MISC(value), 0.95, 0.5);
|
||||
gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0);
|
||||
|
||||
/* reconciled balance title/value */
|
||||
title = gtk_label_new(RECONCILE_BALN_C_STR);
|
||||
gtk_misc_set_alignment(GTK_MISC(title), 0.95, 0.5);
|
||||
gtk_box_pack_start(GTK_BOX(title_vbox), title, FALSE, FALSE, 0);
|
||||
|
||||
value = gtk_label_new("");
|
||||
recnData->reconciled = value;
|
||||
gtk_misc_set_alignment(GTK_MISC(value), 0.95, 0.5);
|
||||
gtk_box_pack_start(GTK_BOX(value_vbox), value, FALSE, FALSE, 0);
|
||||
|
||||
/* difference title/value */
|
||||
title = gtk_label_new(DIFF_C_STR);
|
||||
gtk_misc_set_alignment(GTK_MISC(title), 0.95, 0.5);
|
||||
|
@ -331,6 +331,9 @@ gnc_register_sort(RegWindow *regData, int sort_code)
|
||||
case BY_DATE:
|
||||
xaccQuerySetSortOrder(query, BY_DATE, BY_NUM, BY_AMOUNT);
|
||||
break;
|
||||
case BY_DATE_ENTERED:
|
||||
xaccQuerySetSortOrder(query, BY_DATE_ENTERED, BY_STANDARD, BY_NONE);
|
||||
break;
|
||||
case BY_NUM:
|
||||
xaccQuerySetSortOrder(query, BY_NUM, BY_DATE, BY_AMOUNT);
|
||||
break;
|
||||
@ -367,6 +370,14 @@ gnc_register_sort_date_cb(GtkWidget *w, gpointer data)
|
||||
gnc_register_sort(regData, BY_DATE);
|
||||
}
|
||||
|
||||
static void
|
||||
gnc_register_sort_date_entered_cb(GtkWidget *w, gpointer data)
|
||||
{
|
||||
RegWindow *regData = data;
|
||||
|
||||
gnc_register_sort(regData, BY_DATE_ENTERED);
|
||||
}
|
||||
|
||||
static void
|
||||
gnc_register_sort_num_cb(GtkWidget *w, gpointer data)
|
||||
{
|
||||
@ -1054,6 +1065,9 @@ gnc_register_create_menu_bar(RegWindow *regData, GtkWidget *statusbar)
|
||||
gnc_register_sort_standard_cb, NULL, NULL),
|
||||
GNOMEUIINFO_RADIOITEM_DATA(SORT_BY_DATE_STR_N, TOOLTIP_SORT_BY_DATE_N,
|
||||
gnc_register_sort_date_cb, NULL, NULL),
|
||||
GNOMEUIINFO_RADIOITEM_DATA(SORT_BY_ENTERED_STR_N,
|
||||
TOOLTIP_SORT_BY_ENTERED_N,
|
||||
gnc_register_sort_date_entered_cb, NULL, NULL),
|
||||
GNOMEUIINFO_RADIOITEM_DATA(SORT_BY_NUM_STR_N, TOOLTIP_SORT_BY_NUM_N,
|
||||
gnc_register_sort_num_cb, NULL, NULL),
|
||||
GNOMEUIINFO_RADIOITEM_DATA(SORT_BY_AMNT_STR_N, TOOLTIP_SORT_BY_AMNT_N,
|
||||
@ -1578,8 +1592,8 @@ regWindowLedger(xaccLedgerDisplay *ledger)
|
||||
table_frame = gtk_frame_new(NULL);
|
||||
gnome_dock_set_client_area(GNOME_DOCK(register_dock), table_frame);
|
||||
|
||||
num_rows = (guint) gnc_lookup_number_range_option("Register",
|
||||
"Number of Rows", 15.0);
|
||||
num_rows = (guint) gnc_lookup_number_option("Register",
|
||||
"Number of Rows", 15.0);
|
||||
gnucash_register_set_initial_rows(num_rows);
|
||||
|
||||
register_widget = gnucash_register_new(ledger->ledger->table);
|
||||
@ -1668,7 +1682,8 @@ regRefresh(xaccLedgerDisplay *ledger)
|
||||
char *currency = xaccAccountGetCurrency(ledger->leader);
|
||||
|
||||
/* no EURO converson, if account is already EURO or no EURO currency */
|
||||
euro = euro && strncasecmp("EUR", currency, 3) && gnc_is_euro_currency(currency);
|
||||
euro = (euro && strncasecmp("EUR", currency, 3) &&
|
||||
gnc_is_euro_currency(currency));
|
||||
|
||||
xaccSRLoadXferCells(ledger->ledger, ledger->leader);
|
||||
|
||||
|
@ -275,6 +275,8 @@
|
||||
#define TOOLTIP_SORT_BY_DATE _(TOOLTIP_SORT_BY_DATE_N)
|
||||
#define TOOLTIP_SORT_BY_DESC_N N_("Sort by Description, then Date, then Num")
|
||||
#define TOOLTIP_SORT_BY_DESC _(TOOLTIP_SORT_BY_DESC_N)
|
||||
#define TOOLTIP_SORT_BY_ENTERED_N N_("Sort by the date of entry")
|
||||
#define TOOLTIP_SORT_BY_ENTERED _(TOOLTIP_SORT_BY_ENTERED_N)
|
||||
#define TOOLTIP_SORT_BY_MEMO_N N_("Sort by Memo, then Date, then Num")
|
||||
#define TOOLTIP_SORT_BY_MEMO _(TOOLTIP_SORT_BY_MEMO_N)
|
||||
#define TOOLTIP_SORT_BY_NUM_N N_("Sort by Num, then Date, then Amount")
|
||||
@ -424,6 +426,7 @@
|
||||
#define PREV_BALN_STR _("Previous Balance")
|
||||
#define PURCH_PRIC_STR _("Purch Price")
|
||||
#define QUOTE_SRC_STR _("Price Quote Source")
|
||||
#define RECONCILE_BALN_STR _("Reconciled Balance")
|
||||
#define RECONCILE_INFO_STR _("Reconcile Information")
|
||||
#define REG_DATE_RANGES_STR _("Register date ranges")
|
||||
#define SALE_PRIC_STR _("Sale Price")
|
||||
@ -450,12 +453,15 @@
|
||||
#define SORT_BY_DATE_STR _(SORT_BY_DATE_STR_N)
|
||||
#define SORT_BY_DESC_STR_N N_("Sort by Description")
|
||||
#define SORT_BY_DESC_STR _(SORT_BY_DESC_STR_N)
|
||||
#define SORT_BY_ENTERED_STR_N N_("Sort by date of entry")
|
||||
#define SORT_BY_ENTERED_STR _(SORT_BY_ENTERED_STR_N)
|
||||
#define SORT_BY_MEMO_STR_N N_("Sort by Memo")
|
||||
#define SORT_BY_MEMO_STR _(SORT_BY_MEMO_STR_N)
|
||||
#define SORT_BY_NUM_STR_N N_("Sort by Num")
|
||||
#define SORT_BY_NUM_STR _(SORT_BY_NUM_STR_N)
|
||||
#define SORT_ORDER_STR _("Sort Order")
|
||||
#define START_DATE_STR _("Start date")
|
||||
#define START_BALN_STR _("Starting Balance")
|
||||
#define STANDARD_ORDER_STR_N N_("Standard order")
|
||||
#define STANDARD_ORDER_STR _(STANDARD_ORDER_STR_N)
|
||||
#define TOP_ACCT_STR _("Top level account")
|
||||
|
@ -330,6 +330,21 @@
|
||||
(list lower-bound upper-bound num-decimals step-size)
|
||||
#f)))
|
||||
|
||||
(define (gnc:make-internal-option
|
||||
section
|
||||
name
|
||||
default-value)
|
||||
(let* ((value default-value)
|
||||
(value->string (lambda () (gnc:value->string value))))
|
||||
(gnc:make-option
|
||||
section name "" 'internal #f
|
||||
(lambda () value)
|
||||
(lambda (x) (set! value x))
|
||||
(lambda () default-value)
|
||||
(gnc:restore-form-generator value->string)
|
||||
(lambda (x) (list #t x))
|
||||
#f #f)))
|
||||
|
||||
;; Color options store rgba values in a list.
|
||||
;; The option-data is a list, whose first element
|
||||
;; is the range of possible rgba values and whose
|
||||
@ -616,7 +631,7 @@
|
||||
(if (external-name? section)
|
||||
(gnc:register-translatable-strings section)))
|
||||
(lambda (option)
|
||||
(if (external-name? (gnc:option-name option))
|
||||
(if (not (eq? (gnc:option-type option) 'internal))
|
||||
(gnc:register-translatable-strings (gnc:option-name option)))
|
||||
(gnc:register-translatable-strings (gnc:option-documentation option))
|
||||
(let ((getter (gnc:option-strings-getter option)))
|
||||
|
@ -410,84 +410,36 @@ the current value of the path."
|
||||
;; displayed in option dialogs.
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "account_add_win_width" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "account_add_win_width" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "account_add_win_height" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "account_add_win_height" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "account_edit_win_width" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "account_edit_win_width" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "account_edit_win_height" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "account_edit_win_height" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "main_win_width" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "main_win_width" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "main_win_height" #f #f
|
||||
400.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "main_win_height" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "reg_win_width" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "reg_win_width" 0))
|
||||
|
||||
(gnc:register-configuration-option
|
||||
(gnc:make-number-range-option
|
||||
"__gui" "reg_stock_win_width" #f #f
|
||||
0.0 ;; default
|
||||
0.0 ;; lower bound
|
||||
32000.0 ;; upper bound
|
||||
0.0 ;; number of decimals
|
||||
1.0 ;; step size
|
||||
))
|
||||
(gnc:make-internal-option
|
||||
"__gui" "reg_stock_win_width" 0))
|
||||
|
||||
|
||||
;; This needs to be after all the global options definitions
|
||||
|
@ -104,6 +104,9 @@
|
||||
(loop (+ i 1)
|
||||
(cons (thunk (gnc:group-get-account group i)) collected))))))
|
||||
|
||||
(define (gnc:group-get-accounts group)
|
||||
(gnc:group-map-accounts (lambda (a) a) group))
|
||||
|
||||
;; Pull a scheme list of splits from a C array
|
||||
(define (gnc:convert-split-list split-array)
|
||||
(let loop ((index 0)
|
||||
|
Loading…
Reference in New Issue
Block a user